diff --git a/BrightSharp/Behaviors/WindowMinMaxSizeBehavior.cs b/BrightSharp/Behaviors/WindowMinMaxSizeBehavior.cs
index 425282c..a578b89 100644
--- a/BrightSharp/Behaviors/WindowMinMaxSizeBehavior.cs
+++ b/BrightSharp/Behaviors/WindowMinMaxSizeBehavior.cs
@@ -6,7 +6,6 @@ namespace BrightSharp.Behaviors
 {
     public class WindowMinMaxSizeBehavior : Behavior<Window>
     {
-        private HwndSource hwndSource;
         private MinMaxSize_Logic logic;
         protected override void OnAttached()
         {
diff --git a/BrightSharp/BrightSharp.csproj b/BrightSharp/BrightSharp.csproj
index fbc7bb7..29dbf80 100644
--- a/BrightSharp/BrightSharp.csproj
+++ b/BrightSharp/BrightSharp.csproj
@@ -95,7 +95,6 @@
     <Compile Include="Behaviors\WindowMinMaxSizeBehavior.cs" />
     <Compile Include="Commands\AsyncCommand.cs" />
     <Compile Include="Commands\RelayCommand.cs" />
-    <Compile Include="Controls\PropertyGrid.cs" />
     <Compile Include="Converters\IntToValueConverter.cs" />
     <Compile Include="Converters\InverseBooleanToVisibilityConverter.cs" />
     <Compile Include="Diagrams\Adorners\ResizeRotateAdorner.cs" />
@@ -119,10 +118,6 @@
     <Compile Include="Diagrams\ZoomControl.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="Themes\Controls\PropertyGrid.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Themes\Controls\ZoomControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -211,9 +206,7 @@
     <Resource Include="Themes\icons\paste.png" />
     <Resource Include="Themes\icons\undo.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Docking\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/BrightSharp/Controls/PropertyGrid.cs b/BrightSharp/Controls/PropertyGrid.cs
deleted file mode 100644
index 2627547..0000000
--- a/BrightSharp/Controls/PropertyGrid.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-
-namespace BrightSharp.Controls
-{
-    /// <summary>
-    /// Follow steps 1a or 1b and then 2 to use this custom control in a XAML file.
-    ///
-    /// Step 1a) Using this custom control in a XAML file that exists in the current project.
-    /// Add this XmlNamespace attribute to the root element of the markup file where it is 
-    /// to be used:
-    ///
-    ///     xmlns:MyNamespace="clr-namespace:BrightSharp.Controls"
-    ///
-    ///
-    /// Step 1b) Using this custom control in a XAML file that exists in a different project.
-    /// Add this XmlNamespace attribute to the root element of the markup file where it is 
-    /// to be used:
-    ///
-    ///     xmlns:MyNamespace="clr-namespace:BrightSharp.Controls;assembly=BrightSharp.Controls"
-    ///
-    /// You will also need to add a project reference from the project where the XAML file lives
-    /// to this project and Rebuild to avoid compilation errors:
-    ///
-    ///     Right click on the target project in the Solution Explorer and
-    ///     "Add Reference"->"Projects"->[Browse to and select this project]
-    ///
-    ///
-    /// Step 2)
-    /// Go ahead and use your control in the XAML file.
-    ///
-    ///     <MyNamespace:PropertyGrid/>
-    ///
-    /// </summary>
-    public class PropertyGrid : Control
-    {
-        static PropertyGrid() {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(PropertyGrid), new FrameworkPropertyMetadata(typeof(PropertyGrid)));
-        }
-    }
-}
diff --git a/BrightSharp/Themes/Controls/PropertyGrid.xaml b/BrightSharp/Themes/Controls/PropertyGrid.xaml
deleted file mode 100644
index 4e70101..0000000
--- a/BrightSharp/Themes/Controls/PropertyGrid.xaml
+++ /dev/null
@@ -1,18 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:BrightSharp.Controls">
-
-
-    <Style TargetType="{x:Type local:PropertyGrid}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:PropertyGrid}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/BrightSharp/Themes/Theme.xaml b/BrightSharp/Themes/Theme.xaml
index 37436e4..f0326f2 100644
--- a/BrightSharp/Themes/Theme.xaml
+++ b/BrightSharp/Themes/Theme.xaml
@@ -7,7 +7,6 @@
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Diagrams/DesignerItem.xaml" />
         <ResourceDictionary Source="Controls/ZoomControl.xaml" />
-        <ResourceDictionary Source="Controls/PropertyGrid.xaml" />
     </ResourceDictionary.MergedDictionaries>