diff --git a/build/Common.Build.props b/build/Common.Build.props
index 3f8cd53f04..0e8e2d69fb 100644
--- a/build/Common.Build.props
+++ b/build/Common.Build.props
@@ -22,6 +22,8 @@
 
     <!-- Ignore errors/warnings about semver 2.0 when packing CI builds -->
     <NoWarn>$(NoWarn);NU5105</NoWarn>
+    <LangVersion Condition="$(MSBuildProjectExtension) == '.csproj'">10</LangVersion>
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>
 
   <!-- support t4 templates in projects -->
@@ -29,6 +31,33 @@
     <TextTemplate Include="**\*.tt" />
     <AvailableItemName Include="TextTemplate" />
   </ItemGroup>
+  
+  <ItemGroup Condition="$(UseGlobalUsings) == 'true'">
+    <Using Include="System" />
+    <Using Include="System.Collections" />
+    <Using Include="System.Collections.Generic" />
+    <Using Include="System.Collections.ObjectModel" />
+    <Using Include="System.Collections.Specialized" />
+    <Using Include="System.ComponentModel" />
+    <Using Include="System.Diagnostics" />
+    <Using Include="System.Globalization" />
+    <Using Include="System.IO" />
+    <Using Include="System.Linq" />
+    <Using Include="System.Linq.Expressions" />
+    <Using Include="System.Reflection" />
+    <Using Include="System.Runtime.InteropServices" />
+    <Using Include="System.Runtime.Serialization" />
+    <Using Include="System.Text" />
+    <Using Include="System.Text.RegularExpressions" />
+    <Using Include="System.Threading" />
+    <Using Include="System.Threading.Tasks" />
+    <Using Include="Eto.Forms" />
+    <Using Include="Eto.Drawing" />
+    <Using Include="Eto.Forms.Container" Alias="Container" />
+    <Using Include="Eto.Forms.Calendar" Alias="Calendar" />
+    <Using Include="System.ComponentModel" Alias="sc" />
+    <Using Include="System.Windows.Input.ICommand" Alias="ICommand" />
+  </ItemGroup>
 
   <Import Condition="Exists('$(BasePath)..\Eto.Common.props')" Project="$(BasePath)..\Eto.Common.props" />
 </Project>
\ No newline at end of file
diff --git a/build/Common.props b/build/Common.props
index fc28bf2ed6..838866c090 100644
--- a/build/Common.props
+++ b/build/Common.props
@@ -16,7 +16,7 @@
     <HasXamarinMac Condition="$(HasXamarinMac) == ''">True</HasXamarinMac> <!-- VS for Mac needs this, Exists isn't evaluated -->
     
     <ArtifactsDir Condition="$(BuildOutoutDir) == ''">$(BasePath)artifacts\</ArtifactsDir>
-    <BaseIntermediateOutputPath Condition="$(BaseIntermediateOutputPath) == ''">$(BasePath)artifacts\obj\$(OSPlatform)\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
+    <BaseIntermediateOutputPath Condition="$(BaseIntermediateOutputPath) == ''">$(ArtifactsDir)obj\$(OSPlatform)\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
     <SourceDir Condition="$(SourceDir) == ''">$(BasePath)src\</SourceDir>
     <NugetDir Condition="$(NugetDir) == ''">$(SourceDir)</NugetDir>
     <PackageOutputPath>$(ArtifactsDir)nuget\$(Configuration)\</PackageOutputPath>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 4a3bb4f4ed..cca3f2a93e 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <UseGlobalUsings>true</UseGlobalUsings>
+  </PropertyGroup>
+
   <Import Project="..\build\Common.Build.props" />
   <PropertyGroup>
-    <BaseOutputPath Condition="$(BaseOutputPath) == ''">$(BasePath)artifacts\core\$(MSBuildProjectName)\</BaseOutputPath>
+    <BaseOutputPath Condition="$(BaseOutputPath) == ''">$(ArtifactsDir)core\$(MSBuildProjectName)\</BaseOutputPath>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Eto.Android/AndroidHelpers.cs b/src/Eto.Android/AndroidHelpers.cs
index 34a8bf9d34..a891e228d0 100644
--- a/src/Eto.Android/AndroidHelpers.cs
+++ b/src/Eto.Android/AndroidHelpers.cs
@@ -1,9 +1,5 @@
-using System;
 using Android.Widget;
 using Eto.Android.Forms;
-using Eto.Drawing;
-using Eto.Forms;
-
 using av = Android.Views;
 using ag = Android.Graphics;
 using Android.Views;
diff --git a/src/Eto.Android/ContextMenuHandler.cs b/src/Eto.Android/ContextMenuHandler.cs
index eb58064bc5..672f107b45 100644
--- a/src/Eto.Android/ContextMenuHandler.cs
+++ b/src/Eto.Android/ContextMenuHandler.cs
@@ -1,5 +1,3 @@
-using Eto.Forms;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
@@ -7,11 +5,6 @@
 using av = Android.Views;
 using aw = Android.Widget;
 using ag = Android.Graphics;
-using System.Collections.Generic;
-using System;
-using System.Linq;
-using Eto.Drawing;
-
 namespace Eto.Android
 {
 	internal class ContextMenuHandler : WidgetHandler<aw.PopupMenu, ContextMenu, ContextMenu.ICallback>, ContextMenu.IHandler
diff --git a/src/Eto.Android/Conversions.cs b/src/Eto.Android/Conversions.cs
index 5e760b01e5..c372acf6e2 100644
--- a/src/Eto.Android/Conversions.cs
+++ b/src/Eto.Android/Conversions.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Drawing/BitmapHandler.cs b/src/Eto.Android/Drawing/BitmapHandler.cs
index 5e71d847d5..52c77ff602 100644
--- a/src/Eto.Android/Drawing/BitmapHandler.cs
+++ b/src/Eto.Android/Drawing/BitmapHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
@@ -11,8 +5,6 @@
 using av = Android.Views;
 using aw = Android.Widget;
 using ag = Android.Graphics;
-using System.IO;
-
 namespace Eto.Android.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.Android/Drawing/BrushHandler.cs b/src/Eto.Android/Drawing/BrushHandler.cs
index 6af7436641..76fd7cc09d 100644
--- a/src/Eto.Android/Drawing/BrushHandler.cs
+++ b/src/Eto.Android/Drawing/BrushHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Drawing/FontFamilyHandler.cs b/src/Eto.Android/Drawing/FontFamilyHandler.cs
index 6e139aa15d..e7f05a1fb9 100644
--- a/src/Eto.Android/Drawing/FontFamilyHandler.cs
+++ b/src/Eto.Android/Drawing/FontFamilyHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Drawing/FontHandler.cs b/src/Eto.Android/Drawing/FontHandler.cs
index 1cabf280c0..38fb9d1e8f 100644
--- a/src/Eto.Android/Drawing/FontHandler.cs
+++ b/src/Eto.Android/Drawing/FontHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Drawing/FontTypefaceHandler.cs b/src/Eto.Android/Drawing/FontTypefaceHandler.cs
index c633721631..dced4c2e05 100644
--- a/src/Eto.Android/Drawing/FontTypefaceHandler.cs
+++ b/src/Eto.Android/Drawing/FontTypefaceHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Eto.Forms;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Drawing/FontsHandler.cs b/src/Eto.Android/Drawing/FontsHandler.cs
index a932b8a801..dc4c333feb 100644
--- a/src/Eto.Android/Drawing/FontsHandler.cs
+++ b/src/Eto.Android/Drawing/FontsHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
@@ -12,8 +6,6 @@
 using aw = Android.Widget;
 using ag = Android.Graphics;
 using System.Xml.Linq;
-using System.IO;
-
 namespace Eto.Android.Drawing
 {
 	public class FontsHandler : WidgetHandler<Widget>, Fonts.IHandler
diff --git a/src/Eto.Android/Drawing/FormattedTextHandler.cs b/src/Eto.Android/Drawing/FormattedTextHandler.cs
index 3a5032ae47..981b621a10 100644
--- a/src/Eto.Android/Drawing/FormattedTextHandler.cs
+++ b/src/Eto.Android/Drawing/FormattedTextHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Drawing/GraphicsHandler.cs b/src/Eto.Android/Drawing/GraphicsHandler.cs
index b5747fe2de..694b86bc48 100644
--- a/src/Eto.Android/Drawing/GraphicsHandler.cs
+++ b/src/Eto.Android/Drawing/GraphicsHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Drawing/GraphicsPathHandler.cs b/src/Eto.Android/Drawing/GraphicsPathHandler.cs
index a578c92b8d..8fdf2374a4 100644
--- a/src/Eto.Android/Drawing/GraphicsPathHandler.cs
+++ b/src/Eto.Android/Drawing/GraphicsPathHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Drawing/IconHandler.cs b/src/Eto.Android/Drawing/IconHandler.cs
index 470c5b58ef..3dae645fce 100644
--- a/src/Eto.Android/Drawing/IconHandler.cs
+++ b/src/Eto.Android/Drawing/IconHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
@@ -11,8 +5,6 @@
 using av = Android.Views;
 using aw = Android.Widget;
 using ag = Android.Graphics;
-using Eto.Forms;
-
 namespace Eto.Android.Drawing
 {
 	class IconFrameHandler : IconFrame.IHandler
diff --git a/src/Eto.Android/Drawing/IndexedBitmapHandler.cs b/src/Eto.Android/Drawing/IndexedBitmapHandler.cs
index f23988d4f4..e5b70dcf79 100644
--- a/src/Eto.Android/Drawing/IndexedBitmapHandler.cs
+++ b/src/Eto.Android/Drawing/IndexedBitmapHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Drawing/LinearGradientBrushHandler.cs b/src/Eto.Android/Drawing/LinearGradientBrushHandler.cs
index cf74f53029..20ad06496b 100644
--- a/src/Eto.Android/Drawing/LinearGradientBrushHandler.cs
+++ b/src/Eto.Android/Drawing/LinearGradientBrushHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Drawing/MatrixHandler.cs b/src/Eto.Android/Drawing/MatrixHandler.cs
index 67d8279810..09e36fddff 100644
--- a/src/Eto.Android/Drawing/MatrixHandler.cs
+++ b/src/Eto.Android/Drawing/MatrixHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Drawing/PenHandler.cs b/src/Eto.Android/Drawing/PenHandler.cs
index de8ab08f6b..36545fbe02 100644
--- a/src/Eto.Android/Drawing/PenHandler.cs
+++ b/src/Eto.Android/Drawing/PenHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Drawing/SolidBrushHandler.cs b/src/Eto.Android/Drawing/SolidBrushHandler.cs
index 27b5ca3007..2e5094b44b 100644
--- a/src/Eto.Android/Drawing/SolidBrushHandler.cs
+++ b/src/Eto.Android/Drawing/SolidBrushHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Drawing/SystemColorsHandler.cs b/src/Eto.Android/Drawing/SystemColorsHandler.cs
index 5ccd790fdc..1a7cf8c336 100644
--- a/src/Eto.Android/Drawing/SystemColorsHandler.cs
+++ b/src/Eto.Android/Drawing/SystemColorsHandler.cs
@@ -1,5 +1,3 @@
-using Eto.Drawing;
-
 namespace Eto.Android
 	{
 	public class SystemColorsHandler : SystemColors.IHandler
diff --git a/src/Eto.Android/Drawing/TextureBrushHandler.cs b/src/Eto.Android/Drawing/TextureBrushHandler.cs
index f6dd8e0720..a679e74759 100644
--- a/src/Eto.Android/Drawing/TextureBrushHandler.cs
+++ b/src/Eto.Android/Drawing/TextureBrushHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/AndroidContainer.cs b/src/Eto.Android/Forms/AndroidContainer.cs
index 2f17d58607..688ac60aa1 100644
--- a/src/Eto.Android/Forms/AndroidContainer.cs
+++ b/src/Eto.Android/Forms/AndroidContainer.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using Eto.Forms;
-using Eto.Drawing;
 using a = Android;
 using av = Android.Views;
 using aw = Android.Widget;
diff --git a/src/Eto.Android/Forms/AndroidControl.cs b/src/Eto.Android/Forms/AndroidControl.cs
index 1e5b77ed48..153ff9e8e2 100644
--- a/src/Eto.Android/Forms/AndroidControl.cs
+++ b/src/Eto.Android/Forms/AndroidControl.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Eto.Forms;
-using Eto.Drawing;
-
 using a = Android;
 using av = Android.Views;
 
diff --git a/src/Eto.Android/Forms/AndroidExtensions.cs b/src/Eto.Android/Forms/AndroidExtensions.cs
index b7c0dd45ac..3b1a5c2274 100644
--- a/src/Eto.Android/Forms/AndroidExtensions.cs
+++ b/src/Eto.Android/Forms/AndroidExtensions.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using a = Android;
 using av = Android.Views;
 using aw = Android.Widget;
diff --git a/src/Eto.Android/Forms/AndroidPanel.cs b/src/Eto.Android/Forms/AndroidPanel.cs
index 0bcfd7397c..4983a54b15 100644
--- a/src/Eto.Android/Forms/AndroidPanel.cs
+++ b/src/Eto.Android/Forms/AndroidPanel.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using a = Android;
 using av = Android.Views;
 using aw = Android.Widget;
diff --git a/src/Eto.Android/Forms/AndroidTextControl.cs b/src/Eto.Android/Forms/AndroidTextControl.cs
index b2a6b91423..49b0b478b2 100644
--- a/src/Eto.Android/Forms/AndroidTextControl.cs
+++ b/src/Eto.Android/Forms/AndroidTextControl.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-
 using aw = Android.Widget;
 using at = Android.Text;
 using av = Android.Views;
diff --git a/src/Eto.Android/Forms/AndroidWindow.cs b/src/Eto.Android/Forms/AndroidWindow.cs
index 2ebbfc15d4..3abf60de10 100644
--- a/src/Eto.Android/Forms/AndroidWindow.cs
+++ b/src/Eto.Android/Forms/AndroidWindow.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Threading.Tasks;
-using Eto.Forms;
-using Eto.Drawing;
 using a = Android;
 using av = Android.Views;
 using aw = Android.Widget;
diff --git a/src/Eto.Android/Forms/ApplicationHandler.cs b/src/Eto.Android/Forms/ApplicationHandler.cs
index a0fcda6d47..c218e7f3fc 100644
--- a/src/Eto.Android/Forms/ApplicationHandler.cs
+++ b/src/Eto.Android/Forms/ApplicationHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Eto.Forms;
-
 using a = Android;
 using ao = Android.OS;
 
diff --git a/src/Eto.Android/Forms/Cells/CheckBoxCellHandler.cs b/src/Eto.Android/Forms/Cells/CheckBoxCellHandler.cs
index f13037a4d9..1f4aac1610 100644
--- a/src/Eto.Android/Forms/Cells/CheckBoxCellHandler.cs
+++ b/src/Eto.Android/Forms/Cells/CheckBoxCellHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
@@ -10,8 +5,6 @@
 using av = Android.Views;
 using aw = Android.Widget;
 using ag = Android.Graphics;
-using Eto.Forms;
-
 namespace Eto.Android.Forms.Cells
 {
 	public class CheckBoxCellHandler : CellHandler<CheckBoxCell>, CheckBoxCell.IHandler
diff --git a/src/Eto.Android/Forms/Cells/ComboBoxCellHandler.cs b/src/Eto.Android/Forms/Cells/ComboBoxCellHandler.cs
index 68633ec060..9f560aa2bb 100644
--- a/src/Eto.Android/Forms/Cells/ComboBoxCellHandler.cs
+++ b/src/Eto.Android/Forms/Cells/ComboBoxCellHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
@@ -10,8 +5,6 @@
 using av = Android.Views;
 using aw = Android.Widget;
 using ag = Android.Graphics;
-using Eto.Forms;
-
 namespace Eto.Android.Forms.Cells
 {
 	public class ComboBoxCellHandler : CellHandler<ComboBoxCell>, ComboBoxCell.IHandler
diff --git a/src/Eto.Android/Forms/Cells/ICellHandler.cs b/src/Eto.Android/Forms/Cells/ICellHandler.cs
index 7028bb4511..f3626ec8f4 100644
--- a/src/Eto.Android/Forms/Cells/ICellHandler.cs
+++ b/src/Eto.Android/Forms/Cells/ICellHandler.cs
@@ -1,4 +1,3 @@
-using Eto.Forms;
 using av = Android.Views;
 
 namespace Eto.Android.Forms.Cells
diff --git a/src/Eto.Android/Forms/Cells/ImageTextCellHandler.cs b/src/Eto.Android/Forms/Cells/ImageTextCellHandler.cs
index 47d5b96ef6..dc6f3089ab 100644
--- a/src/Eto.Android/Forms/Cells/ImageTextCellHandler.cs
+++ b/src/Eto.Android/Forms/Cells/ImageTextCellHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Cells/ImageViewCellHandler.cs b/src/Eto.Android/Forms/Cells/ImageViewCellHandler.cs
index 4c40828575..b8cfa23d79 100644
--- a/src/Eto.Android/Forms/Cells/ImageViewCellHandler.cs
+++ b/src/Eto.Android/Forms/Cells/ImageViewCellHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Cells/ProgressCellHandler.cs b/src/Eto.Android/Forms/Cells/ProgressCellHandler.cs
index ed3198e3cc..8df3fdf7a1 100644
--- a/src/Eto.Android/Forms/Cells/ProgressCellHandler.cs
+++ b/src/Eto.Android/Forms/Cells/ProgressCellHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
@@ -10,8 +5,6 @@
 using av = Android.Views;
 using aw = Android.Widget;
 using ag = Android.Graphics;
-using Eto.Forms;
-
 namespace Eto.Android.Forms.Cells
 {
 	public class ProgressCellHandler : CellHandler<ProgressCell>, ProgressCell.IHandler
diff --git a/src/Eto.Android/Forms/Cells/TextBoxCellHandler.cs b/src/Eto.Android/Forms/Cells/TextBoxCellHandler.cs
index fe398fbb27..06594a23f3 100644
--- a/src/Eto.Android/Forms/Cells/TextBoxCellHandler.cs
+++ b/src/Eto.Android/Forms/Cells/TextBoxCellHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
@@ -10,8 +5,6 @@
 using av = Android.Views;
 using aw = Android.Widget;
 using ag = Android.Graphics;
-using Eto.Forms;
-
 namespace Eto.Android.Forms.Cells
 	{
 	public class TextBoxCellHandler : CellHandler<TextBoxCell>, TextBoxCell.IHandler
diff --git a/src/Eto.Android/Forms/Controls/AndroidCommonControl.cs b/src/Eto.Android/Forms/Controls/AndroidCommonControl.cs
index 86b24aafc5..4b6584e776 100644
--- a/src/Eto.Android/Forms/Controls/AndroidCommonControl.cs
+++ b/src/Eto.Android/Forms/Controls/AndroidCommonControl.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 using av = Android.Views;
 using aw = Android.Widget;
 using au = Android.Util;
diff --git a/src/Eto.Android/Forms/Controls/ButtonHandler.cs b/src/Eto.Android/Forms/Controls/ButtonHandler.cs
index 95b8ff228c..2cea58d0de 100644
--- a/src/Eto.Android/Forms/Controls/ButtonHandler.cs
+++ b/src/Eto.Android/Forms/Controls/ButtonHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Controls/CheckBoxHandler.cs b/src/Eto.Android/Forms/Controls/CheckBoxHandler.cs
index 525301fe38..4d402d7ffc 100644
--- a/src/Eto.Android/Forms/Controls/CheckBoxHandler.cs
+++ b/src/Eto.Android/Forms/Controls/CheckBoxHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
@@ -10,8 +5,6 @@
 using av = Android.Views;
 using aw = Android.Widget;
 using ag = Android.Graphics;
-using Eto.Drawing;
-
 namespace Eto.Android.Forms.Controls
 {
 	public class CheckBoxHandler : AndroidCommonControl<aw.CheckBox, CheckBox, CheckBox.ICallback>, CheckBox.IHandler
diff --git a/src/Eto.Android/Forms/Controls/ComboBoxHandler.cs b/src/Eto.Android/Forms/Controls/ComboBoxHandler.cs
index 9ddc316c90..a635ca00ca 100644
--- a/src/Eto.Android/Forms/Controls/ComboBoxHandler.cs
+++ b/src/Eto.Android/Forms/Controls/ComboBoxHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Controls/DateTimePickerHandler.cs b/src/Eto.Android/Forms/Controls/DateTimePickerHandler.cs
index 4834ce9164..053b1d5b46 100644
--- a/src/Eto.Android/Forms/Controls/DateTimePickerHandler.cs
+++ b/src/Eto.Android/Forms/Controls/DateTimePickerHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Controls/DrawableHandler.cs b/src/Eto.Android/Forms/Controls/DrawableHandler.cs
index dc4f2e744a..4875e975ac 100644
--- a/src/Eto.Android/Forms/Controls/DrawableHandler.cs
+++ b/src/Eto.Android/Forms/Controls/DrawableHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Android.Drawing;
 
 using aa = Android.App;
diff --git a/src/Eto.Android/Forms/Controls/DropDownHandler.cs b/src/Eto.Android/Forms/Controls/DropDownHandler.cs
index 6cd136f725..a5ebc672af 100644
--- a/src/Eto.Android/Forms/Controls/DropDownHandler.cs
+++ b/src/Eto.Android/Forms/Controls/DropDownHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Controls/FontPickerHandler.cs b/src/Eto.Android/Forms/Controls/FontPickerHandler.cs
index 13cf0bd464..8299a30cff 100644
--- a/src/Eto.Android/Forms/Controls/FontPickerHandler.cs
+++ b/src/Eto.Android/Forms/Controls/FontPickerHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Controls/GridColumnHandler.cs b/src/Eto.Android/Forms/Controls/GridColumnHandler.cs
index 49a1361572..c6d1ab24cd 100644
--- a/src/Eto.Android/Forms/Controls/GridColumnHandler.cs
+++ b/src/Eto.Android/Forms/Controls/GridColumnHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Controls/GridViewHandler.cs b/src/Eto.Android/Forms/Controls/GridViewHandler.cs
index a10b101507..679daca2c1 100644
--- a/src/Eto.Android/Forms/Controls/GridViewHandler.cs
+++ b/src/Eto.Android/Forms/Controls/GridViewHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
@@ -12,8 +6,6 @@
 using aw = Android.Widget;
 using ag = Android.Graphics;
 using Eto.Android.Forms.Cells;
-using Eto.Drawing;
-
 namespace Eto.Android.Forms.Controls
 {
 	public class GridViewHandler : AndroidControl<aw.ListView, GridView, GridView.ICallback>, GridView.IHandler
diff --git a/src/Eto.Android/Forms/Controls/GroupBoxHandler.cs b/src/Eto.Android/Forms/Controls/GroupBoxHandler.cs
index b5597578d7..248bca9379 100644
--- a/src/Eto.Android/Forms/Controls/GroupBoxHandler.cs
+++ b/src/Eto.Android/Forms/Controls/GroupBoxHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Controls/ImageViewHandler.cs b/src/Eto.Android/Forms/Controls/ImageViewHandler.cs
index 423f5d8d0d..9888845cfa 100644
--- a/src/Eto.Android/Forms/Controls/ImageViewHandler.cs
+++ b/src/Eto.Android/Forms/Controls/ImageViewHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
@@ -11,8 +5,6 @@
 using av = Android.Views;
 using aw = Android.Widget;
 using ag = Android.Graphics;
-using Eto.Drawing;
-
 namespace Eto.Android.Forms.Controls
 {
 	public class ImageViewHandler : AndroidControl<aw.ImageView, ImageView, ImageView.ICallback>, ImageView.IHandler
diff --git a/src/Eto.Android/Forms/Controls/LabelHandler.cs b/src/Eto.Android/Forms/Controls/LabelHandler.cs
index 706f5f5efc..62e93c03ea 100644
--- a/src/Eto.Android/Forms/Controls/LabelHandler.cs
+++ b/src/Eto.Android/Forms/Controls/LabelHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using a = Android;
 using av = Android.Views;
 using aw = Android.Widget;
diff --git a/src/Eto.Android/Forms/Controls/LinkButtonHandler.cs b/src/Eto.Android/Forms/Controls/LinkButtonHandler.cs
index b16d29267c..2daa7f769d 100644
--- a/src/Eto.Android/Forms/Controls/LinkButtonHandler.cs
+++ b/src/Eto.Android/Forms/Controls/LinkButtonHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.Android.Forms.Controls;
 
 using aa = Android.App;
diff --git a/src/Eto.Android/Forms/Controls/ListBoxHandler.cs b/src/Eto.Android/Forms/Controls/ListBoxHandler.cs
index c33747bbc1..747b1e8735 100644
--- a/src/Eto.Android/Forms/Controls/ListBoxHandler.cs
+++ b/src/Eto.Android/Forms/Controls/ListBoxHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Controls/NavigationHandler.cs b/src/Eto.Android/Forms/Controls/NavigationHandler.cs
index 76da5146d5..3098585d18 100644
--- a/src/Eto.Android/Forms/Controls/NavigationHandler.cs
+++ b/src/Eto.Android/Forms/Controls/NavigationHandler.cs
@@ -1,5 +1,3 @@
-using System;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
@@ -7,9 +5,6 @@
 using av = Android.Views;
 using aw = Android.Widget;
 using ag = Android.Graphics;
-using Eto.Forms;
-using System.Collections.Generic;
-
 namespace Eto.Android.Forms.Controls
 {
 	[aa.Activity]
diff --git a/src/Eto.Android/Forms/Controls/NumericStepperHandler.cs b/src/Eto.Android/Forms/Controls/NumericStepperHandler.cs
index ec1884e740..cb622a2f71 100644
--- a/src/Eto.Android/Forms/Controls/NumericStepperHandler.cs
+++ b/src/Eto.Android/Forms/Controls/NumericStepperHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
@@ -11,9 +5,7 @@
 using av = Android.Views;
 using aw = Android.Widget;
 using ag = Android.Graphics;
-using System.Globalization;
 using Android.Widget;
-using Eto.Drawing;
 using Android.Views;
 
 namespace Eto.Android.Forms.Controls
diff --git a/src/Eto.Android/Forms/Controls/NumericUpDownHandler.cs b/src/Eto.Android/Forms/Controls/NumericUpDownHandler.cs
index 8b6c154cb1..fa856cd30b 100644
--- a/src/Eto.Android/Forms/Controls/NumericUpDownHandler.cs
+++ b/src/Eto.Android/Forms/Controls/NumericUpDownHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
@@ -11,9 +5,7 @@
 using av = Android.Views;
 using aw = Android.Widget;
 using ag = Android.Graphics;
-using System.Globalization;
 using Android.Widget;
-using Eto.Drawing;
 using Android.Views;
 
 namespace Eto.Android.Forms.Controls
diff --git a/src/Eto.Android/Forms/Controls/PanelHandler.cs b/src/Eto.Android/Forms/Controls/PanelHandler.cs
index b8c9172d23..09fd4e1734 100644
--- a/src/Eto.Android/Forms/Controls/PanelHandler.cs
+++ b/src/Eto.Android/Forms/Controls/PanelHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Controls/PasswordBoxHandler.cs b/src/Eto.Android/Forms/Controls/PasswordBoxHandler.cs
index 52abe8edfe..2cf0488124 100644
--- a/src/Eto.Android/Forms/Controls/PasswordBoxHandler.cs
+++ b/src/Eto.Android/Forms/Controls/PasswordBoxHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Controls/ProgressBarHandler.cs b/src/Eto.Android/Forms/Controls/ProgressBarHandler.cs
index c1222ed863..a4f2f78488 100644
--- a/src/Eto.Android/Forms/Controls/ProgressBarHandler.cs
+++ b/src/Eto.Android/Forms/Controls/ProgressBarHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Controls/RadioButtonHandler.cs b/src/Eto.Android/Forms/Controls/RadioButtonHandler.cs
index df9758f0cc..51f9c7bc3c 100644
--- a/src/Eto.Android/Forms/Controls/RadioButtonHandler.cs
+++ b/src/Eto.Android/Forms/Controls/RadioButtonHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Controls/ScrollableHandler.cs b/src/Eto.Android/Forms/Controls/ScrollableHandler.cs
index 6cf9c1dc73..b07a1b1cfb 100644
--- a/src/Eto.Android/Forms/Controls/ScrollableHandler.cs
+++ b/src/Eto.Android/Forms/Controls/ScrollableHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-using Eto.Drawing;
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Controls/SearchBoxHandler.cs b/src/Eto.Android/Forms/Controls/SearchBoxHandler.cs
index f4c999d06f..1b4636bd31 100644
--- a/src/Eto.Android/Forms/Controls/SearchBoxHandler.cs
+++ b/src/Eto.Android/Forms/Controls/SearchBoxHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Controls/SliderHandler.cs b/src/Eto.Android/Forms/Controls/SliderHandler.cs
index d0f5d1a09d..291fe25537 100644
--- a/src/Eto.Android/Forms/Controls/SliderHandler.cs
+++ b/src/Eto.Android/Forms/Controls/SliderHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Controls/SpinnerHandler.cs b/src/Eto.Android/Forms/Controls/SpinnerHandler.cs
index fd88c5dc9a..c02a7807e6 100644
--- a/src/Eto.Android/Forms/Controls/SpinnerHandler.cs
+++ b/src/Eto.Android/Forms/Controls/SpinnerHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Controls/SplitterHandler.cs b/src/Eto.Android/Forms/Controls/SplitterHandler.cs
index 2c502c7d99..b636027ffd 100644
--- a/src/Eto.Android/Forms/Controls/SplitterHandler.cs
+++ b/src/Eto.Android/Forms/Controls/SplitterHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Controls/TabControlHandler.cs b/src/Eto.Android/Forms/Controls/TabControlHandler.cs
index baa981c96e..fe46fe1469 100644
--- a/src/Eto.Android/Forms/Controls/TabControlHandler.cs
+++ b/src/Eto.Android/Forms/Controls/TabControlHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Controls/TabPageHandler.cs b/src/Eto.Android/Forms/Controls/TabPageHandler.cs
index a511528411..9097e43950 100644
--- a/src/Eto.Android/Forms/Controls/TabPageHandler.cs
+++ b/src/Eto.Android/Forms/Controls/TabPageHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Controls/TextAreaHandler.cs b/src/Eto.Android/Forms/Controls/TextAreaHandler.cs
index 14e2048279..bca0b13586 100644
--- a/src/Eto.Android/Forms/Controls/TextAreaHandler.cs
+++ b/src/Eto.Android/Forms/Controls/TextAreaHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Controls/TextBoxHandler.cs b/src/Eto.Android/Forms/Controls/TextBoxHandler.cs
index 41b763d128..5d7450868a 100644
--- a/src/Eto.Android/Forms/Controls/TextBoxHandler.cs
+++ b/src/Eto.Android/Forms/Controls/TextBoxHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 using av = Android.Views;
 using aw = Android.Widget;
 using at = Android.Text;
diff --git a/src/Eto.Android/Forms/Controls/TreeGridViewHandler.cs b/src/Eto.Android/Forms/Controls/TreeGridViewHandler.cs
index 89cc442b1a..147a675356 100644
--- a/src/Eto.Android/Forms/Controls/TreeGridViewHandler.cs
+++ b/src/Eto.Android/Forms/Controls/TreeGridViewHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Controls/TreeViewHandler.cs b/src/Eto.Android/Forms/Controls/TreeViewHandler.cs
index 8c31c612cf..f6271cb8b0 100644
--- a/src/Eto.Android/Forms/Controls/TreeViewHandler.cs
+++ b/src/Eto.Android/Forms/Controls/TreeViewHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Controls/WebViewHandler.cs b/src/Eto.Android/Forms/Controls/WebViewHandler.cs
index fdab40eb90..d7b6571e97 100644
--- a/src/Eto.Android/Forms/Controls/WebViewHandler.cs
+++ b/src/Eto.Android/Forms/Controls/WebViewHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/DialogHandler.cs b/src/Eto.Android/Forms/DialogHandler.cs
index 56562a6020..955b24c95d 100644
--- a/src/Eto.Android/Forms/DialogHandler.cs
+++ b/src/Eto.Android/Forms/DialogHandler.cs
@@ -1,14 +1,8 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using a = Android;
 using av = Android.Views;
 using aw = Android.Widget;
 using aa = Android.App;
-using System.Threading.Tasks;
 using Android.Content;
-using System.Linq;
-
 namespace Eto.Android.Forms
 {
 	/// <summary>
diff --git a/src/Eto.Android/Forms/EtoEnvironmentHandler.cs b/src/Eto.Android/Forms/EtoEnvironmentHandler.cs
index aec86ce9d7..dfdd06163b 100644
--- a/src/Eto.Android/Forms/EtoEnvironmentHandler.cs
+++ b/src/Eto.Android/Forms/EtoEnvironmentHandler.cs
@@ -1,7 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-using System;
-
 namespace Eto.Android.Forms
 	{
 	internal class EtoEnvironmentHandler : EtoEnvironment.IHandler
diff --git a/src/Eto.Android/Forms/FormHandler.cs b/src/Eto.Android/Forms/FormHandler.cs
index e4f82b386f..6acda192f2 100644
--- a/src/Eto.Android/Forms/FormHandler.cs
+++ b/src/Eto.Android/Forms/FormHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Android.Forms
 {
 	/// <summary>
diff --git a/src/Eto.Android/Forms/Menu/ButtonMenuItemHandler.cs b/src/Eto.Android/Forms/Menu/ButtonMenuItemHandler.cs
index 64318b638c..ff43b40476 100644
--- a/src/Eto.Android/Forms/Menu/ButtonMenuItemHandler.cs
+++ b/src/Eto.Android/Forms/Menu/ButtonMenuItemHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Menu/CheckMenuItemHandler.cs b/src/Eto.Android/Forms/Menu/CheckMenuItemHandler.cs
index b9e4795618..866c881974 100644
--- a/src/Eto.Android/Forms/Menu/CheckMenuItemHandler.cs
+++ b/src/Eto.Android/Forms/Menu/CheckMenuItemHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 using av = Android.Views;
 
 namespace Eto.Android
diff --git a/src/Eto.Android/Forms/Menu/MenuItemHandler.cs b/src/Eto.Android/Forms/Menu/MenuItemHandler.cs
index 5c44e0b311..e4934dc583 100644
--- a/src/Eto.Android/Forms/Menu/MenuItemHandler.cs
+++ b/src/Eto.Android/Forms/Menu/MenuItemHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/Menu/SeparatorMenuItemHandler.cs b/src/Eto.Android/Forms/Menu/SeparatorMenuItemHandler.cs
index 22b61c3b34..236e5d28c2 100644
--- a/src/Eto.Android/Forms/Menu/SeparatorMenuItemHandler.cs
+++ b/src/Eto.Android/Forms/Menu/SeparatorMenuItemHandler.cs
@@ -1,5 +1,3 @@
-using Eto.Forms;
-
 using av = Android.Views;
 
 namespace Eto.Android
diff --git a/src/Eto.Android/Forms/ScreenHandler.cs b/src/Eto.Android/Forms/ScreenHandler.cs
index 2ac70feb16..8d3d63eccd 100644
--- a/src/Eto.Android/Forms/ScreenHandler.cs
+++ b/src/Eto.Android/Forms/ScreenHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Android.Forms
 {
 	internal class ScreenHandler : WidgetHandler<Object, Screen>, Screen.IHandler
diff --git a/src/Eto.Android/Forms/ScreensHandler.cs b/src/Eto.Android/Forms/ScreensHandler.cs
index be59a269db..0152a3966b 100644
--- a/src/Eto.Android/Forms/ScreensHandler.cs
+++ b/src/Eto.Android/Forms/ScreensHandler.cs
@@ -1,8 +1,4 @@
-using System.Collections.Generic;
 using Android.Runtime;
-using Eto.Forms;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using av = Android.Views;
diff --git a/src/Eto.Android/Forms/TableLayoutHandler.cs b/src/Eto.Android/Forms/TableLayoutHandler.cs
index 490b64ed9a..503bf8821b 100644
--- a/src/Eto.Android/Forms/TableLayoutHandler.cs
+++ b/src/Eto.Android/Forms/TableLayoutHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/ToolBar/ButtonToolItemHandler.cs b/src/Eto.Android/Forms/ToolBar/ButtonToolItemHandler.cs
index 172cf11e01..3271d9f375 100644
--- a/src/Eto.Android/Forms/ToolBar/ButtonToolItemHandler.cs
+++ b/src/Eto.Android/Forms/ToolBar/ButtonToolItemHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 using aw = Android.Widget;
 
 namespace Eto.Android.Forms.ToolBar
diff --git a/src/Eto.Android/Forms/ToolBar/CheckToolItemHandler.cs b/src/Eto.Android/Forms/ToolBar/CheckToolItemHandler.cs
index d07f47701c..05be2d428e 100644
--- a/src/Eto.Android/Forms/ToolBar/CheckToolItemHandler.cs
+++ b/src/Eto.Android/Forms/ToolBar/CheckToolItemHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 using aw = Android.Widget;
 
 namespace Eto.Android.Forms.ToolBar
diff --git a/src/Eto.Android/Forms/ToolBar/SeparatorToolItemHandler.cs b/src/Eto.Android/Forms/ToolBar/SeparatorToolItemHandler.cs
index 808230d4c5..892bf9c434 100644
--- a/src/Eto.Android/Forms/ToolBar/SeparatorToolItemHandler.cs
+++ b/src/Eto.Android/Forms/ToolBar/SeparatorToolItemHandler.cs
@@ -1,5 +1,3 @@
-using Eto.Forms;
-
 using aw = Android.Widget;
 
 namespace Eto.Android.Forms.ToolBar
diff --git a/src/Eto.Android/Forms/ToolBar/ToolBarHandler.cs b/src/Eto.Android/Forms/ToolBar/ToolBarHandler.cs
index d923c6ea63..19f812b210 100644
--- a/src/Eto.Android/Forms/ToolBar/ToolBarHandler.cs
+++ b/src/Eto.Android/Forms/ToolBar/ToolBarHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/ToolBar/ToolItemHandler.cs b/src/Eto.Android/Forms/ToolBar/ToolItemHandler.cs
index 4718e7fbc0..bd7260c558 100644
--- a/src/Eto.Android/Forms/ToolBar/ToolItemHandler.cs
+++ b/src/Eto.Android/Forms/ToolBar/ToolItemHandler.cs
@@ -1,7 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-using System;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Forms/UITimerHandler.cs b/src/Eto.Android/Forms/UITimerHandler.cs
index 7ad35c7812..af97bb8e25 100644
--- a/src/Eto.Android/Forms/UITimerHandler.cs
+++ b/src/Eto.Android/Forms/UITimerHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 using ao = Android.OS;
 
 namespace Eto.Android
diff --git a/src/Eto.Android/KeyMap.cs b/src/Eto.Android/KeyMap.cs
index 83661a95b3..4853a73bef 100644
--- a/src/Eto.Android/KeyMap.cs
+++ b/src/Eto.Android/KeyMap.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/MessageBoxHandler.cs b/src/Eto.Android/MessageBoxHandler.cs
index 44737bc78f..3de414398a 100644
--- a/src/Eto.Android/MessageBoxHandler.cs
+++ b/src/Eto.Android/MessageBoxHandler.cs
@@ -1,5 +1,3 @@
-using System;
-using Eto.Forms;
 using Eto.Android.Forms;
 
 using aa = Android.App;
diff --git a/src/Eto.Android/PixelLayoutHandler.cs b/src/Eto.Android/PixelLayoutHandler.cs
index 03a1c4c15e..ba51c1222e 100644
--- a/src/Eto.Android/PixelLayoutHandler.cs
+++ b/src/Eto.Android/PixelLayoutHandler.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-
 using aa = Android.App;
 using ac = Android.Content;
 using ao = Android.OS;
diff --git a/src/Eto.Android/Platform.cs b/src/Eto.Android/Platform.cs
index 650c2baa37..ab323bd62d 100644
--- a/src/Eto.Android/Platform.cs
+++ b/src/Eto.Android/Platform.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Threading;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.Android.Drawing;
 using Eto.Android.Forms.Controls;
 using Eto.Android.Forms;
diff --git a/src/Eto.Direct2D/2DConversions.cs b/src/Eto.Direct2D/2DConversions.cs
index 17ec3951f2..a10a1a3106 100644
--- a/src/Eto.Direct2D/2DConversions.cs
+++ b/src/Eto.Direct2D/2DConversions.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
 using Eto.Direct2D.Drawing;
 using s = SharpDX;
 using sd = SharpDX.Direct2D1;
diff --git a/src/Eto.Direct2D/Drawing/BitmapHandler.cs b/src/Eto.Direct2D/Drawing/BitmapHandler.cs
index 26add1e6d0..954b80856c 100644
--- a/src/Eto.Direct2D/Drawing/BitmapHandler.cs
+++ b/src/Eto.Direct2D/Drawing/BitmapHandler.cs
@@ -1,12 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
 using s = SharpDX;
 using sd = SharpDX.Direct2D1;
 using sw = SharpDX.WIC;
-using System.IO;
 using Eto.Shared.Drawing;
 
 namespace Eto.Direct2D.Drawing
diff --git a/src/Eto.Direct2D/Drawing/BrushData.cs b/src/Eto.Direct2D/Drawing/BrushData.cs
index 4d0058ee40..8a9aaa0576 100644
--- a/src/Eto.Direct2D/Drawing/BrushData.cs
+++ b/src/Eto.Direct2D/Drawing/BrushData.cs
@@ -1,6 +1,4 @@
-using System;
-using Eto.Drawing;
-using sd = SharpDX.Direct2D1;
+using sd = SharpDX.Direct2D1;
 
 namespace Eto.Direct2D.Drawing
 {
diff --git a/src/Eto.Direct2D/Drawing/FontFamilyHandler.cs b/src/Eto.Direct2D/Drawing/FontFamilyHandler.cs
index f0877f266d..c94f887dd5 100644
--- a/src/Eto.Direct2D/Drawing/FontFamilyHandler.cs
+++ b/src/Eto.Direct2D/Drawing/FontFamilyHandler.cs
@@ -1,14 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
 using s = SharpDX;
 using sd = SharpDX.Direct2D1;
 using sw = SharpDX.DirectWrite;
-using System.Globalization;
-using System.IO;
-
 namespace Eto.Direct2D.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.Direct2D/Drawing/FontHandler.cs b/src/Eto.Direct2D/Drawing/FontHandler.cs
index c25546ebf9..13217ed457 100644
--- a/src/Eto.Direct2D/Drawing/FontHandler.cs
+++ b/src/Eto.Direct2D/Drawing/FontHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
 using s = SharpDX;
 using sd = SharpDX.Direct2D1;
 using sw = SharpDX.DirectWrite;
diff --git a/src/Eto.Direct2D/Drawing/FontTypefaceHandler.cs b/src/Eto.Direct2D/Drawing/FontTypefaceHandler.cs
index 13df8141dc..580d234feb 100755
--- a/src/Eto.Direct2D/Drawing/FontTypefaceHandler.cs
+++ b/src/Eto.Direct2D/Drawing/FontTypefaceHandler.cs
@@ -1,12 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
 using Eto;
-using Eto.Drawing;
-using Eto.Forms;
 using s = SharpDX;
 using sd = SharpDX.Direct2D1;
 using sw = SharpDX.DirectWrite;
diff --git a/src/Eto.Direct2D/Drawing/FontsHandler.cs b/src/Eto.Direct2D/Drawing/FontsHandler.cs
index 701cc2e619..ce2d936595 100644
--- a/src/Eto.Direct2D/Drawing/FontsHandler.cs
+++ b/src/Eto.Direct2D/Drawing/FontsHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
 using s = SharpDX;
 using sd = SharpDX.Direct2D1;
 using sw = SharpDX.DirectWrite;
diff --git a/src/Eto.Direct2D/Drawing/FormattedTextHandler.cs b/src/Eto.Direct2D/Drawing/FormattedTextHandler.cs
index 8e069fdd8a..665eb7b6cb 100644
--- a/src/Eto.Direct2D/Drawing/FormattedTextHandler.cs
+++ b/src/Eto.Direct2D/Drawing/FormattedTextHandler.cs
@@ -1,5 +1,3 @@
-using System;
-using Eto.Drawing;
 using s = SharpDX;
 using sd = SharpDX.Direct2D1;
 using sw = SharpDX.DirectWrite;
diff --git a/src/Eto.Direct2D/Drawing/GraphicsHandler.cs b/src/Eto.Direct2D/Drawing/GraphicsHandler.cs
index da1e5644fa..894b34b501 100644
--- a/src/Eto.Direct2D/Drawing/GraphicsHandler.cs
+++ b/src/Eto.Direct2D/Drawing/GraphicsHandler.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using Eto.Drawing;
 using s = SharpDX;
 using sd = SharpDX.Direct2D1;
 using sw = SharpDX.DirectWrite;
-using Eto.Forms;
 using System.Diagnostics;
 #if WINFORMS
 using Eto.WinForms.Forms.Controls;
diff --git a/src/Eto.Direct2D/Drawing/GraphicsPathHandler.cs b/src/Eto.Direct2D/Drawing/GraphicsPathHandler.cs
index a8a5c2b5ea..195b14d036 100644
--- a/src/Eto.Direct2D/Drawing/GraphicsPathHandler.cs
+++ b/src/Eto.Direct2D/Drawing/GraphicsPathHandler.cs
@@ -1,12 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using s = SharpDX;
 using sd = SharpDX.Direct2D1;
 using sw = SharpDX.DirectWrite;
-using Eto.Drawing;
-
 namespace Eto.Direct2D.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.Direct2D/Drawing/IconFrameHandler.cs b/src/Eto.Direct2D/Drawing/IconFrameHandler.cs
index 60bbf33db9..3e281af405 100644
--- a/src/Eto.Direct2D/Drawing/IconFrameHandler.cs
+++ b/src/Eto.Direct2D/Drawing/IconFrameHandler.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
 using sd = SharpDX.Direct2D1;
 using sw = SharpDX.WIC;
-using System.IO;
 #if WINFORMS
 using Eto.WinForms.Drawing;
 #endif
diff --git a/src/Eto.Direct2D/Drawing/IconHandler.cs b/src/Eto.Direct2D/Drawing/IconHandler.cs
index 0298cc873e..34b720fd95 100644
--- a/src/Eto.Direct2D/Drawing/IconHandler.cs
+++ b/src/Eto.Direct2D/Drawing/IconHandler.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
 using sd = SharpDX.Direct2D1;
 using sw = SharpDX.WIC;
-using System.IO;
 #if WINFORMS
 using Eto.WinForms.Drawing;
 #endif
diff --git a/src/Eto.Direct2D/Drawing/ImageHandler.cs b/src/Eto.Direct2D/Drawing/ImageHandler.cs
index b1afa7ed00..bec24a0e3f 100644
--- a/src/Eto.Direct2D/Drawing/ImageHandler.cs
+++ b/src/Eto.Direct2D/Drawing/ImageHandler.cs
@@ -1,13 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
 using s = SharpDX;
 using sd = SharpDX.Direct2D1;
 using sw = SharpDX.WIC;
-using System.IO;
-using System.Diagnostics;
 #if WINFORMS
 using Eto.WinForms.Drawing;
 #endif
diff --git a/src/Eto.Direct2D/Drawing/IndexedBitmapHandler.cs b/src/Eto.Direct2D/Drawing/IndexedBitmapHandler.cs
index 3c04ffe1fd..8f5907e958 100644
--- a/src/Eto.Direct2D/Drawing/IndexedBitmapHandler.cs
+++ b/src/Eto.Direct2D/Drawing/IndexedBitmapHandler.cs
@@ -1,13 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
 using s = SharpDX;
 using sd = SharpDX.Direct2D1;
 using sw = SharpDX.WIC;
-using System.IO;
-
 namespace Eto.Direct2D.Drawing
 {
 	public class IndexedBitmapHandler : ImageHandler<IndexedBitmap>, IndexedBitmap.IHandler
diff --git a/src/Eto.Direct2D/Drawing/LinearGradientBrushHandler.cs b/src/Eto.Direct2D/Drawing/LinearGradientBrushHandler.cs
index f27b293b77..7f93c885f4 100644
--- a/src/Eto.Direct2D/Drawing/LinearGradientBrushHandler.cs
+++ b/src/Eto.Direct2D/Drawing/LinearGradientBrushHandler.cs
@@ -1,5 +1,4 @@
-using Eto.Drawing;
-using sd = SharpDX.Direct2D1;
+using sd = SharpDX.Direct2D1;
 using s = SharpDX;
 
 namespace Eto.Direct2D.Drawing
diff --git a/src/Eto.Direct2D/Drawing/MatrixHandler.cs b/src/Eto.Direct2D/Drawing/MatrixHandler.cs
index c126198dbc..ecf56f8f5a 100644
--- a/src/Eto.Direct2D/Drawing/MatrixHandler.cs
+++ b/src/Eto.Direct2D/Drawing/MatrixHandler.cs
@@ -1,5 +1,3 @@
-using System;
-using Eto.Drawing;
 using s = SharpDX;
 
 namespace Eto.Direct2D.Drawing
diff --git a/src/Eto.Direct2D/Drawing/PenHandler.cs b/src/Eto.Direct2D/Drawing/PenHandler.cs
index 375b2425b3..9165c5b213 100644
--- a/src/Eto.Direct2D/Drawing/PenHandler.cs
+++ b/src/Eto.Direct2D/Drawing/PenHandler.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using s = SharpDX;
 using sd = SharpDX.Direct2D1;
-using Eto.Drawing;
-
 namespace Eto.Direct2D.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.Direct2D/Drawing/RadialGradientBrushHandler.cs b/src/Eto.Direct2D/Drawing/RadialGradientBrushHandler.cs
index b21b2bcf8e..41cc3007fe 100644
--- a/src/Eto.Direct2D/Drawing/RadialGradientBrushHandler.cs
+++ b/src/Eto.Direct2D/Drawing/RadialGradientBrushHandler.cs
@@ -1,5 +1,4 @@
-using Eto.Drawing;
-using sd = SharpDX.Direct2D1;
+using sd = SharpDX.Direct2D1;
 using s = SharpDX;
 
 namespace Eto.Direct2D.Drawing
diff --git a/src/Eto.Direct2D/Drawing/SDFactory.cs b/src/Eto.Direct2D/Drawing/SDFactory.cs
index 3172bf1d3f..492cb0b5c3 100644
--- a/src/Eto.Direct2D/Drawing/SDFactory.cs
+++ b/src/Eto.Direct2D/Drawing/SDFactory.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using s = SharpDX;
 using sd = SharpDX.Direct2D1;
 using sw = SharpDX.DirectWrite;
diff --git a/src/Eto.Direct2D/Drawing/SolidBrushHandler.cs b/src/Eto.Direct2D/Drawing/SolidBrushHandler.cs
index 5069c2bf62..65caa9cbc3 100644
--- a/src/Eto.Direct2D/Drawing/SolidBrushHandler.cs
+++ b/src/Eto.Direct2D/Drawing/SolidBrushHandler.cs
@@ -1,5 +1,4 @@
-using Eto.Drawing;
-using sd = SharpDX.Direct2D1;
+using sd = SharpDX.Direct2D1;
 
 namespace Eto.Direct2D.Drawing
 {
diff --git a/src/Eto.Direct2D/Drawing/TextureBrushHandler.cs b/src/Eto.Direct2D/Drawing/TextureBrushHandler.cs
index 3e3728d268..d7b5678e4b 100644
--- a/src/Eto.Direct2D/Drawing/TextureBrushHandler.cs
+++ b/src/Eto.Direct2D/Drawing/TextureBrushHandler.cs
@@ -1,6 +1,4 @@
-using Eto.Drawing;
-using System;
-using sd = SharpDX.Direct2D1;
+using sd = SharpDX.Direct2D1;
 
 namespace Eto.Direct2D.Drawing
 {
diff --git a/src/Eto.Direct2D/Eto.Direct2D.csproj b/src/Eto.Direct2D/Eto.Direct2D.csproj
index de90b2661d..ea096c7850 100755
--- a/src/Eto.Direct2D/Eto.Direct2D.csproj
+++ b/src/Eto.Direct2D/Eto.Direct2D.csproj
@@ -33,6 +33,10 @@ You do not need to use any of the classes of this assembly (unless customizing t
     </PackageDescription>
   </PropertyGroup>
   
+  <ItemGroup>
+    <Using Include="System.Windows.Forms" Alias="swf" />
+  </ItemGroup>
+  
   <ItemGroup Condition="$(TargetFramework) == 'net462'">
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
@@ -45,7 +49,6 @@ You do not need to use any of the classes of this assembly (unless customizing t
       <Link>Drawing\SplineHelper.cs</Link>
     </Compile>
     <Compile Include="..\Shared\GradientHelper.cs" />
-    <Compile Include="..\Eto.WinForms\Win32.gdi.cs" Link="Win32.gdi.cs" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Eto.Direct2D/Forms/Controls/DrawableHandler.cs b/src/Eto.Direct2D/Forms/Controls/DrawableHandler.cs
index 51f1b696c7..559ef0622f 100644
--- a/src/Eto.Direct2D/Forms/Controls/DrawableHandler.cs
+++ b/src/Eto.Direct2D/Forms/Controls/DrawableHandler.cs
@@ -1,13 +1,4 @@
-using Eto.Drawing;
-using Eto.Forms;
-using Eto.Direct2D.Drawing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using swf = System.Windows.Forms;
-
+using Eto.Direct2D.Drawing;
 namespace Eto.Direct2D.Forms.Controls
 {
 	public class DrawableHandler : Eto.WinForms.Forms.Controls.DrawableHandler
diff --git a/src/Eto.Direct2D/Forms/Printing/PrintDocumentHandler.cs b/src/Eto.Direct2D/Forms/Printing/PrintDocumentHandler.cs
index 6920179f1c..339efb4e47 100644
--- a/src/Eto.Direct2D/Forms/Printing/PrintDocumentHandler.cs
+++ b/src/Eto.Direct2D/Forms/Printing/PrintDocumentHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Eto.Direct2D.Forms.Printing
+namespace Eto.Direct2D.Forms.Printing
 {
 	public class PrintDocumentHandler : Eto.WinForms.Forms.Printing.PrintDocumentHandler
 	{
diff --git a/src/Eto.Direct2D/Platform.cs b/src/Eto.Direct2D/Platform.cs
index 63493c5061..e0c6af283d 100644
--- a/src/Eto.Direct2D/Platform.cs
+++ b/src/Eto.Direct2D/Platform.cs
@@ -1,5 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.Direct2D.Drawing;
 using Eto.Direct2D.Forms.Controls;
 using Eto.Direct2D.Forms.Printing;
diff --git a/src/Eto.Forms.Templates/Eto.Forms.Templates.csproj b/src/Eto.Forms.Templates/Eto.Forms.Templates.csproj
index 6f76b1bad4..116c664f5a 100755
--- a/src/Eto.Forms.Templates/Eto.Forms.Templates.csproj
+++ b/src/Eto.Forms.Templates/Eto.Forms.Templates.csproj
@@ -26,6 +26,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+    <Using Remove="@(Using)" />
     <PackageReference Remove="Microsoft.NETCore.App" />
     
     <None Include="content\NuGet.Config" />
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.cs b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.cs
index 61d655308f..829045ffb7 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.cs
+++ b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.cs
@@ -1,8 +1,4 @@
 #if (UseCode || UseCodePreview)
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace EtoApp._1
 {
 	public partial class MainForm : Form
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.eto.cs b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.eto.cs
index 2a2127c420..e4bf1c19fc 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.eto.cs
+++ b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.eto.cs
@@ -1,8 +1,4 @@
 #if (UseCodePreview)
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace EtoApp._1
 {
 	partial class MainForm : Form
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.jeto.cs b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.jeto.cs
index c5c37514c7..252c4cbdbe 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.jeto.cs
+++ b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.jeto.cs
@@ -1,8 +1,4 @@
 #if (UseJeto)
-using System;
-using System.Collections.Generic;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Serialization.Json;
 
 namespace EtoApp._1
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.xeto.cs b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.xeto.cs
index 0e96c5edca..5753bcccbe 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.xeto.cs
+++ b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/MainForm.xeto.cs
@@ -1,8 +1,4 @@
 #if (UseXeto)
-using System;
-using System.Collections.Generic;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Serialization.Xaml;
 
 namespace EtoApp._1
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/Program.cs b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/Program.cs
index a42072d833..8d76b84f8d 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/Program.cs
+++ b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/Program.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
-namespace EtoApp._1
+namespace EtoApp._1
 {
 	class Program
 	{
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Gtk/Program.cs b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Gtk/Program.cs
index 5d6b85bdc1..8719e14bff 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Gtk/Program.cs
+++ b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Gtk/Program.cs
@@ -1,7 +1,4 @@
-using System;
-using Eto.Forms;
-
-namespace EtoApp._1.Gtk
+namespace EtoApp._1.Gtk
 {
 	class Program
 	{
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Mac/Program.cs b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Mac/Program.cs
index f36b7d02d7..79ae6ae2a6 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Mac/Program.cs
+++ b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Mac/Program.cs
@@ -1,7 +1,4 @@
-using System;
-using Eto.Forms;
-
-namespace EtoApp._1.Mac
+namespace EtoApp._1.Mac
 {
 	class Program
 	{
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.MacOS/Program.cs b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.MacOS/Program.cs
index 02f14fbcb9..1010450b27 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.MacOS/Program.cs
+++ b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.MacOS/Program.cs
@@ -1,7 +1,4 @@
-using System;
-using Eto.Forms;
-
-namespace EtoApp._1.Mac
+namespace EtoApp._1.Mac
 {
 	class Program
 	{
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.WinForms/Program.cs b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.WinForms/Program.cs
index 5ecbdeb5b5..0140f476cc 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.WinForms/Program.cs
+++ b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.WinForms/Program.cs
@@ -1,7 +1,4 @@
-using System;
-using Eto.Forms;
-
-namespace EtoApp._1.WinForms
+namespace EtoApp._1.WinForms
 {
 	class Program
 	{
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Wpf/Program.cs b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Wpf/Program.cs
index 3caeaf9ad0..6de85e49b0 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Wpf/Program.cs
+++ b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Wpf/Program.cs
@@ -1,7 +1,4 @@
-using System;
-using Eto.Forms;
-
-namespace EtoApp._1.Wpf
+namespace EtoApp._1.Wpf
 {
 	class Program
 	{
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Program.cs b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Program.cs
index fa89389543..f7f6e8f4e6 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Program.cs
+++ b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Program.cs
@@ -1,6 +1,4 @@
 using AppKit;
-using Eto.Forms;
-
 namespace EtoApp._1.XamMac
 {
 	class Program
diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Wpf/Program.cs b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Wpf/Program.cs
index 3caeaf9ad0..6de85e49b0 100755
--- a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Wpf/Program.cs
+++ b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Wpf/Program.cs
@@ -1,7 +1,4 @@
-using System;
-using Eto.Forms;
-
-namespace EtoApp._1.Wpf
+namespace EtoApp._1.Wpf
 {
 	class Program
 	{
diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.MacOS/Program.cs b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.MacOS/Program.cs
index 02f14fbcb9..1010450b27 100755
--- a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.MacOS/Program.cs
+++ b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.MacOS/Program.cs
@@ -1,7 +1,4 @@
-using System;
-using Eto.Forms;
-
-namespace EtoApp._1.Mac
+namespace EtoApp._1.Mac
 {
 	class Program
 	{
diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Program.cs b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Program.cs
index fa89389543..f7f6e8f4e6 100755
--- a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Program.cs
+++ b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Program.cs
@@ -1,6 +1,4 @@
 using AppKit;
-using Eto.Forms;
-
 namespace EtoApp._1.XamMac
 {
 	class Program
diff --git a/src/Eto.Forms.Templates/content/File-CSharp/MainForm.cs b/src/Eto.Forms.Templates/content/File-CSharp/MainForm.cs
index 324bc74818..c959cfb306 100755
--- a/src/Eto.Forms.Templates/content/File-CSharp/MainForm.cs
+++ b/src/Eto.Forms.Templates/content/File-CSharp/MainForm.cs
@@ -1,8 +1,4 @@
 #if (UseCode || UseCodePreview)
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace EtoApp._1
 {
 	public partial class MainForm : Form
diff --git a/src/Eto.Forms.Templates/content/File-CSharp/MainForm.eto.cs b/src/Eto.Forms.Templates/content/File-CSharp/MainForm.eto.cs
index 2a2127c420..e4bf1c19fc 100755
--- a/src/Eto.Forms.Templates/content/File-CSharp/MainForm.eto.cs
+++ b/src/Eto.Forms.Templates/content/File-CSharp/MainForm.eto.cs
@@ -1,8 +1,4 @@
 #if (UseCodePreview)
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace EtoApp._1
 {
 	partial class MainForm : Form
diff --git a/src/Eto.Forms.Templates/content/File-CSharp/MainForm.jeto.cs b/src/Eto.Forms.Templates/content/File-CSharp/MainForm.jeto.cs
index c5c37514c7..252c4cbdbe 100755
--- a/src/Eto.Forms.Templates/content/File-CSharp/MainForm.jeto.cs
+++ b/src/Eto.Forms.Templates/content/File-CSharp/MainForm.jeto.cs
@@ -1,8 +1,4 @@
 #if (UseJeto)
-using System;
-using System.Collections.Generic;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Serialization.Json;
 
 namespace EtoApp._1
diff --git a/src/Eto.Forms.Templates/content/File-CSharp/MainForm.xeto.cs b/src/Eto.Forms.Templates/content/File-CSharp/MainForm.xeto.cs
index 0e96c5edca..5753bcccbe 100755
--- a/src/Eto.Forms.Templates/content/File-CSharp/MainForm.xeto.cs
+++ b/src/Eto.Forms.Templates/content/File-CSharp/MainForm.xeto.cs
@@ -1,8 +1,4 @@
 #if (UseXeto)
-using System;
-using System.Collections.Generic;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Serialization.Xaml;
 
 namespace EtoApp._1
diff --git a/src/Eto.Gtk/CustomControls/AnalogClock.cs b/src/Eto.Gtk/CustomControls/AnalogClock.cs
index 5aff38c782..0d2a24621b 100644
--- a/src/Eto.Gtk/CustomControls/AnalogClock.cs
+++ b/src/Eto.Gtk/CustomControls/AnalogClock.cs
@@ -1,5 +1,5 @@
-using System;
 using Gdk;
+using Rectangle = Gdk.Rectangle;
 
 namespace Eto.GtkSharp.CustomControls
 {
diff --git a/src/Eto.Gtk/CustomControls/BaseComboBox.gtk2.cs b/src/Eto.Gtk/CustomControls/BaseComboBox.gtk2.cs
index 39e46f1a6f..185a3e8785 100644
--- a/src/Eto.Gtk/CustomControls/BaseComboBox.gtk2.cs
+++ b/src/Eto.Gtk/CustomControls/BaseComboBox.gtk2.cs
@@ -1,5 +1,4 @@
 #if GTK2
-using System;
 using Gtk;
 
 namespace Eto.GtkSharp.CustomControls
diff --git a/src/Eto.Gtk/CustomControls/BaseComboBox.gtk3.cs b/src/Eto.Gtk/CustomControls/BaseComboBox.gtk3.cs
index 5e60696d52..97fdfeb66e 100644
--- a/src/Eto.Gtk/CustomControls/BaseComboBox.gtk3.cs
+++ b/src/Eto.Gtk/CustomControls/BaseComboBox.gtk3.cs
@@ -1,5 +1,4 @@
 #if GTK3
-using System;
 using Gtk;
 
 namespace Eto.GtkSharp.CustomControls
diff --git a/src/Eto.Gtk/CustomControls/DateComboBox.cs b/src/Eto.Gtk/CustomControls/DateComboBox.cs
index 5388adc0c6..82cafecfdb 100644
--- a/src/Eto.Gtk/CustomControls/DateComboBox.cs
+++ b/src/Eto.Gtk/CustomControls/DateComboBox.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Threading;
-using Eto.Forms;
-using Eto.Drawing;
-
-using System.Globalization;
 using Eto.GtkSharp.Forms;
 
 namespace Eto.GtkSharp.CustomControls
diff --git a/src/Eto.Gtk/CustomControls/DateComboBoxDialog.cs b/src/Eto.Gtk/CustomControls/DateComboBoxDialog.cs
index 17dd84bac8..2fd4bfbf3a 100644
--- a/src/Eto.Gtk/CustomControls/DateComboBoxDialog.cs
+++ b/src/Eto.Gtk/CustomControls/DateComboBoxDialog.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Threading;
-using Eto.Forms;
 using Gdk;
 
 namespace Eto.GtkSharp.CustomControls
diff --git a/src/Eto.Gtk/CustomControls/SizableBin.cs b/src/Eto.Gtk/CustomControls/SizableBin.cs
index 58265a1460..e76eea0846 100644
--- a/src/Eto.Gtk/CustomControls/SizableBin.cs
+++ b/src/Eto.Gtk/CustomControls/SizableBin.cs
@@ -1,5 +1,7 @@
 using Gtk;
 using Gdk;
+using Rectangle = Gdk.Rectangle;
+using Orientation = Gtk.Orientation;
 
 namespace Eto.GtkSharp.CustomControls
 {
diff --git a/src/Eto.Gtk/Drawing/BitmapHandler.cs b/src/Eto.Gtk/Drawing/BitmapHandler.cs
index 48b9dff3dd..bd724589cf 100644
--- a/src/Eto.Gtk/Drawing/BitmapHandler.cs
+++ b/src/Eto.Gtk/Drawing/BitmapHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using System.IO;
-using Eto.Drawing;
-using System.Collections.Generic;
 using Eto.Shared.Drawing;
 
 namespace Eto.GtkSharp.Drawing
diff --git a/src/Eto.Gtk/Drawing/BrushHandler.cs b/src/Eto.Gtk/Drawing/BrushHandler.cs
index 846d5f8f7c..322cbceb41 100644
--- a/src/Eto.Gtk/Drawing/BrushHandler.cs
+++ b/src/Eto.Gtk/Drawing/BrushHandler.cs
@@ -1,5 +1,3 @@
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.Gtk/Drawing/FontFamilyHandler.cs b/src/Eto.Gtk/Drawing/FontFamilyHandler.cs
index 6314692b9a..7d9781577d 100755
--- a/src/Eto.Gtk/Drawing/FontFamilyHandler.cs
+++ b/src/Eto.Gtk/Drawing/FontFamilyHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Drawing
 {
 	public class FontFamilyHandler : WidgetHandler<Pango.FontFamily, FontFamily>, FontFamily.IHandler
diff --git a/src/Eto.Gtk/Drawing/FontHandler.cs b/src/Eto.Gtk/Drawing/FontHandler.cs
index 8b08477777..382bc31c49 100755
--- a/src/Eto.Gtk/Drawing/FontHandler.cs
+++ b/src/Eto.Gtk/Drawing/FontHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Linq;
-using System.Text;
-using System.Collections.Generic;
-
 namespace Eto.GtkSharp.Drawing
 {
 	public static class FontHandlerExtensions
diff --git a/src/Eto.Gtk/Drawing/FontTypefaceHandler.cs b/src/Eto.Gtk/Drawing/FontTypefaceHandler.cs
index 186a9c3069..fa1640219e 100644
--- a/src/Eto.Gtk/Drawing/FontTypefaceHandler.cs
+++ b/src/Eto.Gtk/Drawing/FontTypefaceHandler.cs
@@ -1,11 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-
 namespace Eto.GtkSharp.Drawing
 {
 	public class FontTypefaceHandler : WidgetHandler<Pango.FontFace, FontTypeface>, FontTypeface.IHandler
diff --git a/src/Eto.Gtk/Drawing/FontsHandler.cs b/src/Eto.Gtk/Drawing/FontsHandler.cs
index 72a50302da..3263ddc16c 100644
--- a/src/Eto.Gtk/Drawing/FontsHandler.cs
+++ b/src/Eto.Gtk/Drawing/FontsHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.GtkSharp.Drawing
 {
 	public class FontsHandler : WidgetHandler<Widget>, Fonts.IHandler
diff --git a/src/Eto.Gtk/Drawing/FormattedTextHandler.cs b/src/Eto.Gtk/Drawing/FormattedTextHandler.cs
index e4f675680c..ce0aa7f6e1 100644
--- a/src/Eto.Gtk/Drawing/FormattedTextHandler.cs
+++ b/src/Eto.Gtk/Drawing/FormattedTextHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Drawing
 {
 	public class FormattedTextHandler : WidgetHandler<object, FormattedText, FormattedText.ICallback>, FormattedText.IHandler
diff --git a/src/Eto.Gtk/Drawing/GraphicsHandler.cs b/src/Eto.Gtk/Drawing/GraphicsHandler.cs
index f74f85a6b6..1b86cc2f4e 100644
--- a/src/Eto.Gtk/Drawing/GraphicsHandler.cs
+++ b/src/Eto.Gtk/Drawing/GraphicsHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using Eto.Drawing;
-using System.Collections.Generic;
 using GLib;
-using System.Runtime.InteropServices;
-
 namespace Eto.GtkSharp.Drawing
 {
 	public class GraphicsHandler : WidgetHandler<Cairo.Context, Graphics>, Graphics.IHandler
diff --git a/src/Eto.Gtk/Drawing/GraphicsPathHandler.cs b/src/Eto.Gtk/Drawing/GraphicsPathHandler.cs
index e5736bd0d1..cc85d53161 100644
--- a/src/Eto.Gtk/Drawing/GraphicsPathHandler.cs
+++ b/src/Eto.Gtk/Drawing/GraphicsPathHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.GtkSharp.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.Gtk/Drawing/IconFrameHandler.cs b/src/Eto.Gtk/Drawing/IconFrameHandler.cs
index efd988bd50..3837a408ef 100644
--- a/src/Eto.Gtk/Drawing/IconFrameHandler.cs
+++ b/src/Eto.Gtk/Drawing/IconFrameHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.IO;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.GtkSharp.Drawing
 {
 	public class IconFrameHandler : IconFrame.IHandler
diff --git a/src/Eto.Gtk/Drawing/IconHandler.cs b/src/Eto.Gtk/Drawing/IconHandler.cs
index 234730394d..4dcfc56e96 100644
--- a/src/Eto.Gtk/Drawing/IconHandler.cs
+++ b/src/Eto.Gtk/Drawing/IconHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.IO;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.GtkSharp.Drawing
 {
 
diff --git a/src/Eto.Gtk/Drawing/ImageHandler.cs b/src/Eto.Gtk/Drawing/ImageHandler.cs
index fb0dec7c4d..0678eb1d5e 100644
--- a/src/Eto.Gtk/Drawing/ImageHandler.cs
+++ b/src/Eto.Gtk/Drawing/ImageHandler.cs
@@ -1,5 +1,3 @@
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Drawing
 {
 	public interface IGtkPixbuf
diff --git a/src/Eto.Gtk/Drawing/IndexedBitmapHandler.cs b/src/Eto.Gtk/Drawing/IndexedBitmapHandler.cs
index cb92be2bd2..feb6c2cdb1 100644
--- a/src/Eto.Gtk/Drawing/IndexedBitmapHandler.cs
+++ b/src/Eto.Gtk/Drawing/IndexedBitmapHandler.cs
@@ -1,9 +1,4 @@
 #define GTK_2_6
-using System;
-using System.Globalization;
-using System.Linq;
-using System.Runtime.InteropServices;
-using Eto.Drawing;
 using Eto.Shared.Drawing;
 
 namespace Eto.GtkSharp.Drawing
diff --git a/src/Eto.Gtk/Drawing/LinearGradientBrushHandler.cs b/src/Eto.Gtk/Drawing/LinearGradientBrushHandler.cs
index 9462895e1a..f3b7c558be 100644
--- a/src/Eto.Gtk/Drawing/LinearGradientBrushHandler.cs
+++ b/src/Eto.Gtk/Drawing/LinearGradientBrushHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Runtime.InteropServices;
-
 namespace Eto.GtkSharp.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.Gtk/Drawing/MatrixHandler.cs b/src/Eto.Gtk/Drawing/MatrixHandler.cs
index f9b522bbfa..d838c17b66 100644
--- a/src/Eto.Gtk/Drawing/MatrixHandler.cs
+++ b/src/Eto.Gtk/Drawing/MatrixHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.Gtk/Drawing/PenHandler.cs b/src/Eto.Gtk/Drawing/PenHandler.cs
index 76eb9b5616..bbd7c2da93 100644
--- a/src/Eto.Gtk/Drawing/PenHandler.cs
+++ b/src/Eto.Gtk/Drawing/PenHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.Gtk/Drawing/RadialGradientBrushHandler.cs b/src/Eto.Gtk/Drawing/RadialGradientBrushHandler.cs
index 9a5a33c28c..b3c7447e47 100644
--- a/src/Eto.Gtk/Drawing/RadialGradientBrushHandler.cs
+++ b/src/Eto.Gtk/Drawing/RadialGradientBrushHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Runtime.InteropServices;
-
 namespace Eto.GtkSharp.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.Gtk/Drawing/SolidBrushHandler.cs b/src/Eto.Gtk/Drawing/SolidBrushHandler.cs
index 23917eaf9d..5ccc9b3bce 100644
--- a/src/Eto.Gtk/Drawing/SolidBrushHandler.cs
+++ b/src/Eto.Gtk/Drawing/SolidBrushHandler.cs
@@ -1,5 +1,3 @@
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.Gtk/Drawing/SystemColorsHandler.cs b/src/Eto.Gtk/Drawing/SystemColorsHandler.cs
index d1de130b7d..baf6a1aa9a 100644
--- a/src/Eto.Gtk/Drawing/SystemColorsHandler.cs
+++ b/src/Eto.Gtk/Drawing/SystemColorsHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Drawing
 {
 	public class SystemColorsHandler : SystemColors.IHandler
diff --git a/src/Eto.Gtk/Drawing/TextureBrushHandler.cs b/src/Eto.Gtk/Drawing/TextureBrushHandler.cs
index 799880cce1..d16433505e 100644
--- a/src/Eto.Gtk/Drawing/TextureBrushHandler.cs
+++ b/src/Eto.Gtk/Drawing/TextureBrushHandler.cs
@@ -1,5 +1,3 @@
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.Gtk/EtoEnvironmentHandler.cs b/src/Eto.Gtk/EtoEnvironmentHandler.cs
index 571632090c..1ce62a5b9a 100644
--- a/src/Eto.Gtk/EtoEnvironmentHandler.cs
+++ b/src/Eto.Gtk/EtoEnvironmentHandler.cs
@@ -1,10 +1,4 @@
-using System;
 using Eto;
-using System.Linq;
-using System.Reflection;
-using System.IO;
-using System.Diagnostics;
-
 namespace Eto.GtkSharp
 {
 	public class EtoEnvironmentHandler : WidgetHandler<Widget>, EtoEnvironment.IHandler
diff --git a/src/Eto.Gtk/EtoWebView.cs b/src/Eto.Gtk/EtoWebView.cs
index b3176a15a9..699e22a225 100644
--- a/src/Eto.Gtk/EtoWebView.cs
+++ b/src/Eto.Gtk/EtoWebView.cs
@@ -1,9 +1,6 @@
 #if GTK2
-using System;
 using WebKit;
 using GLib;
-using System.Runtime.InteropServices;
-
 namespace Eto.GtkSharp
 {
 	#if GTK2
diff --git a/src/Eto.Gtk/Forms/AboutDialogHandler.cs b/src/Eto.Gtk/Forms/AboutDialogHandler.cs
index 19b4912063..8520d6879e 100644
--- a/src/Eto.Gtk/Forms/AboutDialogHandler.cs
+++ b/src/Eto.Gtk/Forms/AboutDialogHandler.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
-namespace Eto.GtkSharp.Forms
+namespace Eto.GtkSharp.Forms
 {
 	public class AboutDialogHandler : WidgetHandler<Gtk.AboutDialog, AboutDialog, AboutDialog.ICallback>, AboutDialog.IHandler
 	{
diff --git a/src/Eto.Gtk/Forms/ApplicationHandler.cs b/src/Eto.Gtk/Forms/ApplicationHandler.cs
index 2918f5581b..e3a3419d0f 100644
--- a/src/Eto.Gtk/Forms/ApplicationHandler.cs
+++ b/src/Eto.Gtk/Forms/ApplicationHandler.cs
@@ -1,16 +1,5 @@
-using System;
-using Eto.Forms;
-using System.Diagnostics;
-using System.Threading;
-using System.ComponentModel;
 using Eto.GtkSharp.Drawing;
-using Eto.Drawing;
-using System.Collections.Generic;
 using Eto.GtkSharp.Forms;
-using System.IO;
-using System.Reflection;
-using System.Linq;
-
 namespace Eto.GtkSharp.Forms
 {
 #if GTK3
diff --git a/src/Eto.Gtk/Forms/Cells/CellHandler.cs b/src/Eto.Gtk/Forms/Cells/CellHandler.cs
index a06677b0eb..4d6b3b591f 100644
--- a/src/Eto.Gtk/Forms/Cells/CellHandler.cs
+++ b/src/Eto.Gtk/Forms/Cells/CellHandler.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Forms;
 using Eto.GtkSharp.Forms.Controls;
-using System.Runtime.InteropServices;
-
 namespace Eto.GtkSharp.Forms.Cells
 {
 	public interface ICellDataSource
diff --git a/src/Eto.Gtk/Forms/Cells/CheckBoxCellHandler.cs b/src/Eto.Gtk/Forms/Cells/CheckBoxCellHandler.cs
index 2645b1f003..7fcde0d6c1 100644
--- a/src/Eto.Gtk/Forms/Cells/CheckBoxCellHandler.cs
+++ b/src/Eto.Gtk/Forms/Cells/CheckBoxCellHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms.Cells
 {
 	public class CheckBoxCellHandler : SingleCellHandler<Gtk.CellRendererToggle, CheckBoxCell, CheckBoxCell.ICallback>, CheckBoxCell.IHandler
diff --git a/src/Eto.Gtk/Forms/Cells/ComboBoxCellHandler.cs b/src/Eto.Gtk/Forms/Cells/ComboBoxCellHandler.cs
index b63e81f2a2..7002a6cc71 100644
--- a/src/Eto.Gtk/Forms/Cells/ComboBoxCellHandler.cs
+++ b/src/Eto.Gtk/Forms/Cells/ComboBoxCellHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Collections.Generic;
-using System.Collections;
-
 namespace Eto.GtkSharp.Forms.Cells
 {
 	public class ComboBoxCellHandler : SingleCellHandler<Gtk.CellRendererCombo, ComboBoxCell, ComboBoxCell.ICallback>, ComboBoxCell.IHandler
diff --git a/src/Eto.Gtk/Forms/Cells/CustomCellHandler.cs b/src/Eto.Gtk/Forms/Cells/CustomCellHandler.cs
index 31e6573476..cd5dcf0e67 100644
--- a/src/Eto.Gtk/Forms/Cells/CustomCellHandler.cs
+++ b/src/Eto.Gtk/Forms/Cells/CustomCellHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.GtkSharp.Drawing;
-using System.Runtime.InteropServices;
-
 #if GTK2
 using IGtkCellEditable = Gtk.CellEditable;
 using IGtkCellEditableImplementor = Gtk.CellEditableImplementor;
diff --git a/src/Eto.Gtk/Forms/Cells/DrawableCellHandler.cs b/src/Eto.Gtk/Forms/Cells/DrawableCellHandler.cs
index a86dd253ff..d3fa9cbf72 100644
--- a/src/Eto.Gtk/Forms/Cells/DrawableCellHandler.cs
+++ b/src/Eto.Gtk/Forms/Cells/DrawableCellHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.GtkSharp.Drawing;
 
 namespace Eto.GtkSharp.Forms.Cells
diff --git a/src/Eto.Gtk/Forms/Cells/GridCellFormattingEventArgs.cs b/src/Eto.Gtk/Forms/Cells/GridCellFormattingEventArgs.cs
index 5cd04682c8..bbb8b29511 100644
--- a/src/Eto.Gtk/Forms/Cells/GridCellFormattingEventArgs.cs
+++ b/src/Eto.Gtk/Forms/Cells/GridCellFormattingEventArgs.cs
@@ -1,5 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.GtkSharp.Drawing;
 
 namespace Eto.GtkSharp.Forms.Cells
diff --git a/src/Eto.Gtk/Forms/Cells/ImageTextCellHandler.cs b/src/Eto.Gtk/Forms/Cells/ImageTextCellHandler.cs
index 120e418595..32e6c47923 100644
--- a/src/Eto.Gtk/Forms/Cells/ImageTextCellHandler.cs
+++ b/src/Eto.Gtk/Forms/Cells/ImageTextCellHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.GtkSharp.Drawing;
 
 namespace Eto.GtkSharp.Forms.Cells
diff --git a/src/Eto.Gtk/Forms/Cells/ImageViewCellHandler.cs b/src/Eto.Gtk/Forms/Cells/ImageViewCellHandler.cs
index 0892aa6db8..7b7069dcf9 100644
--- a/src/Eto.Gtk/Forms/Cells/ImageViewCellHandler.cs
+++ b/src/Eto.Gtk/Forms/Cells/ImageViewCellHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.GtkSharp.Drawing;
 
 namespace Eto.GtkSharp.Forms.Cells
diff --git a/src/Eto.Gtk/Forms/Cells/ProgressCellHandler.cs b/src/Eto.Gtk/Forms/Cells/ProgressCellHandler.cs
index 8b5e80cffa..b2863ac555 100644
--- a/src/Eto.Gtk/Forms/Cells/ProgressCellHandler.cs
+++ b/src/Eto.Gtk/Forms/Cells/ProgressCellHandler.cs
@@ -1,7 +1,4 @@
-using System;
-using Eto.Forms;
-
-namespace Eto.GtkSharp.Forms.Cells
+namespace Eto.GtkSharp.Forms.Cells
 {
 	public class ProgressCellHandler : SingleCellHandler<Gtk.CellRendererProgress, ProgressCell, ProgressCell.ICallback>, ProgressCell.IHandler
 	{
diff --git a/src/Eto.Gtk/Forms/Cells/TextBoxCellHandler.cs b/src/Eto.Gtk/Forms/Cells/TextBoxCellHandler.cs
index aea093677b..1efcc9c7dc 100644
--- a/src/Eto.Gtk/Forms/Cells/TextBoxCellHandler.cs
+++ b/src/Eto.Gtk/Forms/Cells/TextBoxCellHandler.cs
@@ -1,5 +1,3 @@
-using System;
-using Eto.Forms;
 using Eto.GtkSharp.Forms.Controls;
 
 namespace Eto.GtkSharp.Forms.Cells
diff --git a/src/Eto.Gtk/Forms/ClipboardHandler.cs b/src/Eto.Gtk/Forms/ClipboardHandler.cs
index 083a6a2ddb..da3cbf4002 100644
--- a/src/Eto.Gtk/Forms/ClipboardHandler.cs
+++ b/src/Eto.Gtk/Forms/ClipboardHandler.cs
@@ -1,12 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Linq;
 using Eto.GtkSharp.Drawing;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-
 namespace Eto.GtkSharp.Forms
 {
 	public class ClipboardHandler : WidgetHandler<Gtk.Clipboard, Clipboard>, Clipboard.IHandler
diff --git a/src/Eto.Gtk/Forms/ColorDialogHandler.cs b/src/Eto.Gtk/Forms/ColorDialogHandler.cs
index 283914d3d3..65dcd80cff 100644
--- a/src/Eto.Gtk/Forms/ColorDialogHandler.cs
+++ b/src/Eto.Gtk/Forms/ColorDialogHandler.cs
@@ -1,8 +1,4 @@
 #if GTKCORE
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms
 {
 	public class ColorDialogHandler : WidgetHandler<Gtk.ColorChooserDialog, ColorDialog, ColorDialog.ICallback>, ColorDialog.IHandler
diff --git a/src/Eto.Gtk/Forms/ColorDialogHandlerOld.cs b/src/Eto.Gtk/Forms/ColorDialogHandlerOld.cs
index e9e9c4d666..d4d5439c7e 100644
--- a/src/Eto.Gtk/Forms/ColorDialogHandlerOld.cs
+++ b/src/Eto.Gtk/Forms/ColorDialogHandlerOld.cs
@@ -1,8 +1,4 @@
 #if !GTKCORE
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms
 {
 	public class ColorDialogHandler : WidgetHandler<Gtk.ColorSelectionDialog, ColorDialog, ColorDialog.ICallback>, ColorDialog.IHandler
diff --git a/src/Eto.Gtk/Forms/Controls/ButtonHandler.cs b/src/Eto.Gtk/Forms/Controls/ButtonHandler.cs
index 6963523d15..0f011d4b60 100644
--- a/src/Eto.Gtk/Forms/Controls/ButtonHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/ButtonHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class ButtonHandler : ButtonHandler<Gtk.Button, Button, Button.ICallback>
diff --git a/src/Eto.Gtk/Forms/Controls/ButtonHandler.gtk2.cs b/src/Eto.Gtk/Forms/Controls/ButtonHandler.gtk2.cs
index 9f466a904a..4d8fd633b7 100644
--- a/src/Eto.Gtk/Forms/Controls/ButtonHandler.gtk2.cs
+++ b/src/Eto.Gtk/Forms/Controls/ButtonHandler.gtk2.cs
@@ -1,8 +1,4 @@
 #if GTK2
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	/// <summary>
diff --git a/src/Eto.Gtk/Forms/Controls/ButtonHandler.gtk3.cs b/src/Eto.Gtk/Forms/Controls/ButtonHandler.gtk3.cs
index 0688acb2da..e178b109ad 100644
--- a/src/Eto.Gtk/Forms/Controls/ButtonHandler.gtk3.cs
+++ b/src/Eto.Gtk/Forms/Controls/ButtonHandler.gtk3.cs
@@ -1,8 +1,4 @@
 #if GTK3
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	/// <summary>
diff --git a/src/Eto.Gtk/Forms/Controls/CalendarHandler.cs b/src/Eto.Gtk/Forms/Controls/CalendarHandler.cs
index 17ed169556..8a802d009f 100644
--- a/src/Eto.Gtk/Forms/Controls/CalendarHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/CalendarHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class CalendarHandler : GtkControl<Gtk.Calendar, Calendar, Calendar.ICallback>, Calendar.IHandler
diff --git a/src/Eto.Gtk/Forms/Controls/CheckBoxHandler.cs b/src/Eto.Gtk/Forms/Controls/CheckBoxHandler.cs
index 88f0139ae0..0423fade65 100644
--- a/src/Eto.Gtk/Forms/Controls/CheckBoxHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/CheckBoxHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.GtkSharp.Drawing;
 using Gtk;
 
diff --git a/src/Eto.Gtk/Forms/Controls/ColorPickerHandler.cs b/src/Eto.Gtk/Forms/Controls/ColorPickerHandler.cs
index 25607de23f..c22f604f4c 100644
--- a/src/Eto.Gtk/Forms/Controls/ColorPickerHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/ColorPickerHandler.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
-namespace Eto.GtkSharp.Forms.Controls
+namespace Eto.GtkSharp.Forms.Controls
 {
 	public class ColorPickerHandler : GtkControl<Gtk.ColorButton, ColorPicker, ColorPicker.ICallback>, ColorPicker.IHandler
 	{
diff --git a/src/Eto.Gtk/Forms/Controls/ComboBoxHandler.cs b/src/Eto.Gtk/Forms/Controls/ComboBoxHandler.cs
index 53b03c5ce1..881f12a4c2 100755
--- a/src/Eto.Gtk/Forms/Controls/ComboBoxHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/ComboBoxHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.GtkSharp.Drawing;
 
 namespace Eto.GtkSharp.Forms.Controls
diff --git a/src/Eto.Gtk/Forms/Controls/DateTimePickerHandler.cs b/src/Eto.Gtk/Forms/Controls/DateTimePickerHandler.cs
index e395f2e358..fd116c09e3 100644
--- a/src/Eto.Gtk/Forms/Controls/DateTimePickerHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/DateTimePickerHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class DateTimePickerHandler : GtkControl<CustomControls.DateComboBox, DateTimePicker, DateTimePicker.ICallback>, DateTimePicker.IHandler
diff --git a/src/Eto.Gtk/Forms/Controls/DocumentControlHandler.cs b/src/Eto.Gtk/Forms/Controls/DocumentControlHandler.cs
index 51eddaddce..b6e7031ed1 100644
--- a/src/Eto.Gtk/Forms/Controls/DocumentControlHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/DocumentControlHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class DocumentControlHandler : GtkContainer<Gtk.Notebook, DocumentControl, DocumentControl.ICallback>, DocumentControl.IHandler
diff --git a/src/Eto.Gtk/Forms/Controls/DocumentPageHandler.cs b/src/Eto.Gtk/Forms/Controls/DocumentPageHandler.cs
index 0a330a6372..d769a608e6 100644
--- a/src/Eto.Gtk/Forms/Controls/DocumentPageHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/DocumentPageHandler.cs
@@ -1,8 +1,4 @@
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.GtkSharp.Drawing;
-using System;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class DocumentPageHandler : GtkPanel<Gtk.VBox, DocumentPage, DocumentPage.ICallback>, DocumentPage.IHandler
diff --git a/src/Eto.Gtk/Forms/Controls/DrawableHandler.cs b/src/Eto.Gtk/Forms/Controls/DrawableHandler.cs
index 34a013cade..23552a003a 100644
--- a/src/Eto.Gtk/Forms/Controls/DrawableHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/DrawableHandler.cs
@@ -1,8 +1,4 @@
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.GtkSharp.Drawing;
-using System;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class DrawableHandler : GtkPanel<Gtk.EventBox, Drawable, Drawable.ICallback>, Drawable.IHandler
diff --git a/src/Eto.Gtk/Forms/Controls/DropDownHandler.cs b/src/Eto.Gtk/Forms/Controls/DropDownHandler.cs
index 95665727d6..7682e409d9 100644
--- a/src/Eto.Gtk/Forms/Controls/DropDownHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/DropDownHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.GtkSharp.Drawing;
-using System.Collections;
-using System.Collections.Generic;
 using GLib;
 using Gtk;
 
diff --git a/src/Eto.Gtk/Forms/Controls/ExpanderHandler.cs b/src/Eto.Gtk/Forms/Controls/ExpanderHandler.cs
index ec7b42f470..c02f60a453 100644
--- a/src/Eto.Gtk/Forms/Controls/ExpanderHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/ExpanderHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.GtkSharp.Drawing;
 
 namespace Eto.GtkSharp.Forms.Controls
diff --git a/src/Eto.Gtk/Forms/Controls/FilePickerHandler.cs b/src/Eto.Gtk/Forms/Controls/FilePickerHandler.cs
index 799919a552..7622b55705 100644
--- a/src/Eto.Gtk/Forms/Controls/FilePickerHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/FilePickerHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class FilePickerHandler : GtkControl<Gtk.EventBox, FilePicker, FilePicker.ICallback>, FilePicker.IHandler
diff --git a/src/Eto.Gtk/Forms/Controls/FontPickerHandler.cs b/src/Eto.Gtk/Forms/Controls/FontPickerHandler.cs
index e90b85affd..508d01d4b5 100644
--- a/src/Eto.Gtk/Forms/Controls/FontPickerHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/FontPickerHandler.cs
@@ -1,7 +1,4 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-using Eto.GtkSharp.Drawing;
+using Eto.GtkSharp.Drawing;
 
 namespace Eto.GtkSharp.Forms.Controls
 {
diff --git a/src/Eto.Gtk/Forms/Controls/GridColumnHandler.cs b/src/Eto.Gtk/Forms/Controls/GridColumnHandler.cs
index a66836f7ad..fe48fc010c 100644
--- a/src/Eto.Gtk/Forms/Controls/GridColumnHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/GridColumnHandler.cs
@@ -1,7 +1,4 @@
-using Eto.Forms;
 using Eto.GtkSharp.Forms.Cells;
-using System;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public interface IGridHandler
diff --git a/src/Eto.Gtk/Forms/Controls/GridHandler.cs b/src/Eto.Gtk/Forms/Controls/GridHandler.cs
index a4e22f8b5b..d88a0f3c9b 100644
--- a/src/Eto.Gtk/Forms/Controls/GridHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/GridHandler.cs
@@ -1,11 +1,5 @@
-using System;
-using Eto.Forms;
-using System.Linq;
-using System.Collections.Generic;
 using Eto.GtkSharp.Forms.Cells;
 using Eto.GtkSharp.Forms.Menu;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	class GridHandler
diff --git a/src/Eto.Gtk/Forms/Controls/GridViewHandler.cs b/src/Eto.Gtk/Forms/Controls/GridViewHandler.cs
index cdc7125db4..7bbd6751bc 100755
--- a/src/Eto.Gtk/Forms/Controls/GridViewHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/GridViewHandler.cs
@@ -1,11 +1,4 @@
-using Eto.Forms;
-using System.Collections.Generic;
 using Eto.GtkSharp.Forms.Cells;
-using System.Collections;
-using System.Linq;
-using Eto.Drawing;
-using System;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class GridViewHandler : GridHandler<GridView, GridView.ICallback>, GridView.IHandler, ICellDataSource, IGtkEnumerableModelHandler<object>
diff --git a/src/Eto.Gtk/Forms/Controls/GroupBoxHandler.cs b/src/Eto.Gtk/Forms/Controls/GroupBoxHandler.cs
index dee08e87b4..e6e23d0664 100644
--- a/src/Eto.Gtk/Forms/Controls/GroupBoxHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/GroupBoxHandler.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class GroupBoxHandler : GtkPanel<Gtk.Frame, GroupBox, GroupBox.ICallback>, GroupBox.IHandler
diff --git a/src/Eto.Gtk/Forms/Controls/GtkEnumerableModel.cs b/src/Eto.Gtk/Forms/Controls/GtkEnumerableModel.cs
index 14276441ed..99231d4a53 100644
--- a/src/Eto.Gtk/Forms/Controls/GtkEnumerableModel.cs
+++ b/src/Eto.Gtk/Forms/Controls/GtkEnumerableModel.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public interface IGtkEnumerableModelHandler<TItem>
diff --git a/src/Eto.Gtk/Forms/Controls/GtkListModel.cs b/src/Eto.Gtk/Forms/Controls/GtkListModel.cs
index 6eec53a487..693ac13560 100755
--- a/src/Eto.Gtk/Forms/Controls/GtkListModel.cs
+++ b/src/Eto.Gtk/Forms/Controls/GtkListModel.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public interface IGtkListModelHandler<TItem>
diff --git a/src/Eto.Gtk/Forms/Controls/GtkTreeModel.cs b/src/Eto.Gtk/Forms/Controls/GtkTreeModel.cs
index 50626c3049..1916d0c636 100755
--- a/src/Eto.Gtk/Forms/Controls/GtkTreeModel.cs
+++ b/src/Eto.Gtk/Forms/Controls/GtkTreeModel.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Eto.Forms;
-using System.Runtime.InteropServices;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public interface IGtkTreeModelHandler<TItem, TStore> : IGtkListModelHandler<TItem>
diff --git a/src/Eto.Gtk/Forms/Controls/ImageViewHandler.cs b/src/Eto.Gtk/Forms/Controls/ImageViewHandler.cs
index 794ed2615c..315fdb7565 100644
--- a/src/Eto.Gtk/Forms/Controls/ImageViewHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/ImageViewHandler.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Forms;
 using Eto.GtkSharp.Drawing;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class ImageViewHandler : GtkControl<Gtk.DrawingArea, ImageView, ImageView.ICallback>, ImageView.IHandler
diff --git a/src/Eto.Gtk/Forms/Controls/LabelHandler.cs b/src/Eto.Gtk/Forms/Controls/LabelHandler.cs
index 7e6db3b7d5..6153cb49bb 100644
--- a/src/Eto.Gtk/Forms/Controls/LabelHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/LabelHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.GtkSharp.Drawing;
 
 namespace Eto.GtkSharp.Forms.Controls
diff --git a/src/Eto.Gtk/Forms/Controls/LinkButtonHandler.cs b/src/Eto.Gtk/Forms/Controls/LinkButtonHandler.cs
index 16c5a5096b..7fac6a26d4 100644
--- a/src/Eto.Gtk/Forms/Controls/LinkButtonHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/LinkButtonHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Linq;
-
-namespace Eto.GtkSharp.Forms.Controls
+namespace Eto.GtkSharp.Forms.Controls
 {
 	public class LinkButtonHandler : GtkControl<Gtk.LinkButton, LinkButton, LinkButton.ICallback>, LinkButton.IHandler
 	{
diff --git a/src/Eto.Gtk/Forms/Controls/ListBoxHandler.cs b/src/Eto.Gtk/Forms/Controls/ListBoxHandler.cs
index 7079b16f02..8c2aba65ec 100644
--- a/src/Eto.Gtk/Forms/Controls/ListBoxHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/ListBoxHandler.cs
@@ -1,11 +1,4 @@
-using System;
-using Eto.Forms;
 using Eto.GtkSharp.Drawing;
-using Eto.Drawing;
-using System.Linq;
-using System.Collections.Generic;
-using System.Collections;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class ListBoxHandler : GtkControl<Gtk.TreeView, ListBox, ListBox.ICallback>, ListBox.IHandler, IGtkEnumerableModelHandler<object>
diff --git a/src/Eto.Gtk/Forms/Controls/NativeControlHandler.cs b/src/Eto.Gtk/Forms/Controls/NativeControlHandler.cs
index 3303f322fb..bd1827690a 100644
--- a/src/Eto.Gtk/Forms/Controls/NativeControlHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/NativeControlHandler.cs
@@ -1,7 +1,4 @@
-using System;
-using Eto.Forms;
-
-namespace Eto.GtkSharp.Forms.Controls
+namespace Eto.GtkSharp.Forms.Controls
 {
 	public class NativeControlHandler : GtkControl<Gtk.Widget, Control, Control.ICallback>
 	{
diff --git a/src/Eto.Gtk/Forms/Controls/NumericStepperHandler.cs b/src/Eto.Gtk/Forms/Controls/NumericStepperHandler.cs
index ef51758c97..1e18b4e81d 100644
--- a/src/Eto.Gtk/Forms/Controls/NumericStepperHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/NumericStepperHandler.cs
@@ -1,11 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Globalization;
-using System.ComponentModel;
 using Gtk;
-using System.Text.RegularExpressions;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class NumericStepperHandler : GtkControl<Gtk.SpinButton, NumericStepper, NumericStepper.ICallback>, NumericStepper.IHandler
diff --git a/src/Eto.Gtk/Forms/Controls/PanelHandler.cs b/src/Eto.Gtk/Forms/Controls/PanelHandler.cs
index 02cb668684..e53864cbaa 100644
--- a/src/Eto.Gtk/Forms/Controls/PanelHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/PanelHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class PanelHandler : GtkPanel<Gtk.EventBox, Panel, Panel.ICallback>, Panel.IHandler
diff --git a/src/Eto.Gtk/Forms/Controls/PasswordBoxHandler.cs b/src/Eto.Gtk/Forms/Controls/PasswordBoxHandler.cs
index 5169f29525..c00585eb2f 100644
--- a/src/Eto.Gtk/Forms/Controls/PasswordBoxHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/PasswordBoxHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class PasswordBoxHandler : GtkControl<Gtk.Entry, PasswordBox, PasswordBox.ICallback>, PasswordBox.IHandler
diff --git a/src/Eto.Gtk/Forms/Controls/ProgressBarHandler.cs b/src/Eto.Gtk/Forms/Controls/ProgressBarHandler.cs
index 9ca8764c69..caf05ae63b 100644
--- a/src/Eto.Gtk/Forms/Controls/ProgressBarHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/ProgressBarHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class ProgressBarHandler : GtkControl<Gtk.ProgressBar, ProgressBar, ProgressBar.ICallback>, ProgressBar.IHandler
diff --git a/src/Eto.Gtk/Forms/Controls/RadioButtonHandler.cs b/src/Eto.Gtk/Forms/Controls/RadioButtonHandler.cs
index 9f3d63dedc..cf7d4f3ac0 100644
--- a/src/Eto.Gtk/Forms/Controls/RadioButtonHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/RadioButtonHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class RadioButtonHandler : GtkControl<Gtk.RadioButton, RadioButton, RadioButton.ICallback>, RadioButton.IHandler
diff --git a/src/Eto.Gtk/Forms/Controls/RichTextAreaHandler.cs b/src/Eto.Gtk/Forms/Controls/RichTextAreaHandler.cs
index 01b2434ddb..c98d59b304 100644
--- a/src/Eto.Gtk/Forms/Controls/RichTextAreaHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/RichTextAreaHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Linq;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
 using Eto.GtkSharp.Drawing;
 using Gtk;
 
diff --git a/src/Eto.Gtk/Forms/Controls/ScrollableHandler.cs b/src/Eto.Gtk/Forms/Controls/ScrollableHandler.cs
index b4ce02a9df..1b63015c1d 100644
--- a/src/Eto.Gtk/Forms/Controls/ScrollableHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/ScrollableHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class ScrollableHandler : GtkPanel<Gtk.ScrolledWindow, Scrollable, Scrollable.ICallback>, Scrollable.IHandler
diff --git a/src/Eto.Gtk/Forms/Controls/SearchBoxHandler.cs b/src/Eto.Gtk/Forms/Controls/SearchBoxHandler.cs
index 3b430649b4..49503b89a8 100644
--- a/src/Eto.Gtk/Forms/Controls/SearchBoxHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/SearchBoxHandler.cs
@@ -1,5 +1,3 @@
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 #if GTKCORE
diff --git a/src/Eto.Gtk/Forms/Controls/SliderHandler.cs b/src/Eto.Gtk/Forms/Controls/SliderHandler.cs
index 460cd17c32..8e92e7020a 100644
--- a/src/Eto.Gtk/Forms/Controls/SliderHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/SliderHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class SliderHandler : GtkControl<Gtk.EventBox, Slider, Slider.ICallback>, Slider.IHandler
diff --git a/src/Eto.Gtk/Forms/Controls/SpinnerHandler.cs b/src/Eto.Gtk/Forms/Controls/SpinnerHandler.cs
index e75c581762..921b748f7e 100644
--- a/src/Eto.Gtk/Forms/Controls/SpinnerHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/SpinnerHandler.cs
@@ -1,7 +1,4 @@
 #if GTK3
-using System;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class SpinnerHandler : GtkControl<Gtk.Spinner, Spinner, Spinner.ICallback>, Spinner.IHandler
diff --git a/src/Eto.Gtk/Forms/Controls/SplitterHandler.cs b/src/Eto.Gtk/Forms/Controls/SplitterHandler.cs
index c4a773063e..d046751a3f 100644
--- a/src/Eto.Gtk/Forms/Controls/SplitterHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/SplitterHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class SplitterHandler : GtkContainer<Gtk.Paned, Splitter, Splitter.ICallback>, Splitter.IHandler
diff --git a/src/Eto.Gtk/Forms/Controls/StepperHandler.cs b/src/Eto.Gtk/Forms/Controls/StepperHandler.cs
index 1c1b7c7fa4..8fbe04116b 100644
--- a/src/Eto.Gtk/Forms/Controls/StepperHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/StepperHandler.cs
@@ -1,13 +1,4 @@
 
-using Eto.Forms;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.ComponentModel;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	/// <summary>
diff --git a/src/Eto.Gtk/Forms/Controls/TabControlHandler.cs b/src/Eto.Gtk/Forms/Controls/TabControlHandler.cs
index dc288ad55b..7b846aeb3e 100644
--- a/src/Eto.Gtk/Forms/Controls/TabControlHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/TabControlHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class TabControlHandler : GtkContainer<Gtk.Notebook, TabControl, TabControl.ICallback>, TabControl.IHandler
diff --git a/src/Eto.Gtk/Forms/Controls/TabPageHandler.cs b/src/Eto.Gtk/Forms/Controls/TabPageHandler.cs
index 00b4f6bdf4..dd92a48ae0 100644
--- a/src/Eto.Gtk/Forms/Controls/TabPageHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/TabPageHandler.cs
@@ -1,5 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.GtkSharp.Drawing;
 
 namespace Eto.GtkSharp.Forms.Controls
diff --git a/src/Eto.Gtk/Forms/Controls/TextAreaHandler.cs b/src/Eto.Gtk/Forms/Controls/TextAreaHandler.cs
index 8cd8fbbbd2..90928c6119 100644
--- a/src/Eto.Gtk/Forms/Controls/TextAreaHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/TextAreaHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.GtkSharp.Drawing;
 using Range = Eto.Forms.Range;
 
diff --git a/src/Eto.Gtk/Forms/Controls/TextBoxHandler.cs b/src/Eto.Gtk/Forms/Controls/TextBoxHandler.cs
index 1044c94b67..ce3c0fb1f7 100644
--- a/src/Eto.Gtk/Forms/Controls/TextBoxHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/TextBoxHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Runtime.InteropServices;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class TextBoxHandler : TextBoxHandler<Gtk.Entry, TextBox, TextBox.ICallback>
diff --git a/src/Eto.Gtk/Forms/Controls/TextStepperHandler.cs b/src/Eto.Gtk/Forms/Controls/TextStepperHandler.cs
index 105aa15fa9..15d3a29991 100644
--- a/src/Eto.Gtk/Forms/Controls/TextStepperHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/TextStepperHandler.cs
@@ -1,12 +1,4 @@
-using Eto.Forms;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.ComponentModel;
-
-namespace Eto.GtkSharp.Forms.Controls
+namespace Eto.GtkSharp.Forms.Controls
 {
 	public class TextStepperHandler : TextBoxHandler<Gtk.SpinButton, TextStepper, TextStepper.ICallback>, TextStepper.IHandler
 	{
diff --git a/src/Eto.Gtk/Forms/Controls/ToggleButtonHandler.cs b/src/Eto.Gtk/Forms/Controls/ToggleButtonHandler.cs
index 99ed8e8c08..a06cf14018 100644
--- a/src/Eto.Gtk/Forms/Controls/ToggleButtonHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/ToggleButtonHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class ToggleButtonHandler : ButtonHandler<Gtk.ToggleButton, ToggleButton, ToggleButton.ICallback>, ToggleButton.IHandler
diff --git a/src/Eto.Gtk/Forms/Controls/TreeGridViewHandler.cs b/src/Eto.Gtk/Forms/Controls/TreeGridViewHandler.cs
index c706628e43..14e960d6af 100755
--- a/src/Eto.Gtk/Forms/Controls/TreeGridViewHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/TreeGridViewHandler.cs
@@ -1,10 +1,4 @@
-using System;
-using Eto.Forms;
-using System.Collections.Generic;
 using Eto.GtkSharp.Forms.Cells;
-using System.Linq;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class TreeGridViewHandler : GridHandler<TreeGridView, TreeGridView.ICallback>, TreeGridView.IHandler, ICellDataSource, IGtkTreeModelHandler<ITreeGridItem, ITreeGridStore<ITreeGridItem>>
diff --git a/src/Eto.Gtk/Forms/Controls/TreeViewHandler.cs b/src/Eto.Gtk/Forms/Controls/TreeViewHandler.cs
index 02559fc10a..79383e3813 100755
--- a/src/Eto.Gtk/Forms/Controls/TreeViewHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/TreeViewHandler.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.GtkSharp.Drawing;
-using System.Collections.Generic;
 using Eto.GtkSharp.Forms.Menu;
 
 namespace Eto.GtkSharp.Forms.Controls
diff --git a/src/Eto.Gtk/Forms/Controls/WebKit2WebViewHandler.cs b/src/Eto.Gtk/Forms/Controls/WebKit2WebViewHandler.cs
index bdaadcc584..c6600db4e6 100644
--- a/src/Eto.Gtk/Forms/Controls/WebKit2WebViewHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/WebKit2WebViewHandler.cs
@@ -1,11 +1,4 @@
 #if GTKCORE || GTK3
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms.Controls
 {
 	public class WebViewHandler : GtkControl<Gtk.Widget, WebView, WebView.ICallback>, WebView.IHandler
diff --git a/src/Eto.Gtk/Forms/Controls/WebViewHandler.cs b/src/Eto.Gtk/Forms/Controls/WebViewHandler.cs
index 87ceb6d0b6..1ce492fd03 100644
--- a/src/Eto.Gtk/Forms/Controls/WebViewHandler.cs
+++ b/src/Eto.Gtk/Forms/Controls/WebViewHandler.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Globalization;
-using System.Threading;
-using System.Threading.Tasks;
 using System.Collections.Generic;
 
 #if GTK2
-using Eto.Forms;
 #if GTK3
 using NewWindowPolicyDecisionRequestedArgs = WebKit.NewWindowPolicyDecisionRequestedArgs;
 #endif
diff --git a/src/Eto.Gtk/Forms/CursorHandler.cs b/src/Eto.Gtk/Forms/CursorHandler.cs
index 13530a5c37..e9338eca14 100644
--- a/src/Eto.Gtk/Forms/CursorHandler.cs
+++ b/src/Eto.Gtk/Forms/CursorHandler.cs
@@ -1,7 +1,3 @@
-using System.IO;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms
 {
 	public class CursorHandler : WidgetHandler<Gdk.Cursor, Cursor>, Cursor.IHandler
diff --git a/src/Eto.Gtk/Forms/DataObjectHandler.cs b/src/Eto.Gtk/Forms/DataObjectHandler.cs
index 812676c61a..fef2d0af07 100644
--- a/src/Eto.Gtk/Forms/DataObjectHandler.cs
+++ b/src/Eto.Gtk/Forms/DataObjectHandler.cs
@@ -1,13 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.GtkSharp.Drawing;
-using System.Text;
-using System.IO;
-using System.Threading;
-
 namespace Eto.GtkSharp.Forms
 {
 	public class DataFormatsHandler : DataFormats.IHandler
diff --git a/src/Eto.Gtk/Forms/DialogHandler.cs b/src/Eto.Gtk/Forms/DialogHandler.cs
index cfe6c9cc62..de61e76836 100644
--- a/src/Eto.Gtk/Forms/DialogHandler.cs
+++ b/src/Eto.Gtk/Forms/DialogHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Threading.Tasks;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms
 {
 	public class DialogHandler : GtkWindow<Gtk.Dialog, Dialog, Dialog.ICallback>, Dialog.IHandler
diff --git a/src/Eto.Gtk/Forms/EtoControls.cs b/src/Eto.Gtk/Forms/EtoControls.cs
index c1d5505985..0250188fc7 100644
--- a/src/Eto.Gtk/Forms/EtoControls.cs
+++ b/src/Eto.Gtk/Forms/EtoControls.cs
@@ -1,8 +1,5 @@
 
-using System;
 using Eto;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Forms
 {
     public partial class EtoFixed : Gtk.Fixed
diff --git a/src/Eto.Gtk/Forms/EtoControls.tt b/src/Eto.Gtk/Forms/EtoControls.tt
index e9021bc4c0..9e670573f5 100644
--- a/src/Eto.Gtk/Forms/EtoControls.tt
+++ b/src/Eto.Gtk/Forms/EtoControls.tt
@@ -5,10 +5,7 @@
 <#@ import namespace="System.Text" #>
 <#@ import namespace="System.Collections.Generic" #>
 
-using System;
 using Eto;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Forms
 {
 <#
diff --git a/src/Eto.Gtk/Forms/FloatingFormHandler.cs b/src/Eto.Gtk/Forms/FloatingFormHandler.cs
index 7fdf1cde9a..c03c76d27f 100644
--- a/src/Eto.Gtk/Forms/FloatingFormHandler.cs
+++ b/src/Eto.Gtk/Forms/FloatingFormHandler.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using System;
-
 namespace Eto.GtkSharp.Forms
 {
 	public class FloatingFormHandler : FormHandler, FloatingForm.IHandler
diff --git a/src/Eto.Gtk/Forms/FontDialogHandler.cs b/src/Eto.Gtk/Forms/FontDialogHandler.cs
index 386e59b7ab..6ffca4ec9a 100644
--- a/src/Eto.Gtk/Forms/FontDialogHandler.cs
+++ b/src/Eto.Gtk/Forms/FontDialogHandler.cs
@@ -1,8 +1,4 @@
 #if GTKCORE
-using System;
-using System.Text;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.GtkSharp.Drawing;
 
 namespace Eto.GtkSharp.Forms
diff --git a/src/Eto.Gtk/Forms/FontDialogHandlerOld.cs b/src/Eto.Gtk/Forms/FontDialogHandlerOld.cs
index 7e3d244ebe..2a1305d2c4 100644
--- a/src/Eto.Gtk/Forms/FontDialogHandlerOld.cs
+++ b/src/Eto.Gtk/Forms/FontDialogHandlerOld.cs
@@ -1,8 +1,4 @@
 #if !GTKCORE
-using System;
-using System.Text;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.GtkSharp.Drawing;
 
 namespace Eto.GtkSharp.Forms
diff --git a/src/Eto.Gtk/Forms/FormHandler.cs b/src/Eto.Gtk/Forms/FormHandler.cs
index 6386e843e0..11485eaba6 100644
--- a/src/Eto.Gtk/Forms/FormHandler.cs
+++ b/src/Eto.Gtk/Forms/FormHandler.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using System.Threading.Tasks;
-
 namespace Eto.GtkSharp.Forms
 {
 	public class FormHandler : GtkWindow<Gtk.Window, Form, Form.ICallback>, Form.IHandler
diff --git a/src/Eto.Gtk/Forms/GtkContainer.cs b/src/Eto.Gtk/Forms/GtkContainer.cs
index d1bb59d8e6..279a03f27f 100644
--- a/src/Eto.Gtk/Forms/GtkContainer.cs
+++ b/src/Eto.Gtk/Forms/GtkContainer.cs
@@ -1,10 +1,4 @@
-using System.Linq;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.GtkSharp.Forms.Controls;
-using System.Collections.Generic;
-using System;
-
 namespace Eto.GtkSharp.Forms
 {
 	public abstract class GtkContainer<TControl, TWidget, TCallback> : GtkControl<TControl, TWidget, TCallback>, Container.IHandler
diff --git a/src/Eto.Gtk/Forms/GtkControl.cs b/src/Eto.Gtk/Forms/GtkControl.cs
index 9a8222a8c8..75baecc68f 100644
--- a/src/Eto.Gtk/Forms/GtkControl.cs
+++ b/src/Eto.Gtk/Forms/GtkControl.cs
@@ -1,12 +1,4 @@
-using System;
-using System.Text.RegularExpressions;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.GtkSharp.Drawing;
-using System.Text;
-using System.Linq;
-using System.Collections.Generic;
-using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
 
 namespace Eto.GtkSharp.Forms
diff --git a/src/Eto.Gtk/Forms/GtkFileDialog.cs b/src/Eto.Gtk/Forms/GtkFileDialog.cs
index 26b4d50a12..e0f1e10d6f 100644
--- a/src/Eto.Gtk/Forms/GtkFileDialog.cs
+++ b/src/Eto.Gtk/Forms/GtkFileDialog.cs
@@ -1,9 +1,3 @@
-using System;
-using System.IO;
-using Eto.Forms;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.GtkSharp.Forms
 {
 	public abstract class GtkFileDialog<TControl, TWidget> : WidgetHandler<TControl, TWidget>, FileDialog.IHandler
diff --git a/src/Eto.Gtk/Forms/GtkPanel.cs b/src/Eto.Gtk/Forms/GtkPanel.cs
index 098ee77b95..e10f0c4c86 100644
--- a/src/Eto.Gtk/Forms/GtkPanel.cs
+++ b/src/Eto.Gtk/Forms/GtkPanel.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Forms
 {
 	static class GtkPanel
diff --git a/src/Eto.Gtk/Forms/GtkSynchronizationContext.cs b/src/Eto.Gtk/Forms/GtkSynchronizationContext.cs
index 86bba2cbec..87a99e0419 100644
--- a/src/Eto.Gtk/Forms/GtkSynchronizationContext.cs
+++ b/src/Eto.Gtk/Forms/GtkSynchronizationContext.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading;
-using GLib;
+using GLib;
 
 namespace Eto.GtkSharp.Forms
 {
diff --git a/src/Eto.Gtk/Forms/GtkWindow.cs b/src/Eto.Gtk/Forms/GtkWindow.cs
index 0b23492333..1f32dd35e7 100644
--- a/src/Eto.Gtk/Forms/GtkWindow.cs
+++ b/src/Eto.Gtk/Forms/GtkWindow.cs
@@ -1,8 +1,3 @@
-using System;
-using System.ComponentModel;
-using System.Linq;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.GtkSharp.Drawing;
 using Eto.GtkSharp.Forms;
 using Eto.GtkSharp.Forms.Menu;
diff --git a/src/Eto.Gtk/Forms/KeyboardHandler.cs b/src/Eto.Gtk/Forms/KeyboardHandler.cs
index 6344f20a00..ea540633e7 100644
--- a/src/Eto.Gtk/Forms/KeyboardHandler.cs
+++ b/src/Eto.Gtk/Forms/KeyboardHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using Eto.Forms;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-
-namespace Eto.GtkSharp.Forms
+namespace Eto.GtkSharp.Forms
 {
 	public class KeyboardHandler : Keyboard.IHandler
 	{
diff --git a/src/Eto.Gtk/Forms/LinuxNotificationHandler.cs b/src/Eto.Gtk/Forms/LinuxNotificationHandler.cs
index 495e3e5bbb..5484521265 100644
--- a/src/Eto.Gtk/Forms/LinuxNotificationHandler.cs
+++ b/src/Eto.Gtk/Forms/LinuxNotificationHandler.cs
@@ -1,10 +1,4 @@
-using System;
-using System.IO;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using Eto.Drawing;
-using Eto.Forms;
-using Eto.GtkSharp.Drawing;
+using Eto.GtkSharp.Drawing;
 
 namespace Eto.GtkSharp.Forms
 {
diff --git a/src/Eto.Gtk/Forms/LinuxTrayIndicatorHandler.cs b/src/Eto.Gtk/Forms/LinuxTrayIndicatorHandler.cs
index e6f7077674..329f6ede89 100644
--- a/src/Eto.Gtk/Forms/LinuxTrayIndicatorHandler.cs
+++ b/src/Eto.Gtk/Forms/LinuxTrayIndicatorHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.IO;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.GtkSharp.Drawing;
 using Eto.GtkSharp.Forms.Menu;
 
diff --git a/src/Eto.Gtk/Forms/Menu/ButtonMenuItemHandler.cs b/src/Eto.Gtk/Forms/Menu/ButtonMenuItemHandler.cs
index f4113379b4..a75f30e38e 100644
--- a/src/Eto.Gtk/Forms/Menu/ButtonMenuItemHandler.cs
+++ b/src/Eto.Gtk/Forms/Menu/ButtonMenuItemHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.GtkSharp.Forms.Controls;
 
 namespace Eto.GtkSharp.Forms.Menu
diff --git a/src/Eto.Gtk/Forms/Menu/CheckMenuItemHandler.cs b/src/Eto.Gtk/Forms/Menu/CheckMenuItemHandler.cs
index c3e642a0f4..c208e584d7 100644
--- a/src/Eto.Gtk/Forms/Menu/CheckMenuItemHandler.cs
+++ b/src/Eto.Gtk/Forms/Menu/CheckMenuItemHandler.cs
@@ -1,5 +1,3 @@
-using System;
-using Eto.Forms;
 using Eto.GtkSharp.Forms.Controls;
 
 namespace Eto.GtkSharp.Forms.Menu
diff --git a/src/Eto.Gtk/Forms/Menu/ContextMenuHandler.cs b/src/Eto.Gtk/Forms/Menu/ContextMenuHandler.cs
index 6986233092..49c1a23287 100644
--- a/src/Eto.Gtk/Forms/Menu/ContextMenuHandler.cs
+++ b/src/Eto.Gtk/Forms/Menu/ContextMenuHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Linq;
-using System.Collections.Generic;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Forms.Menu
 {
 	public class ContextMenuHandler : MenuHandler<Gtk.Menu, ContextMenu, ContextMenu.ICallback>, ContextMenu.IHandler
diff --git a/src/Eto.Gtk/Forms/Menu/MenuBarHandler.cs b/src/Eto.Gtk/Forms/Menu/MenuBarHandler.cs
index e3efc023ce..84487bf50f 100644
--- a/src/Eto.Gtk/Forms/Menu/MenuBarHandler.cs
+++ b/src/Eto.Gtk/Forms/Menu/MenuBarHandler.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using System.Collections.Generic;
-
 namespace Eto.GtkSharp.Forms.Menu
 {
 	/// <summary>
diff --git a/src/Eto.Gtk/Forms/Menu/MenuHandler.cs b/src/Eto.Gtk/Forms/Menu/MenuHandler.cs
index b116162b3c..b417a14d81 100644
--- a/src/Eto.Gtk/Forms/Menu/MenuHandler.cs
+++ b/src/Eto.Gtk/Forms/Menu/MenuHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Linq;
-
 namespace Eto.GtkSharp.Forms.Menu
 {
 	public interface IMenuHandler
diff --git a/src/Eto.Gtk/Forms/Menu/RadioMenuItemHandler.cs b/src/Eto.Gtk/Forms/Menu/RadioMenuItemHandler.cs
index 73780e939f..044a283263 100644
--- a/src/Eto.Gtk/Forms/Menu/RadioMenuItemHandler.cs
+++ b/src/Eto.Gtk/Forms/Menu/RadioMenuItemHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms.Menu
 {
 	/// <summary>
diff --git a/src/Eto.Gtk/Forms/Menu/SeparatorMenuItemHandler.cs b/src/Eto.Gtk/Forms/Menu/SeparatorMenuItemHandler.cs
index d74a463923..686b943d5f 100644
--- a/src/Eto.Gtk/Forms/Menu/SeparatorMenuItemHandler.cs
+++ b/src/Eto.Gtk/Forms/Menu/SeparatorMenuItemHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms.Menu
 {
 	public class SeparatorMenuItemHandler : MenuHandler<Gtk.SeparatorMenuItem, SeparatorMenuItem, SeparatorMenuItem.ICallback>, SeparatorMenuItem.IHandler
diff --git a/src/Eto.Gtk/Forms/Menu/SubMenuItemHandler.cs b/src/Eto.Gtk/Forms/Menu/SubMenuItemHandler.cs
index 63292bceeb..46138628a8 100644
--- a/src/Eto.Gtk/Forms/Menu/SubMenuItemHandler.cs
+++ b/src/Eto.Gtk/Forms/Menu/SubMenuItemHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms.Menu
 {
 	public class SubMenuItemHandler : ButtonMenuItemHandler<SubMenuItem, SubMenuItem.ICallback>, SubMenuItem.IHandler
diff --git a/src/Eto.Gtk/Forms/MessageBoxHandler.cs b/src/Eto.Gtk/Forms/MessageBoxHandler.cs
index 528114d398..261c6de917 100644
--- a/src/Eto.Gtk/Forms/MessageBoxHandler.cs
+++ b/src/Eto.Gtk/Forms/MessageBoxHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms
 {
 	public class MessageBoxHandler : WidgetHandler<Widget>, MessageBox.IHandler
diff --git a/src/Eto.Gtk/Forms/MouseHandler.cs b/src/Eto.Gtk/Forms/MouseHandler.cs
index 0ff8396cbc..41e78bde86 100644
--- a/src/Eto.Gtk/Forms/MouseHandler.cs
+++ b/src/Eto.Gtk/Forms/MouseHandler.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Forms
 {
 	public class MouseHandler : Mouse.IHandler
diff --git a/src/Eto.Gtk/Forms/OpenFileDialogHandler.cs b/src/Eto.Gtk/Forms/OpenFileDialogHandler.cs
index 2e250bb256..3c24e6c024 100644
--- a/src/Eto.Gtk/Forms/OpenFileDialogHandler.cs
+++ b/src/Eto.Gtk/Forms/OpenFileDialogHandler.cs
@@ -1,7 +1,3 @@
-using Eto.Forms;
-using System.Collections.Generic;
-using System.IO;
-
 namespace Eto.GtkSharp.Forms
 {
 	#if GTKCORE
diff --git a/src/Eto.Gtk/Forms/OpenWithDialogHandler.cs b/src/Eto.Gtk/Forms/OpenWithDialogHandler.cs
index 28612c6262..8e04cd82af 100644
--- a/src/Eto.Gtk/Forms/OpenWithDialogHandler.cs
+++ b/src/Eto.Gtk/Forms/OpenWithDialogHandler.cs
@@ -1,8 +1,4 @@
 #if GTK3
-using System;
-using System.Diagnostics;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms
 {
 	public class OpenWithDialogHandler : WidgetHandler<Gtk.Dialog, OpenWithDialog, OpenWithDialog.ICallback>, OpenWithDialog.IHandler
diff --git a/src/Eto.Gtk/Forms/OtherTrayIndicatorHandler.cs b/src/Eto.Gtk/Forms/OtherTrayIndicatorHandler.cs
index d37910b318..594dacd344 100644
--- a/src/Eto.Gtk/Forms/OtherTrayIndicatorHandler.cs
+++ b/src/Eto.Gtk/Forms/OtherTrayIndicatorHandler.cs
@@ -1,8 +1,5 @@
 // status icon is obsolete, but we still want to use it.
 #pragma warning disable 612, 618
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.GtkSharp.Drawing;
 
 namespace Eto.GtkSharp.Forms
diff --git a/src/Eto.Gtk/Forms/PixelLayoutHandler.cs b/src/Eto.Gtk/Forms/PixelLayoutHandler.cs
index 6dcba48b01..5f0eee650f 100644
--- a/src/Eto.Gtk/Forms/PixelLayoutHandler.cs
+++ b/src/Eto.Gtk/Forms/PixelLayoutHandler.cs
@@ -1,9 +1,5 @@
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.GtkSharp.Forms.Controls;
 using Gtk;
-using System;
-
 namespace Eto.GtkSharp.Forms
 {
 
diff --git a/src/Eto.Gtk/Forms/Printing/PrintDialogHandler.cs b/src/Eto.Gtk/Forms/Printing/PrintDialogHandler.cs
index 3701ee9fa5..d20a533954 100644
--- a/src/Eto.Gtk/Forms/Printing/PrintDialogHandler.cs
+++ b/src/Eto.Gtk/Forms/Printing/PrintDialogHandler.cs
@@ -1,5 +1,3 @@
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms.Printing
 {
 	public class PrintDialogHandler : WidgetHandler<Gtk.PrintUnixDialog, PrintDialog>, PrintDialog.IHandler
diff --git a/src/Eto.Gtk/Forms/Printing/PrintDocumentHandler.cs b/src/Eto.Gtk/Forms/Printing/PrintDocumentHandler.cs
index fd1c0d9713..8243810c93 100644
--- a/src/Eto.Gtk/Forms/Printing/PrintDocumentHandler.cs
+++ b/src/Eto.Gtk/Forms/Printing/PrintDocumentHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.GtkSharp.Drawing;
 
 namespace Eto.GtkSharp.Forms.Printing
diff --git a/src/Eto.Gtk/Forms/Printing/PrintPreviewDialogHandler.cs b/src/Eto.Gtk/Forms/Printing/PrintPreviewDialogHandler.cs
index 1144d09287..0ad29f0cde 100644
--- a/src/Eto.Gtk/Forms/Printing/PrintPreviewDialogHandler.cs
+++ b/src/Eto.Gtk/Forms/Printing/PrintPreviewDialogHandler.cs
@@ -1,5 +1,3 @@
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms.Printing
 {
 	public class PrintPreviewDialogHandler : WidgetHandler<object, PrintPreviewDialog>, PrintPreviewDialog.IHandler
diff --git a/src/Eto.Gtk/Forms/Printing/PrintSettingsHandler.cs b/src/Eto.Gtk/Forms/Printing/PrintSettingsHandler.cs
index b519c9f774..b0829e7dc3 100644
--- a/src/Eto.Gtk/Forms/Printing/PrintSettingsHandler.cs
+++ b/src/Eto.Gtk/Forms/Printing/PrintSettingsHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms.Printing
 {
 	public static class PrintSettingsExtensions
diff --git a/src/Eto.Gtk/Forms/SaveFileDialogHandler.cs b/src/Eto.Gtk/Forms/SaveFileDialogHandler.cs
index f1bc3f590c..68c855ea82 100644
--- a/src/Eto.Gtk/Forms/SaveFileDialogHandler.cs
+++ b/src/Eto.Gtk/Forms/SaveFileDialogHandler.cs
@@ -1,5 +1,3 @@
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms
 {
 #if GTKCORE
diff --git a/src/Eto.Gtk/Forms/ScreenHandler.gtk2.cs b/src/Eto.Gtk/Forms/ScreenHandler.gtk2.cs
index 7c813d65bf..d86e0c42a6 100644
--- a/src/Eto.Gtk/Forms/ScreenHandler.gtk2.cs
+++ b/src/Eto.Gtk/Forms/ScreenHandler.gtk2.cs
@@ -1,9 +1,5 @@
 #if !GTKCORE
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.GtkSharp.Drawing;
-using System;
-
 namespace Eto.GtkSharp.Forms
 {
 	public class ScreenHandler : WidgetHandler<Gdk.Screen, Screen>, Screen.IHandler
diff --git a/src/Eto.Gtk/Forms/ScreenHandler.gtk3.cs b/src/Eto.Gtk/Forms/ScreenHandler.gtk3.cs
index 05bbe983fe..0f28d82c99 100644
--- a/src/Eto.Gtk/Forms/ScreenHandler.gtk3.cs
+++ b/src/Eto.Gtk/Forms/ScreenHandler.gtk3.cs
@@ -1,9 +1,5 @@
 #if GTKCORE
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.GtkSharp.Drawing;
-using System;
-
 namespace Eto.GtkSharp.Forms
 {
 	public class ScreenHandler : WidgetHandler<Gdk.Monitor, Screen>, Screen.IHandler
diff --git a/src/Eto.Gtk/Forms/ScreensHandler.cs b/src/Eto.Gtk/Forms/ScreensHandler.cs
index 273ccdcd5f..b8d63caa8c 100644
--- a/src/Eto.Gtk/Forms/ScreensHandler.cs
+++ b/src/Eto.Gtk/Forms/ScreensHandler.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using System.Collections.Generic;
-
 namespace Eto.GtkSharp.Forms
 {
 	public class ScreensHandler : Screen.IScreensHandler
diff --git a/src/Eto.Gtk/Forms/SelectFolderDialogHandler.cs b/src/Eto.Gtk/Forms/SelectFolderDialogHandler.cs
index ad1867f956..5015bec1b7 100644
--- a/src/Eto.Gtk/Forms/SelectFolderDialogHandler.cs
+++ b/src/Eto.Gtk/Forms/SelectFolderDialogHandler.cs
@@ -1,5 +1,3 @@
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms
 {
 #if GTKCORE
diff --git a/src/Eto.Gtk/Forms/TableLayoutHandler.gtk2.cs b/src/Eto.Gtk/Forms/TableLayoutHandler.gtk2.cs
index 57f2667ca4..e1ecb8ed0e 100644
--- a/src/Eto.Gtk/Forms/TableLayoutHandler.gtk2.cs
+++ b/src/Eto.Gtk/Forms/TableLayoutHandler.gtk2.cs
@@ -1,10 +1,4 @@
 #if GTK2
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Linq;
-using System.Collections.Generic;
-
 namespace Eto.GtkSharp.Forms
 {
 	public class TableLayoutHandler : GtkContainer<Gtk.Table, TableLayout, TableLayout.ICallback>, TableLayout.IHandler
diff --git a/src/Eto.Gtk/Forms/TableLayoutHandler.gtk3.cs b/src/Eto.Gtk/Forms/TableLayoutHandler.gtk3.cs
index 0619eaa005..cc9747f975 100644
--- a/src/Eto.Gtk/Forms/TableLayoutHandler.gtk3.cs
+++ b/src/Eto.Gtk/Forms/TableLayoutHandler.gtk3.cs
@@ -1,10 +1,4 @@
 #if GTK3
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Linq;
-using System.Collections.Generic;
-
 namespace Eto.GtkSharp.Forms
 {
 	public class TableLayoutHandler : GtkContainer<Gtk.Grid, TableLayout, TableLayout.ICallback>, TableLayout.IHandler
diff --git a/src/Eto.Gtk/Forms/ToolBar/ButtonToolItemHandler.cs b/src/Eto.Gtk/Forms/ToolBar/ButtonToolItemHandler.cs
index ac13421637..2244676fc1 100644
--- a/src/Eto.Gtk/Forms/ToolBar/ButtonToolItemHandler.cs
+++ b/src/Eto.Gtk/Forms/ToolBar/ButtonToolItemHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms.ToolBar
 {
 
diff --git a/src/Eto.Gtk/Forms/ToolBar/CheckToolItemHandler.cs b/src/Eto.Gtk/Forms/ToolBar/CheckToolItemHandler.cs
index a9f425c51b..b8af3c6f96 100644
--- a/src/Eto.Gtk/Forms/ToolBar/CheckToolItemHandler.cs
+++ b/src/Eto.Gtk/Forms/ToolBar/CheckToolItemHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms.ToolBar
 {
 	public class CheckToolItemHandler : ToolItemHandler<Gtk.ToggleToolButton, CheckToolItem>, CheckToolItem.IHandler
diff --git a/src/Eto.Gtk/Forms/ToolBar/DropDownToolItemHandler.cs b/src/Eto.Gtk/Forms/ToolBar/DropDownToolItemHandler.cs
index 26349a680d..5066a8b6e2 100644
--- a/src/Eto.Gtk/Forms/ToolBar/DropDownToolItemHandler.cs
+++ b/src/Eto.Gtk/Forms/ToolBar/DropDownToolItemHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using Gdk;
 
 namespace Eto.GtkSharp.Forms.ToolBar
diff --git a/src/Eto.Gtk/Forms/ToolBar/RadioToolItemHandler.cs b/src/Eto.Gtk/Forms/ToolBar/RadioToolItemHandler.cs
index e3039cd2e6..16ace560e4 100644
--- a/src/Eto.Gtk/Forms/ToolBar/RadioToolItemHandler.cs
+++ b/src/Eto.Gtk/Forms/ToolBar/RadioToolItemHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Linq;
-
 namespace Eto.GtkSharp.Forms.ToolBar
 {
 	public class RadioToolItemHandler : ToolItemHandler<Gtk.RadioToolButton, RadioToolItem>, RadioToolItem.IHandler
diff --git a/src/Eto.Gtk/Forms/ToolBar/SeparatorToolItemHandler.cs b/src/Eto.Gtk/Forms/ToolBar/SeparatorToolItemHandler.cs
index 1cd1129dfd..2ab708ae96 100644
--- a/src/Eto.Gtk/Forms/ToolBar/SeparatorToolItemHandler.cs
+++ b/src/Eto.Gtk/Forms/ToolBar/SeparatorToolItemHandler.cs
@@ -1,5 +1,3 @@
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms.ToolBar
 {
 	public class SeparatorToolItemHandler : ToolItemHandler<Gtk.SeparatorToolItem, SeparatorToolItem>, SeparatorToolItem.IHandler
diff --git a/src/Eto.Gtk/Forms/ToolBar/ToolBarHandler.cs b/src/Eto.Gtk/Forms/ToolBar/ToolBarHandler.cs
index 43b17a07d4..01527b5fbe 100644
--- a/src/Eto.Gtk/Forms/ToolBar/ToolBarHandler.cs
+++ b/src/Eto.Gtk/Forms/ToolBar/ToolBarHandler.cs
@@ -1,5 +1,3 @@
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms.ToolBar
 {
 	public class ToolBarHandler : WidgetHandler<Gtk.Toolbar, Eto.Forms.ToolBar>, Eto.Forms.ToolBar.IHandler
diff --git a/src/Eto.Gtk/Forms/ToolBar/ToolItemHandler.cs b/src/Eto.Gtk/Forms/ToolBar/ToolItemHandler.cs
index d91ce6cf54..a5b7455bca 100644
--- a/src/Eto.Gtk/Forms/ToolBar/ToolItemHandler.cs
+++ b/src/Eto.Gtk/Forms/ToolBar/ToolItemHandler.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp.Forms.ToolBar
 {
 	public interface IToolBarItemHandler
diff --git a/src/Eto.Gtk/Forms/UITimerHandler.cs b/src/Eto.Gtk/Forms/UITimerHandler.cs
index 5022c4ba26..e98f0da165 100644
--- a/src/Eto.Gtk/Forms/UITimerHandler.cs
+++ b/src/Eto.Gtk/Forms/UITimerHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.GtkSharp.Forms
 {
 	public class UITimerHandler : WidgetHandler<object, UITimer, UITimer.ICallback>, UITimer.IHandler
diff --git a/src/Eto.Gtk/Forms/UnityTaskbarHandler.cs b/src/Eto.Gtk/Forms/UnityTaskbarHandler.cs
index f1abbc1eff..c1ff3c2ec2 100644
--- a/src/Eto.Gtk/Forms/UnityTaskbarHandler.cs
+++ b/src/Eto.Gtk/Forms/UnityTaskbarHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
-using Eto.Forms;
-
-namespace Eto.GtkSharp
+namespace Eto.GtkSharp
 {
 	public class UnityTaskbarHandler : Taskbar.IHandler
 	{
diff --git a/src/Eto.Gtk/Forms/WindowHandler.cs b/src/Eto.Gtk/Forms/WindowHandler.cs
index 90b20072fa..003f0c7f62 100644
--- a/src/Eto.Gtk/Forms/WindowHandler.cs
+++ b/src/Eto.Gtk/Forms/WindowHandler.cs
@@ -1,7 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-using System.Linq;
-
 namespace Eto.GtkSharp.Forms
 {
 	public class WindowHandler : Window.IWindowHandler
diff --git a/src/Eto.Gtk/Gtk3Compatibility.cs b/src/Eto.Gtk/Gtk3Compatibility.cs
index 48ff2ba2f1..9bd72f6997 100644
--- a/src/Eto.Gtk/Gtk3Compatibility.cs
+++ b/src/Eto.Gtk/Gtk3Compatibility.cs
@@ -1,6 +1,3 @@
-using Eto.Drawing;
-using System;
-
 namespace Eto.GtkSharp
 {
 #if GTK2
diff --git a/src/Eto.Gtk/GtkConversions.cs b/src/Eto.Gtk/GtkConversions.cs
index 523c064bc9..23ecafb6cb 100644
--- a/src/Eto.Gtk/GtkConversions.cs
+++ b/src/Eto.Gtk/GtkConversions.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Runtime.InteropServices;
-using Eto.Drawing;
-using Eto.Forms;
-using Eto.GtkSharp.Drawing;
+using Eto.GtkSharp.Drawing;
 using Eto.GtkSharp.Forms;
 using Eto.GtkSharp.Forms.Menu;
 
diff --git a/src/Eto.Gtk/GtkExtensions.cs b/src/Eto.Gtk/GtkExtensions.cs
index 551f91fc48..23213243d4 100644
--- a/src/Eto.Gtk/GtkExtensions.cs
+++ b/src/Eto.Gtk/GtkExtensions.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-
 namespace Eto.GtkSharp
 {
 	static class GtkExtensions
diff --git a/src/Eto.Gtk/GtkHelpers.cs b/src/Eto.Gtk/GtkHelpers.cs
index fafe0b5e6f..d164a827b3 100644
--- a/src/Eto.Gtk/GtkHelpers.cs
+++ b/src/Eto.Gtk/GtkHelpers.cs
@@ -1,5 +1,3 @@
-using System;
-using Eto.Forms;
 using Eto.GtkSharp;
 using Eto.GtkSharp.Forms.Controls;
 using Eto.GtkSharp.Forms;
diff --git a/src/Eto.Gtk/GtkVersion.cs b/src/Eto.Gtk/GtkVersion.cs
index a011a0811b..ac01105bc7 100644
--- a/src/Eto.Gtk/GtkVersion.cs
+++ b/src/Eto.Gtk/GtkVersion.cs
@@ -1,4 +1,3 @@
-using System;
 namespace Eto.GtkSharp
 {
 	static class GtkVersion
diff --git a/src/Eto.Gtk/IO/SystemIcons.cs b/src/Eto.Gtk/IO/SystemIcons.cs
index a355c28c83..59d541de1c 100644
--- a/src/Eto.Gtk/IO/SystemIcons.cs
+++ b/src/Eto.Gtk/IO/SystemIcons.cs
@@ -1,4 +1,3 @@
-using Eto.Drawing;
 using Eto.IO;
 
 namespace Eto.GtkSharp.IO
diff --git a/src/Eto.Gtk/KeyMap.cs b/src/Eto.Gtk/KeyMap.cs
index c855016118..2c7caad3b0 100644
--- a/src/Eto.Gtk/KeyMap.cs
+++ b/src/Eto.Gtk/KeyMap.cs
@@ -1,7 +1,3 @@
-using Eto.Forms;
-using System.Collections.Generic;
-using System.Diagnostics;
-
 namespace Eto.GtkSharp
 {
 	public static class KeyMap
diff --git a/src/Eto.Gtk/MenuActionItemHandler.cs b/src/Eto.Gtk/MenuActionItemHandler.cs
index 175e8e1974..fd01768708 100644
--- a/src/Eto.Gtk/MenuActionItemHandler.cs
+++ b/src/Eto.Gtk/MenuActionItemHandler.cs
@@ -1,5 +1,3 @@
-using System;
-using Eto.Forms;
 using Eto.GtkSharp.Forms.Menu;
 
 namespace Eto.GtkSharp
diff --git a/src/Eto.Gtk/NativeMacMethods.cs b/src/Eto.Gtk/NativeMacMethods.cs
index b550609717..3d870fe6bf 100644
--- a/src/Eto.Gtk/NativeMacMethods.cs
+++ b/src/Eto.Gtk/NativeMacMethods.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
-
 namespace Eto.GtkSharp
 {
 	static class NativeMacMethods
diff --git a/src/Eto.Gtk/NativeMethods.cs b/src/Eto.Gtk/NativeMethods.cs
index 2c31b71771..9dd509ecca 100644
--- a/src/Eto.Gtk/NativeMethods.cs
+++ b/src/Eto.Gtk/NativeMethods.cs
@@ -1,7 +1,4 @@
-
-using System;
-using System.Runtime.InteropServices;
-using System.Text;
+
 using GLib;
 using Gdk;
 
diff --git a/src/Eto.Gtk/NativeMethods.tt b/src/Eto.Gtk/NativeMethods.tt
index 89c61b7e0d..2927c3dec8 100755
--- a/src/Eto.Gtk/NativeMethods.tt
+++ b/src/Eto.Gtk/NativeMethods.tt
@@ -115,9 +115,6 @@ var methods = giomethods
 	.ToArray();
 
 #>
-using System;
-using System.Runtime.InteropServices;
-using System.Text;
 using GLib;
 using Gdk;
 
diff --git a/src/Eto.Gtk/Platform.cs b/src/Eto.Gtk/Platform.cs
index 42568850b4..3fd02e4e7a 100644
--- a/src/Eto.Gtk/Platform.cs
+++ b/src/Eto.Gtk/Platform.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.IO;
 using Eto.GtkSharp.Drawing;
 using Eto.GtkSharp.Forms.Cells;
@@ -12,8 +9,6 @@
 using Eto.GtkSharp.Forms.Menu;
 using Eto.GtkSharp.Forms.ToolBar;
 using Eto.Shared.Forms;
-using System.Linq;
-
 namespace Eto.GtkSharp
 {
 	static class Helper
diff --git a/src/Eto.Mac/AppDelegate.cs b/src/Eto.Mac/AppDelegate.cs
index bc595f5b37..47a254b324 100644
--- a/src/Eto.Mac/AppDelegate.cs
+++ b/src/Eto.Mac/AppDelegate.cs
@@ -1,5 +1,3 @@
-using Eto.Forms;
-using System.ComponentModel;
 using Eto.Mac.Forms;
 
 
diff --git a/src/Eto.Mac/AsyncQueue.cs b/src/Eto.Mac/AsyncQueue.cs
index 73b13e5b90..1134abb26d 100644
--- a/src/Eto.Mac/AsyncQueue.cs
+++ b/src/Eto.Mac/AsyncQueue.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using Eto.Forms;
 using Eto.Mac.Forms;
 
 namespace Eto.Mac
diff --git a/src/Eto.Mac/CGConversions.cs b/src/Eto.Mac/CGConversions.cs
index 851cd34063..f7f1ceaaa1 100644
--- a/src/Eto.Mac/CGConversions.cs
+++ b/src/Eto.Mac/CGConversions.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-
 #if OSX
 using Eto.Mac.Drawing;
 
diff --git a/src/Eto.Mac/ColorizeView.cs b/src/Eto.Mac/ColorizeView.cs
index c8a179c88e..0cb13ee2c8 100644
--- a/src/Eto.Mac/ColorizeView.cs
+++ b/src/Eto.Mac/ColorizeView.cs
@@ -1,7 +1,4 @@
-using System;
-using Eto.Drawing;
-
-namespace Eto.Mac
+namespace Eto.Mac
 {
 	class ColorizeView : IDisposable
 	{
diff --git a/src/Eto.Mac/CrashReporter.cs b/src/Eto.Mac/CrashReporter.cs
index 746331f546..3e4eff3059 100644
--- a/src/Eto.Mac/CrashReporter.cs
+++ b/src/Eto.Mac/CrashReporter.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace Eto.Mac
+namespace Eto.Mac
 {
 	public static class CrashReporter
 	{
diff --git a/src/Eto.Mac/Drawing/BitmapHandler.cs b/src/Eto.Mac/Drawing/BitmapHandler.cs
index d507589e46..d08445b312 100644
--- a/src/Eto.Mac/Drawing/BitmapHandler.cs
+++ b/src/Eto.Mac/Drawing/BitmapHandler.cs
@@ -1,15 +1,5 @@
-using System;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using Eto.Drawing;
 using Eto.Mac.Forms;
 using Eto.Shared.Drawing;
-using System.Collections.Generic;
-using Eto.Forms;
-
-
-
 namespace Eto.Mac.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.Mac/Drawing/BrushHandler.cs b/src/Eto.Mac/Drawing/BrushHandler.cs
index ac09bd5223..2bc4ac899c 100644
--- a/src/Eto.Mac/Drawing/BrushHandler.cs
+++ b/src/Eto.Mac/Drawing/BrushHandler.cs
@@ -1,5 +1,3 @@
-using Eto.Drawing;
-
 #if OSX
 
 namespace Eto.Mac.Drawing
diff --git a/src/Eto.Mac/Drawing/ColorHandler.cs b/src/Eto.Mac/Drawing/ColorHandler.cs
index bfb4db2012..e333964f67 100644
--- a/src/Eto.Mac/Drawing/ColorHandler.cs
+++ b/src/Eto.Mac/Drawing/ColorHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-
 namespace Eto.Mac.Drawing
 {
 	public class ColorHandler : Color.IHandler
diff --git a/src/Eto.Mac/Drawing/EtoFontManager.cs b/src/Eto.Mac/Drawing/EtoFontManager.cs
index fbb04538da..60ffa8b5ec 100644
--- a/src/Eto.Mac/Drawing/EtoFontManager.cs
+++ b/src/Eto.Mac/Drawing/EtoFontManager.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Mac.Drawing
 {
 	public class EtoFontManager : NSFontManager
diff --git a/src/Eto.Mac/Drawing/FontExtensions.cs b/src/Eto.Mac/Drawing/FontExtensions.cs
index 0ba586bcb7..bc67a6bdbd 100644
--- a/src/Eto.Mac/Drawing/FontExtensions.cs
+++ b/src/Eto.Mac/Drawing/FontExtensions.cs
@@ -1,5 +1,3 @@
-using Eto.Drawing;
-
 #if OSX
 namespace Eto.Mac.Drawing
 #elif IOS
diff --git a/src/Eto.Mac/Drawing/FontFamilyHandler.cs b/src/Eto.Mac/Drawing/FontFamilyHandler.cs
index 3af46b261b..a7334351a2 100644
--- a/src/Eto.Mac/Drawing/FontFamilyHandler.cs
+++ b/src/Eto.Mac/Drawing/FontFamilyHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Linq;
-using System.IO;
-
 namespace Eto.Mac.Drawing
 {
 	public class FontFamilyHandler : WidgetHandler<object, FontFamily>, FontFamily.IHandler
diff --git a/src/Eto.Mac/Drawing/FontHandler.cs b/src/Eto.Mac/Drawing/FontHandler.cs
index 75654826d7..dbfe943443 100644
--- a/src/Eto.Mac/Drawing/FontHandler.cs
+++ b/src/Eto.Mac/Drawing/FontHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Globalization;
-using Eto.Drawing;
-
 #if IOS
 
 using UIKit;
diff --git a/src/Eto.Mac/Drawing/FontTypefaceHandler.cs b/src/Eto.Mac/Drawing/FontTypefaceHandler.cs
index db7a167532..60866413c5 100644
--- a/src/Eto.Mac/Drawing/FontTypefaceHandler.cs
+++ b/src/Eto.Mac/Drawing/FontTypefaceHandler.cs
@@ -1,11 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Collections.Generic;
-using Eto.Forms;
-using System.IO;
-
 namespace Eto.Mac.Drawing
 {
 	public class FontTypefaceHandler : WidgetHandler<FontTypeface>, FontTypeface.IHandler
diff --git a/src/Eto.Mac/Drawing/FontsHandler.cs b/src/Eto.Mac/Drawing/FontsHandler.cs
index bd0e98b736..9c9c712a9d 100644
--- a/src/Eto.Mac/Drawing/FontsHandler.cs
+++ b/src/Eto.Mac/Drawing/FontsHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Linq;
 #if OSX
 
 namespace Eto.Mac.Drawing
diff --git a/src/Eto.Mac/Drawing/FormattedTextHandler.cs b/src/Eto.Mac/Drawing/FormattedTextHandler.cs
index 35f5bb4bfd..4013a371d4 100644
--- a/src/Eto.Mac/Drawing/FormattedTextHandler.cs
+++ b/src/Eto.Mac/Drawing/FormattedTextHandler.cs
@@ -1,8 +1,4 @@
-using Eto.Drawing;
-using System;
-using System.Runtime.InteropServices;
-
-#if OSX
+#if OSX
 namespace Eto.Mac.Drawing
 #elif IOS
 
@@ -48,7 +44,7 @@ protected void ShowGlyphs(IntPtr glyphs, IntPtr positions, nuint glyphCount, Int
 
 				// what to do with the attributes?? needed?
 				var m = CTFontGetMatrix(font);
-#if !VSMAC && (MONOMAC || XAMMAC)
+#if !VSMAC && (MONOMAC)
 				m.Translate(textMatrix.x0, textMatrix.y0);
 #else
 				m.Translate(textMatrix.Tx, textMatrix.Ty);
diff --git a/src/Eto.Mac/Drawing/GraphicsHandler.cs b/src/Eto.Mac/Drawing/GraphicsHandler.cs
index ef4e11c228..93dc237d65 100644
--- a/src/Eto.Mac/Drawing/GraphicsHandler.cs
+++ b/src/Eto.Mac/Drawing/GraphicsHandler.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Globalization;
-using System.Linq;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-
-
 #if OSX
 using Eto.Mac.Forms;
 
diff --git a/src/Eto.Mac/Drawing/GraphicsPathHandler.cs b/src/Eto.Mac/Drawing/GraphicsPathHandler.cs
index ee10b52b0a..560e728d80 100644
--- a/src/Eto.Mac/Drawing/GraphicsPathHandler.cs
+++ b/src/Eto.Mac/Drawing/GraphicsPathHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using Eto.Drawing;
-
 #if OSX
 
 namespace Eto.Mac.Drawing
diff --git a/src/Eto.Mac/Drawing/IconFrameHandler.cs b/src/Eto.Mac/Drawing/IconFrameHandler.cs
index 6bec2fda73..b116fcea17 100644
--- a/src/Eto.Mac/Drawing/IconFrameHandler.cs
+++ b/src/Eto.Mac/Drawing/IconFrameHandler.cs
@@ -1,14 +1,3 @@
-using System;
-using System.Globalization;
-using System.IO;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Linq;
-using Eto.Forms;
-using System.Runtime.InteropServices;
-
-
-
 namespace Eto.Mac.Drawing
 {
 
diff --git a/src/Eto.Mac/Drawing/IconHandler.cs b/src/Eto.Mac/Drawing/IconHandler.cs
index 552e804bf0..cbe06db699 100644
--- a/src/Eto.Mac/Drawing/IconHandler.cs
+++ b/src/Eto.Mac/Drawing/IconHandler.cs
@@ -1,13 +1,3 @@
-using System;
-using System.Globalization;
-using System.IO;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Linq;
-using Eto.Forms;
-
-
-
 namespace Eto.Mac.Drawing
 {
 	public class IconHandler : ImageHandler<NSImage, Icon>, Icon.IHandler
diff --git a/src/Eto.Mac/Drawing/ImageHandler.cs b/src/Eto.Mac/Drawing/ImageHandler.cs
index 84d7d4c97e..e2ed0f8451 100644
--- a/src/Eto.Mac/Drawing/ImageHandler.cs
+++ b/src/Eto.Mac/Drawing/ImageHandler.cs
@@ -1,4 +1,3 @@
-using Eto.Drawing;
 using Eto.Mac.Forms;
 
 
diff --git a/src/Eto.Mac/Drawing/IndexedBitmapHandler.cs b/src/Eto.Mac/Drawing/IndexedBitmapHandler.cs
index f29532987b..1a3bc66eae 100644
--- a/src/Eto.Mac/Drawing/IndexedBitmapHandler.cs
+++ b/src/Eto.Mac/Drawing/IndexedBitmapHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Globalization;
-using System.Linq;
-using System.Runtime.InteropServices;
-using Eto.Drawing;
 using Eto.Shared.Drawing;
 
 
diff --git a/src/Eto.Mac/Drawing/LinearGradientBrushHandler.cs b/src/Eto.Mac/Drawing/LinearGradientBrushHandler.cs
index 1191f0e9d1..a4686d9038 100644
--- a/src/Eto.Mac/Drawing/LinearGradientBrushHandler.cs
+++ b/src/Eto.Mac/Drawing/LinearGradientBrushHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Linq;
-
 #if OSX
 
 namespace Eto.Mac.Drawing
diff --git a/src/Eto.Mac/Drawing/MatrixHandler.cs b/src/Eto.Mac/Drawing/MatrixHandler.cs
index 3e2b425f29..cbab1d65e5 100644
--- a/src/Eto.Mac/Drawing/MatrixHandler.cs
+++ b/src/Eto.Mac/Drawing/MatrixHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-
-
 #if OSX
 
 namespace Eto.Mac.Drawing
@@ -41,7 +37,7 @@ public void Create (float xx, float yx, float xy, float yy, float dx, float dy)
 			control = new CGAffineTransform (xx, yx, xy, yy, dx, dy);
 		}
 
-#if !VSMAC && (MONOMAC || XAMMAC)
+#if !VSMAC && (MONOMAC)
 		public float[] Elements => new float[] {
 					(float)control.xx,
 					(float)control.yx,
diff --git a/src/Eto.Mac/Drawing/PenHandler.cs b/src/Eto.Mac/Drawing/PenHandler.cs
index e07cbfd41e..8a6f154d65 100644
--- a/src/Eto.Mac/Drawing/PenHandler.cs
+++ b/src/Eto.Mac/Drawing/PenHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-
-
 #if OSX
 
 namespace Eto.Mac.Drawing
diff --git a/src/Eto.Mac/Drawing/RadialGradientBrushHandler.cs b/src/Eto.Mac/Drawing/RadialGradientBrushHandler.cs
index 733cb9abbe..ad36e0eb63 100644
--- a/src/Eto.Mac/Drawing/RadialGradientBrushHandler.cs
+++ b/src/Eto.Mac/Drawing/RadialGradientBrushHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Linq;
-
-
 #if OSX
 
 namespace Eto.Mac.Drawing
diff --git a/src/Eto.Mac/Drawing/SolidBrushHandler.cs b/src/Eto.Mac/Drawing/SolidBrushHandler.cs
index 3ffca76251..fc6c7a109a 100644
--- a/src/Eto.Mac/Drawing/SolidBrushHandler.cs
+++ b/src/Eto.Mac/Drawing/SolidBrushHandler.cs
@@ -1,5 +1,3 @@
-using Eto.Drawing;
-
 #if OSX
 
 namespace Eto.Mac.Drawing
diff --git a/src/Eto.Mac/Drawing/SplineHelper.cs b/src/Eto.Mac/Drawing/SplineHelper.cs
index 014615f79f..2f957673af 100644
--- a/src/Eto.Mac/Drawing/SplineHelper.cs
+++ b/src/Eto.Mac/Drawing/SplineHelper.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Linq;
-using Eto.Drawing;
-using System.Collections.Generic;
-
 namespace Eto
 {
 	/// <summary>
diff --git a/src/Eto.Mac/Drawing/SystemColorsHandler.cs b/src/Eto.Mac/Drawing/SystemColorsHandler.cs
index 2353b3f627..1aa09a1fbe 100644
--- a/src/Eto.Mac/Drawing/SystemColorsHandler.cs
+++ b/src/Eto.Mac/Drawing/SystemColorsHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Threading;
-
-
 namespace Eto.Mac.Drawing
 {
 	public class SystemColorsHandler : SystemColors.IHandler
diff --git a/src/Eto.Mac/Drawing/TextureBrushHandler.cs b/src/Eto.Mac/Drawing/TextureBrushHandler.cs
index a72a8f84db..51e04170b9 100644
--- a/src/Eto.Mac/Drawing/TextureBrushHandler.cs
+++ b/src/Eto.Mac/Drawing/TextureBrushHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-
-
 #if OSX
 
 namespace Eto.Mac.Drawing
diff --git a/src/Eto.Mac/Eto.Mac64.csproj b/src/Eto.Mac/Eto.Mac64.csproj
index bc61759efb..c72ef78c91 100644
--- a/src/Eto.Mac/Eto.Mac64.csproj
+++ b/src/Eto.Mac/Eto.Mac64.csproj
@@ -46,6 +46,7 @@ You do not need to use any of the classes of this assembly (unless customizing t
     <Using Include="System.Int64" Alias="nint" />
     <Using Include="System.UInt64" Alias="nuint" />
     <Using Include="System.IntPtr" Alias="NativeHandle" />
+    <Using Include="System.Drawing" Alias="sd" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Eto.Mac/Eto.XamMac2.csproj b/src/Eto.Mac/Eto.XamMac2.csproj
index f703515381..a38b5d953c 100644
--- a/src/Eto.Mac/Eto.XamMac2.csproj
+++ b/src/Eto.Mac/Eto.XamMac2.csproj
@@ -10,7 +10,6 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefaultItemExcludes>$(DefaultItemExcludes);build\*</DefaultItemExcludes>
     <NoWarn>CA1416</NoWarn>
-    <LangVersion>10</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Using Include="AppKit" />
diff --git a/src/Eto.Mac/EtoBundle.cs b/src/Eto.Mac/EtoBundle.cs
index 9f781d2e78..bccb7f9338 100644
--- a/src/Eto.Mac/EtoBundle.cs
+++ b/src/Eto.Mac/EtoBundle.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Runtime.InteropServices;
-
 namespace Eto.Mac
 {
 	static class MarshalDelegates
diff --git a/src/Eto.Mac/EtoEnvironmentHandler.cs b/src/Eto.Mac/EtoEnvironmentHandler.cs
index 4e07811f64..dc1995e86b 100644
--- a/src/Eto.Mac/EtoEnvironmentHandler.cs
+++ b/src/Eto.Mac/EtoEnvironmentHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Linq;
-using System.IO;
-using System.Diagnostics;
-using System.Reflection;
-
 namespace Eto.Mac
 {
 	public class EtoEnvironmentHandler : WidgetHandler<Widget>, EtoEnvironment.IHandler
diff --git a/src/Eto.Mac/Forms/Actions/MacCommand.cs b/src/Eto.Mac/Forms/Actions/MacCommand.cs
index e29bd4c113..6abef63beb 100644
--- a/src/Eto.Mac/Forms/Actions/MacCommand.cs
+++ b/src/Eto.Mac/Forms/Actions/MacCommand.cs
@@ -1,5 +1,3 @@
-using Eto.Forms;
-
 namespace Eto.Mac.Forms.Actions
 {
 	public class MacCommand : Command
diff --git a/src/Eto.Mac/Forms/ApplicationHandler.cs b/src/Eto.Mac/Forms/ApplicationHandler.cs
index d4f82cf759..b5d545a52b 100644
--- a/src/Eto.Mac/Forms/ApplicationHandler.cs
+++ b/src/Eto.Mac/Forms/ApplicationHandler.cs
@@ -1,13 +1,6 @@
-using System;
-using Eto.Forms;
 using Eto.Mac.Forms.Actions;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
 using Eto.Mac.Drawing;
 using System.Runtime.CompilerServices;
-using System.Threading;
-
 namespace Eto.Mac.Forms
 {
 	public class ApplicationHandler : WidgetHandler<NSApplication, Application, Application.ICallback>, Application.IHandler
diff --git a/src/Eto.Mac/Forms/Cells/CellHandler.cs b/src/Eto.Mac/Forms/Cells/CellHandler.cs
index 992e0d72fc..d177fbde68 100644
--- a/src/Eto.Mac/Forms/Cells/CellHandler.cs
+++ b/src/Eto.Mac/Forms/Cells/CellHandler.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-using System;
 using Eto.Mac.Forms.Controls;
 
 
diff --git a/src/Eto.Mac/Forms/Cells/CheckBoxCellHandler.cs b/src/Eto.Mac/Forms/Cells/CheckBoxCellHandler.cs
index b8b0642fa8..2c77d33b20 100644
--- a/src/Eto.Mac/Forms/Cells/CheckBoxCellHandler.cs
+++ b/src/Eto.Mac/Forms/Cells/CheckBoxCellHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Mac.Forms.Controls;
 
 
diff --git a/src/Eto.Mac/Forms/Cells/ComboBoxCellHandler.cs b/src/Eto.Mac/Forms/Cells/ComboBoxCellHandler.cs
index 11e63048ed..a0513a0c42 100644
--- a/src/Eto.Mac/Forms/Cells/ComboBoxCellHandler.cs
+++ b/src/Eto.Mac/Forms/Cells/ComboBoxCellHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Collections.Generic;
-using System.Linq;
-using Eto.Drawing;
 using Eto.Mac.Forms.Controls;
 
 
diff --git a/src/Eto.Mac/Forms/Cells/CustomCellHandler.cs b/src/Eto.Mac/Forms/Cells/CustomCellHandler.cs
index dd3c2a651e..557e17e1ba 100644
--- a/src/Eto.Mac/Forms/Cells/CustomCellHandler.cs
+++ b/src/Eto.Mac/Forms/Cells/CustomCellHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Collections.Generic;
 using Eto.Mac.Forms.Controls;
 using Eto.Shared;
 
diff --git a/src/Eto.Mac/Forms/Cells/DrawableCellHandler.cs b/src/Eto.Mac/Forms/Cells/DrawableCellHandler.cs
index 0cce65b29e..b923cea7aa 100644
--- a/src/Eto.Mac/Forms/Cells/DrawableCellHandler.cs
+++ b/src/Eto.Mac/Forms/Cells/DrawableCellHandler.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Mac.Drawing;
-using System.Runtime.InteropServices;
 using Eto.Mac.Forms.Controls;
 
 
diff --git a/src/Eto.Mac/Forms/Cells/ImageTextCellHandler.cs b/src/Eto.Mac/Forms/Cells/ImageTextCellHandler.cs
index 31bad0f77e..d3f8fd1a22 100644
--- a/src/Eto.Mac/Forms/Cells/ImageTextCellHandler.cs
+++ b/src/Eto.Mac/Forms/Cells/ImageTextCellHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Mac.Drawing;
 using Eto.Mac.Forms.Controls;
 
diff --git a/src/Eto.Mac/Forms/Cells/ImageViewCellHandler.cs b/src/Eto.Mac/Forms/Cells/ImageViewCellHandler.cs
index e6b1daaf17..ff14fbd48d 100644
--- a/src/Eto.Mac/Forms/Cells/ImageViewCellHandler.cs
+++ b/src/Eto.Mac/Forms/Cells/ImageViewCellHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Mac.Drawing;
 using Eto.Mac.Forms.Controls;
 
diff --git a/src/Eto.Mac/Forms/Cells/ProgressCellHandler.cs b/src/Eto.Mac/Forms/Cells/ProgressCellHandler.cs
index 02224ada32..0c6a550977 100644
--- a/src/Eto.Mac/Forms/Cells/ProgressCellHandler.cs
+++ b/src/Eto.Mac/Forms/Cells/ProgressCellHandler.cs
@@ -1,7 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using Eto.Mac.Drawing;
+using Eto.Mac.Drawing;
 using Eto.Mac.Forms.Controls;
 
 
diff --git a/src/Eto.Mac/Forms/Cells/TextBoxCellHandler.cs b/src/Eto.Mac/Forms/Cells/TextBoxCellHandler.cs
index c9d4a2478e..915af98bad 100644
--- a/src/Eto.Mac/Forms/Cells/TextBoxCellHandler.cs
+++ b/src/Eto.Mac/Forms/Cells/TextBoxCellHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Mac.Forms.Controls;
 using Eto.Mac.Drawing;
 
diff --git a/src/Eto.Mac/Forms/ClipboardHandler.cs b/src/Eto.Mac/Forms/ClipboardHandler.cs
index 8970b3ddff..2e47a42179 100644
--- a/src/Eto.Mac/Forms/ClipboardHandler.cs
+++ b/src/Eto.Mac/Forms/ClipboardHandler.cs
@@ -1,10 +1,4 @@
-using System;
-using Eto.Forms;
-using System.IO;
 using Eto.Mac.Drawing;
-using Eto.Drawing;
-
-
 namespace Eto.Mac.Forms
 {
 	public class ClipboardHandler : DataObjectHandler<Clipboard, Clipboard.ICallback>, Clipboard.IHandler
diff --git a/src/Eto.Mac/Forms/ColorDialogHandler.cs b/src/Eto.Mac/Forms/ColorDialogHandler.cs
index a564d2add1..7c2276c146 100644
--- a/src/Eto.Mac/Forms/ColorDialogHandler.cs
+++ b/src/Eto.Mac/Forms/ColorDialogHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Mac.Forms
 {
 	interface IColorDialogHandler
diff --git a/src/Eto.Mac/Forms/Controls/ButtonHandler.cs b/src/Eto.Mac/Forms/Controls/ButtonHandler.cs
index 2668c0e88f..76ff422d51 100644
--- a/src/Eto.Mac/Forms/Controls/ButtonHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/ButtonHandler.cs
@@ -1,11 +1,5 @@
 //#define BUTTON_DEBUG
 
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
-
-
 namespace Eto.Mac.Forms.Controls
 {
 	public class ButtonHandler : ButtonHandler<Button, Button.ICallback>, Button.IHandler
diff --git a/src/Eto.Mac/Forms/Controls/CalendarHandler.cs b/src/Eto.Mac/Forms/Controls/CalendarHandler.cs
index c8de920151..10a09594c2 100644
--- a/src/Eto.Mac/Forms/Controls/CalendarHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/CalendarHandler.cs
@@ -1,7 +1,4 @@
-using System;
-using Eto.Forms;
-
-namespace Eto.Mac.Forms.Controls
+namespace Eto.Mac.Forms.Controls
 {
 	public class CalendarHandler : MacControl<NSDatePicker, Calendar, Calendar.ICallback>, Calendar.IHandler
 	{
diff --git a/src/Eto.Mac/Forms/Controls/CheckBoxHandler.cs b/src/Eto.Mac/Forms/Controls/CheckBoxHandler.cs
index cda2d1550c..733a63a1f8 100644
--- a/src/Eto.Mac/Forms/Controls/CheckBoxHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/CheckBoxHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
-
-
 namespace Eto.Mac.Forms.Controls
 {
 
diff --git a/src/Eto.Mac/Forms/Controls/ColorPickerHandler.cs b/src/Eto.Mac/Forms/Controls/ColorPickerHandler.cs
index 957ded8b3c..fc637b9d10 100644
--- a/src/Eto.Mac/Forms/Controls/ColorPickerHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/ColorPickerHandler.cs
@@ -1,10 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Mac.Drawing;
-using System.Text.RegularExpressions;
-using System.Linq;
-
 namespace Eto.Mac.Forms.Controls
 {
 	public class ColorPickerHandler : MacControl<NSColorWell, ColorPicker, ColorPicker.ICallback>, ColorPicker.IHandler
diff --git a/src/Eto.Mac/Forms/Controls/ComboBoxHandler.cs b/src/Eto.Mac/Forms/Controls/ComboBoxHandler.cs
index 4adc0330c3..2522bf49dc 100644
--- a/src/Eto.Mac/Forms/Controls/ComboBoxHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/ComboBoxHandler.cs
@@ -1,12 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Linq;
-using System.Collections.Generic;
-using System.Collections;
-using Eto.Drawing;
-
-
-
 namespace Eto.Mac.Forms.Controls
 {
 	public class ComboBoxHandler : MacControl<NSComboBox, ComboBox, ComboBox.ICallback>, ComboBox.IHandler
diff --git a/src/Eto.Mac/Forms/Controls/DateTimePickerHandler.cs b/src/Eto.Mac/Forms/Controls/DateTimePickerHandler.cs
index 598ada8ebb..2d38bbc7b2 100644
--- a/src/Eto.Mac/Forms/Controls/DateTimePickerHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/DateTimePickerHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Mac.Forms.Controls
 {
 	public class DateTimePickerHandler : MacControl<NSDatePicker, DateTimePicker, DateTimePicker.ICallback>, DateTimePicker.IHandler
diff --git a/src/Eto.Mac/Forms/Controls/DrawableHandler.cs b/src/Eto.Mac/Forms/Controls/DrawableHandler.cs
index 7a0144d6fa..b4b95c6f24 100644
--- a/src/Eto.Mac/Forms/Controls/DrawableHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/DrawableHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.Mac.Drawing;
 
 namespace Eto.Mac.Forms.Controls
diff --git a/src/Eto.Mac/Forms/Controls/DropDownHandler.cs b/src/Eto.Mac/Forms/Controls/DropDownHandler.cs
index 8834e8cd0f..ad59077b26 100644
--- a/src/Eto.Mac/Forms/Controls/DropDownHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/DropDownHandler.cs
@@ -1,12 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Linq;
-using System.Collections.Generic;
-using System.Collections;
-using Eto.Drawing;
-
-
-
 namespace Eto.Mac.Forms.Controls
 {
 	public class DropDownHandler : MacControl<NSPopUpButton, DropDown, DropDown.ICallback>, DropDown.IHandler
diff --git a/src/Eto.Mac/Forms/Controls/ExpanderHandler.cs b/src/Eto.Mac/Forms/Controls/ExpanderHandler.cs
index 07e6fb0e09..fd9dd579a4 100644
--- a/src/Eto.Mac/Forms/Controls/ExpanderHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/ExpanderHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-using System.Linq;
-
-
-
 namespace Eto.Mac.Forms.Controls
 {
 	public class ExpanderHandler : MacPanel<NSView, Expander, Expander.ICallback>, Expander.IHandler
diff --git a/src/Eto.Mac/Forms/Controls/GridColumnHandler.cs b/src/Eto.Mac/Forms/Controls/GridColumnHandler.cs
index 2dad15c79b..36b1e5ecd8 100644
--- a/src/Eto.Mac/Forms/Controls/GridColumnHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/GridColumnHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Mac.Drawing;
 using Eto.Mac.Forms.Cells;
 
diff --git a/src/Eto.Mac/Forms/Controls/GridHandler.cs b/src/Eto.Mac/Forms/Controls/GridHandler.cs
index 2708b1cf26..439ea9dacd 100644
--- a/src/Eto.Mac/Forms/Controls/GridHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/GridHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using Eto.Forms;
-using System.Collections.Generic;
 using Eto.Mac.Forms.Menu;
-using System.Linq;
-using Eto.Drawing;
 using Eto.Mac.Drawing;
 using Eto.Mac.Forms.Cells;
 
diff --git a/src/Eto.Mac/Forms/Controls/GridViewHandler.cs b/src/Eto.Mac/Forms/Controls/GridViewHandler.cs
index 37b6e380b9..8a487a23c7 100644
--- a/src/Eto.Mac/Forms/Controls/GridViewHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/GridViewHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Collections.Generic;
-using Eto.Drawing;
-using System.Collections;
-using System.Linq;
 using Eto.Mac.Forms.Cells;
 
 #if MACOS_NET && !VSMAC
diff --git a/src/Eto.Mac/Forms/Controls/GroupBoxHandler.cs b/src/Eto.Mac/Forms/Controls/GroupBoxHandler.cs
index ce6a0a5c34..fc1c8f92c0 100644
--- a/src/Eto.Mac/Forms/Controls/GroupBoxHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/GroupBoxHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Mac.Drawing;
 
 
diff --git a/src/Eto.Mac/Forms/Controls/ImageViewHandler.cs b/src/Eto.Mac/Forms/Controls/ImageViewHandler.cs
index 3ddd51fae2..a1f081a90a 100644
--- a/src/Eto.Mac/Forms/Controls/ImageViewHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/ImageViewHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Mac.Drawing;
 
 
diff --git a/src/Eto.Mac/Forms/Controls/LabelHandler.cs b/src/Eto.Mac/Forms/Controls/LabelHandler.cs
index d0a1c61110..7fbc942d0a 100644
--- a/src/Eto.Mac/Forms/Controls/LabelHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/LabelHandler.cs
@@ -1,12 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Mac.Drawing;
-using System.Text.RegularExpressions;
-using System.Linq;
-
-
-
 namespace Eto.Mac.Forms.Controls
 {
 	public class LabelHandler : MacLabel<NSTextField, Label, Label.ICallback>, Label.IHandler
diff --git a/src/Eto.Mac/Forms/Controls/LinkButtonHandler.cs b/src/Eto.Mac/Forms/Controls/LinkButtonHandler.cs
index bdbecfbfd9..acca45fdc9 100644
--- a/src/Eto.Mac/Forms/Controls/LinkButtonHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/LinkButtonHandler.cs
@@ -1,10 +1,4 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.Mac.Drawing;
-using System.Runtime.InteropServices;
-
-
 namespace Eto.Mac.Forms.Controls
 {
 	/// <summary>
diff --git a/src/Eto.Mac/Forms/Controls/ListBoxHandler.cs b/src/Eto.Mac/Forms/Controls/ListBoxHandler.cs
index 83dd1846d5..61f4814955 100644
--- a/src/Eto.Mac/Forms/Controls/ListBoxHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/ListBoxHandler.cs
@@ -1,12 +1,5 @@
-using System;
-using Eto.Forms;
-using System.Collections.Generic;
 using Eto.Mac.Forms.Controls;
-using Eto.Drawing;
 using Eto.Mac.Drawing;
-using System.Collections;
-using System.Linq;
-
 namespace Eto.Mac.Forms.Controls
 {
 	public class EtoScrollView : NSScrollView, IMacControl
diff --git a/src/Eto.Mac/Forms/Controls/MacButton.cs b/src/Eto.Mac/Forms/Controls/MacButton.cs
index 4fa765cb85..2eb34d291d 100644
--- a/src/Eto.Mac/Forms/Controls/MacButton.cs
+++ b/src/Eto.Mac/Forms/Controls/MacButton.cs
@@ -1,7 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-
-
 namespace Eto.Mac.Forms.Controls
 {
 	public abstract class MacButton<TControl, TWidget, TCallback> : MacControl<TControl, TWidget, TCallback>, TextControl.IHandler
diff --git a/src/Eto.Mac/Forms/Controls/MacControl.cs b/src/Eto.Mac/Forms/Controls/MacControl.cs
index 7054cb26d6..f7f131af25 100644
--- a/src/Eto.Mac/Forms/Controls/MacControl.cs
+++ b/src/Eto.Mac/Forms/Controls/MacControl.cs
@@ -1,5 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Mac.Drawing;
 
 namespace Eto.Mac.Forms.Controls
diff --git a/src/Eto.Mac/Forms/Controls/MacEventView.cs b/src/Eto.Mac/Forms/Controls/MacEventView.cs
index 3ba5062f62..f61070b33a 100644
--- a/src/Eto.Mac/Forms/Controls/MacEventView.cs
+++ b/src/Eto.Mac/Forms/Controls/MacEventView.cs
@@ -1,9 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Diagnostics;
-
-
 namespace Eto.Mac.Forms.Controls
 {
 	public class MacEventView : NSBox, IMacControl
diff --git a/src/Eto.Mac/Forms/Controls/MacImageAndTextCell.cs b/src/Eto.Mac/Forms/Controls/MacImageAndTextCell.cs
index 18d58aa90d..e405b18826 100644
--- a/src/Eto.Mac/Forms/Controls/MacImageAndTextCell.cs
+++ b/src/Eto.Mac/Forms/Controls/MacImageAndTextCell.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Forms;
 using Eto.Mac.Drawing;
-using Eto.Drawing;
-
 namespace Eto.Mac.Forms.Controls
 {
 	public class MacImageData : NSObject, ICloneable
diff --git a/src/Eto.Mac/Forms/Controls/MacImageTextView.cs b/src/Eto.Mac/Forms/Controls/MacImageTextView.cs
index b0474056cb..2fb3e81c58 100644
--- a/src/Eto.Mac/Forms/Controls/MacImageTextView.cs
+++ b/src/Eto.Mac/Forms/Controls/MacImageTextView.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Eto.Mac.Forms.Controls
+namespace Eto.Mac.Forms.Controls
 {
     public class MacImageTextView : NSView
     {
diff --git a/src/Eto.Mac/Forms/Controls/MacLabel.cs b/src/Eto.Mac/Forms/Controls/MacLabel.cs
index cb33840385..77255a3703 100644
--- a/src/Eto.Mac/Forms/Controls/MacLabel.cs
+++ b/src/Eto.Mac/Forms/Controls/MacLabel.cs
@@ -1,10 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Mac.Drawing;
-using System.Text.RegularExpressions;
-using System.Linq;
-
 namespace Eto.Mac.Forms.Controls
 {
 
diff --git a/src/Eto.Mac/Forms/Controls/MacText.cs b/src/Eto.Mac/Forms/Controls/MacText.cs
index dd3e027f79..b38ae03a86 100644
--- a/src/Eto.Mac/Forms/Controls/MacText.cs
+++ b/src/Eto.Mac/Forms/Controls/MacText.cs
@@ -1,10 +1,4 @@
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Mac.Drawing;
-using System;
-using System.Diagnostics;
-
-
 namespace Eto.Mac.Forms.Controls
 {
 
diff --git a/src/Eto.Mac/Forms/Controls/NativeControlHandler.cs b/src/Eto.Mac/Forms/Controls/NativeControlHandler.cs
index d17b1c7ebe..35ea739c0e 100644
--- a/src/Eto.Mac/Forms/Controls/NativeControlHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/NativeControlHandler.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Globalization;
-using Eto.Forms;
-using Eto.Drawing;
-
-
-namespace Eto.Mac.Forms.Controls
+namespace Eto.Mac.Forms.Controls
 {
 	public class NativeControlHandler : MacView<NSView, Control, Control.ICallback>
 	{
diff --git a/src/Eto.Mac/Forms/Controls/NumericStepperHandler.cs b/src/Eto.Mac/Forms/Controls/NumericStepperHandler.cs
index 6499b48f77..75c93345e1 100644
--- a/src/Eto.Mac/Forms/Controls/NumericStepperHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/NumericStepperHandler.cs
@@ -1,13 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Mac.Drawing;
-using System.Linq;
-using System.Globalization;
-using System.Text.RegularExpressions;
-using System.Runtime.InteropServices;
-using System.Reflection;
-
 namespace Eto.Mac.Forms.Controls
 {
 	public class NumericStepperHandler : MacView<NumericStepperHandler.EtoNumericStepperView, NumericStepper, NumericStepper.ICallback>, NumericStepper.IHandler
diff --git a/src/Eto.Mac/Forms/Controls/PanelHandler.cs b/src/Eto.Mac/Forms/Controls/PanelHandler.cs
index 5601655675..81707d4af9 100644
--- a/src/Eto.Mac/Forms/Controls/PanelHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/PanelHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Mac.Forms.Controls
 {
 	public class PanelHandler : MacPanel<NSView, Panel, Panel.ICallback>, Panel.IHandler
diff --git a/src/Eto.Mac/Forms/Controls/PasswordBoxHandler.cs b/src/Eto.Mac/Forms/Controls/PasswordBoxHandler.cs
index 13a1617d99..40da191737 100644
--- a/src/Eto.Mac/Forms/Controls/PasswordBoxHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/PasswordBoxHandler.cs
@@ -1,10 +1,4 @@
-using System;
-using Eto.Forms;
 using Eto.Mac.Forms.Controls;
-using Eto.Drawing;
-
-
-
 namespace Eto.Mac.Forms.Controls
 {
 	public class EtoSecureTextFieldCell : NSSecureTextFieldCell, IColorizeCell
diff --git a/src/Eto.Mac/Forms/Controls/ProgressBarHandler.cs b/src/Eto.Mac/Forms/Controls/ProgressBarHandler.cs
index d27e93470f..bbb369f068 100644
--- a/src/Eto.Mac/Forms/Controls/ProgressBarHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/ProgressBarHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
-
-
 namespace Eto.Mac.Forms.Controls
 {
 	public class ProgressBarHandler : MacView<NSProgressIndicator, ProgressBar, ProgressBar.ICallback>, ProgressBar.IHandler
diff --git a/src/Eto.Mac/Forms/Controls/RadioButtonHandler.cs b/src/Eto.Mac/Forms/Controls/RadioButtonHandler.cs
index f374ef889b..4b2587f032 100644
--- a/src/Eto.Mac/Forms/Controls/RadioButtonHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/RadioButtonHandler.cs
@@ -1,11 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Collections.Generic;
-using System.Linq;
-using Eto.Drawing;
-
-
-
 namespace Eto.Mac.Forms.Controls
 {
 	public class RadioButtonHandler : MacButton<NSButton, RadioButton, RadioButton.ICallback>, RadioButton.IHandler
diff --git a/src/Eto.Mac/Forms/Controls/RichTextAreaHandler.cs b/src/Eto.Mac/Forms/Controls/RichTextAreaHandler.cs
index 64a6f5da51..c1bcc1cd34 100644
--- a/src/Eto.Mac/Forms/Controls/RichTextAreaHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/RichTextAreaHandler.cs
@@ -1,11 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Mac.Drawing;
-using System.IO;
-using System.Collections.Generic;
-using System.Text;
-
 namespace Eto.Mac.Forms.Controls
 {
 	public class RichTextAreaHandler : TextAreaHandler<RichTextArea, RichTextArea.ICallback>, RichTextArea.IHandler, ITextBuffer
diff --git a/src/Eto.Mac/Forms/Controls/ScrollableHandler.cs b/src/Eto.Mac/Forms/Controls/ScrollableHandler.cs
index 55fba760c8..e35dbc3624 100644
--- a/src/Eto.Mac/Forms/Controls/ScrollableHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/ScrollableHandler.cs
@@ -2,10 +2,6 @@
 // has something to do with using layers (background colors) at the same time
 //#define USE_FLIPPED
 
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Mac.Forms.Controls
 {
 	public class ScrollableHandler : MacPanel<NSScrollView, Scrollable, Scrollable.ICallback>, Scrollable.IHandler
diff --git a/src/Eto.Mac/Forms/Controls/SearchBoxHandler.cs b/src/Eto.Mac/Forms/Controls/SearchBoxHandler.cs
index 7a5fdfb5b4..cee38166c6 100644
--- a/src/Eto.Mac/Forms/Controls/SearchBoxHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/SearchBoxHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
-
-
 namespace Eto.Mac.Forms.Controls
 {
 	/// <summary>
diff --git a/src/Eto.Mac/Forms/Controls/SegmentedButtonHandler.cs b/src/Eto.Mac/Forms/Controls/SegmentedButtonHandler.cs
index b3ff05572b..13f944bfee 100644
--- a/src/Eto.Mac/Forms/Controls/SegmentedButtonHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/SegmentedButtonHandler.cs
@@ -1,11 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Collections.Generic;
-using Eto.Drawing;
-using System.Linq;
-
-
-
 namespace Eto.Mac.Forms.Controls
 {
 	interface ISegmentedItemHandler
diff --git a/src/Eto.Mac/Forms/Controls/SliderHandler.cs b/src/Eto.Mac/Forms/Controls/SliderHandler.cs
index b1e4fc9915..dcfb28e90d 100644
--- a/src/Eto.Mac/Forms/Controls/SliderHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/SliderHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
-
-
 namespace Eto.Mac.Forms.Controls
 {
 	public class SliderHandler : MacControl<NSSlider, Slider, Slider.ICallback>, Slider.IHandler
diff --git a/src/Eto.Mac/Forms/Controls/SpinnerHandler.cs b/src/Eto.Mac/Forms/Controls/SpinnerHandler.cs
index ac30c65bac..7e7fb58f1f 100644
--- a/src/Eto.Mac/Forms/Controls/SpinnerHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/SpinnerHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Mac.Forms.Controls
 {
 	public class SpinnerHandler : MacView<NSProgressIndicator, Spinner, Spinner.ICallback>, Spinner.IHandler
diff --git a/src/Eto.Mac/Forms/Controls/SplitterHandler.cs b/src/Eto.Mac/Forms/Controls/SplitterHandler.cs
index e3307c0202..07a73b9271 100644
--- a/src/Eto.Mac/Forms/Controls/SplitterHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/SplitterHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
-
 namespace Eto.Mac.Forms.Controls
 {
 	public class SplitterHandler : MacContainer<NSSplitView, Splitter, Splitter.ICallback>, Splitter.IHandler
diff --git a/src/Eto.Mac/Forms/Controls/StepperHandler.cs b/src/Eto.Mac/Forms/Controls/StepperHandler.cs
index efa6965852..2c9ee8d5bd 100644
--- a/src/Eto.Mac/Forms/Controls/StepperHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/StepperHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
-
-namespace Eto.Mac.Forms.Controls
+namespace Eto.Mac.Forms.Controls
 {
 	public class StepperHandler : MacControl<NSStepper, Stepper, Stepper.ICallback>, Stepper.IHandler
 	{
diff --git a/src/Eto.Mac/Forms/Controls/TabControlHandler.cs b/src/Eto.Mac/Forms/Controls/TabControlHandler.cs
index 04b56dc84b..84145d858e 100644
--- a/src/Eto.Mac/Forms/Controls/TabControlHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/TabControlHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Linq;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Collections.Generic;
-
 namespace Eto.Mac.Forms.Controls
 {
 	public class TabControlHandler : MacView<NSTabView, TabControl, TabControl.ICallback>, TabControl.IHandler
diff --git a/src/Eto.Mac/Forms/Controls/TabPageHandler.cs b/src/Eto.Mac/Forms/Controls/TabPageHandler.cs
index 37779d772b..853a49a447 100644
--- a/src/Eto.Mac/Forms/Controls/TabPageHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/TabPageHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
-
 namespace Eto.Mac.Forms.Controls
 {
 	public class TabPageHandler : MacPanel<NSTabViewItem, TabPage, TabPage.ICallback>, TabPage.IHandler
diff --git a/src/Eto.Mac/Forms/Controls/TextAreaHandler.cs b/src/Eto.Mac/Forms/Controls/TextAreaHandler.cs
index 4ebda284f2..2b4921a6b0 100644
--- a/src/Eto.Mac/Forms/Controls/TextAreaHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/TextAreaHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Mac.Drawing;
 
 namespace Eto.Mac.Forms.Controls
diff --git a/src/Eto.Mac/Forms/Controls/TextBoxHandler.cs b/src/Eto.Mac/Forms/Controls/TextBoxHandler.cs
index e64244a4df..73de732889 100644
--- a/src/Eto.Mac/Forms/Controls/TextBoxHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/TextBoxHandler.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Forms;
 using Eto.Mac.Forms.Controls;
-using Eto.Drawing;
-
 namespace Eto.Mac.Forms.Controls
 {
 	public interface ITextBoxWithMaxLength
diff --git a/src/Eto.Mac/Forms/Controls/ToggleButtonHandler.cs b/src/Eto.Mac/Forms/Controls/ToggleButtonHandler.cs
index c070d143a3..01a89ba82c 100644
--- a/src/Eto.Mac/Forms/Controls/ToggleButtonHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/ToggleButtonHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
-
-
 namespace Eto.Mac.Forms.Controls
 {
 	public class ToggleButtonHandler : ButtonHandler<ToggleButton, ToggleButton.ICallback>, ToggleButton.IHandler
diff --git a/src/Eto.Mac/Forms/Controls/TreeGridViewHandler.cs b/src/Eto.Mac/Forms/Controls/TreeGridViewHandler.cs
index 405f4b7c84..47bf9fbaf0 100644
--- a/src/Eto.Mac/Forms/Controls/TreeGridViewHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/TreeGridViewHandler.cs
@@ -1,10 +1,4 @@
-using System;
-using Eto.Forms;
-using System.Collections.Generic;
-using System.Linq;
 using Eto.Mac.Forms.Cells;
-using Eto.Drawing;
-
 #if MACOS_NET && !VSMAC
 using NSDraggingInfo = AppKit.INSDraggingInfo;
 #endif
diff --git a/src/Eto.Mac/Forms/Controls/TreeViewHandler.cs b/src/Eto.Mac/Forms/Controls/TreeViewHandler.cs
index 6681ff5621..32e7e3dadc 100644
--- a/src/Eto.Mac/Forms/Controls/TreeViewHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/TreeViewHandler.cs
@@ -1,10 +1,4 @@
-using System;
-using Eto.Forms;
-using System.Collections.Generic;
 using Eto.Mac.Forms.Menu;
-using System.Linq;
-using Eto.Drawing;
-
 namespace Eto.Mac.Forms.Controls
 {
 	[Obsolete("Since 2.4. TreeView is deprecated, please use TreeGridView instead.")]
diff --git a/src/Eto.Mac/Forms/Controls/WKWebViewHandler.cs b/src/Eto.Mac/Forms/Controls/WKWebViewHandler.cs
index 7a4dd6c7d0..e81de57173 100644
--- a/src/Eto.Mac/Forms/Controls/WKWebViewHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/WKWebViewHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Linq;
-using Eto.Drawing;
-using System.Threading.Tasks;
-using System.Runtime.InteropServices;
 #if MONOMAC
 using wk = MonoMac.WebKit;
 #else
diff --git a/src/Eto.Mac/Forms/Controls/WebViewHandler.cs b/src/Eto.Mac/Forms/Controls/WebViewHandler.cs
index 8e27ac25b1..343b8d88cb 100644
--- a/src/Eto.Mac/Forms/Controls/WebViewHandler.cs
+++ b/src/Eto.Mac/Forms/Controls/WebViewHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Linq;
-using Eto.Drawing;
-using System.Threading.Tasks;
 #if MONOMAC
 using wk = MonoMac.WebKit;
 using IWebOpenPanelResultListener = MonoMac.WebKit.WebOpenPanelResultListener;
diff --git a/src/Eto.Mac/Forms/CursorHandler.cs b/src/Eto.Mac/Forms/CursorHandler.cs
index 7089151b01..6eb8765f72 100644
--- a/src/Eto.Mac/Forms/CursorHandler.cs
+++ b/src/Eto.Mac/Forms/CursorHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using System.IO;
-
 namespace Eto.Mac.Forms
 {
 	public class CursorHandler : WidgetHandler<NSCursor, Cursor>, Cursor.IHandler
diff --git a/src/Eto.Mac/Forms/DataObjectHandler.cs b/src/Eto.Mac/Forms/DataObjectHandler.cs
index 629c8f0ce6..d6b5b94678 100644
--- a/src/Eto.Mac/Forms/DataObjectHandler.cs
+++ b/src/Eto.Mac/Forms/DataObjectHandler.cs
@@ -1,12 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using System.IO;
-using Eto.Mac.Drawing;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Collections.Generic;
-
+using Eto.Mac.Drawing;
 namespace Eto.Mac.Forms
 {
 	public class DataFormatsHandler : DataFormats.IHandler
diff --git a/src/Eto.Mac/Forms/DialogHandler.cs b/src/Eto.Mac/Forms/DialogHandler.cs
index a7a7751e89..91e73f38f1 100644
--- a/src/Eto.Mac/Forms/DialogHandler.cs
+++ b/src/Eto.Mac/Forms/DialogHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using System.ComponentModel;
-using System.Linq;
-using System.Threading.Tasks;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Mac.Forms
 {
 	public class DialogHandler : MacWindow<EtoWindow, Dialog, Dialog.ICallback>, Dialog.IHandler
diff --git a/src/Eto.Mac/Forms/EtoDragSource.cs b/src/Eto.Mac/Forms/EtoDragSource.cs
index bc9080ef42..0147c0bcf8 100644
--- a/src/Eto.Mac/Forms/EtoDragSource.cs
+++ b/src/Eto.Mac/Forms/EtoDragSource.cs
@@ -1,7 +1,4 @@
-using System;
-using Eto.Forms;
-
-namespace Eto.Mac.Forms
+namespace Eto.Mac.Forms
 {
 	class EtoDragSource : NSDraggingSource
 	{
diff --git a/src/Eto.Mac/Forms/FloatingFormHandler.cs b/src/Eto.Mac/Forms/FloatingFormHandler.cs
index 172549fbce..4500626a3a 100644
--- a/src/Eto.Mac/Forms/FloatingFormHandler.cs
+++ b/src/Eto.Mac/Forms/FloatingFormHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.Mac.Forms
 {
 	public class FloatingFormHandler : FormHandler<NSPanel>, FloatingForm.IHandler
diff --git a/src/Eto.Mac/Forms/FontDialogHandler.cs b/src/Eto.Mac/Forms/FontDialogHandler.cs
index a39e1bb4a4..e08a1196ee 100644
--- a/src/Eto.Mac/Forms/FontDialogHandler.cs
+++ b/src/Eto.Mac/Forms/FontDialogHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Mac.Drawing;
 
 namespace Eto.Mac.Forms
diff --git a/src/Eto.Mac/Forms/FormHandler.cs b/src/Eto.Mac/Forms/FormHandler.cs
index 5cae5012b2..6430494f24 100644
--- a/src/Eto.Mac/Forms/FormHandler.cs
+++ b/src/Eto.Mac/Forms/FormHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Forms;
-
-
-
 namespace Eto.Mac.Forms
 {
 	public class FormHandler : FormHandler<NSWindow>
diff --git a/src/Eto.Mac/Forms/KeyboardHandler.cs b/src/Eto.Mac/Forms/KeyboardHandler.cs
index f93476e923..c9d56e18d9 100644
--- a/src/Eto.Mac/Forms/KeyboardHandler.cs
+++ b/src/Eto.Mac/Forms/KeyboardHandler.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Forms;
-using System.Collections.Generic;
-
-namespace Eto.Mac.Forms
+namespace Eto.Mac.Forms
 {
 	public class KeyboardHandler : Keyboard.IHandler
 	{
diff --git a/src/Eto.Mac/Forms/MacBase.cs b/src/Eto.Mac/Forms/MacBase.cs
index c61a263e79..28f2818a8c 100644
--- a/src/Eto.Mac/Forms/MacBase.cs
+++ b/src/Eto.Mac/Forms/MacBase.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Mac.Forms
 {
 	public interface IMacControlHandler
diff --git a/src/Eto.Mac/Forms/MacCommon.cs b/src/Eto.Mac/Forms/MacCommon.cs
index 38d1736a1a..ed58fe0295 100644
--- a/src/Eto.Mac/Forms/MacCommon.cs
+++ b/src/Eto.Mac/Forms/MacCommon.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Mac.Forms
 {
 	public static class MacCommon
diff --git a/src/Eto.Mac/Forms/MacContainer.cs b/src/Eto.Mac/Forms/MacContainer.cs
index 727a9412db..c7bc740411 100644
--- a/src/Eto.Mac/Forms/MacContainer.cs
+++ b/src/Eto.Mac/Forms/MacContainer.cs
@@ -1,10 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Linq;
-using Eto.Drawing;
-using System.Collections.Generic;
-
-
 #if IOS
 using Foundation;
 using CoreGraphics;
diff --git a/src/Eto.Mac/Forms/MacControlExtensions.cs b/src/Eto.Mac/Forms/MacControlExtensions.cs
index 4c8be9c039..114e5bfdfe 100644
--- a/src/Eto.Mac/Forms/MacControlExtensions.cs
+++ b/src/Eto.Mac/Forms/MacControlExtensions.cs
@@ -1,8 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-using System;
-using System.Text.RegularExpressions;
-
 namespace Eto.Mac.Forms
 {
 	public static class MacControlExtensions
diff --git a/src/Eto.Mac/Forms/MacFieldEditor.cs b/src/Eto.Mac/Forms/MacFieldEditor.cs
index 84c4ec7e5b..cf86d16c1d 100644
--- a/src/Eto.Mac/Forms/MacFieldEditor.cs
+++ b/src/Eto.Mac/Forms/MacFieldEditor.cs
@@ -1,5 +1,3 @@
-using System;
-using Eto.Forms;
 using Eto.Mac.Forms.Controls;
 
 
diff --git a/src/Eto.Mac/Forms/MacFileDialog.cs b/src/Eto.Mac/Forms/MacFileDialog.cs
index c21346339d..0dd3a3ca8f 100644
--- a/src/Eto.Mac/Forms/MacFileDialog.cs
+++ b/src/Eto.Mac/Forms/MacFileDialog.cs
@@ -1,11 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-
-
 namespace Eto.Mac.Forms
 {
 	interface IMacFileDialog
diff --git a/src/Eto.Mac/Forms/MacModal.cs b/src/Eto.Mac/Forms/MacModal.cs
index 965bb5070e..13e2859d6d 100644
--- a/src/Eto.Mac/Forms/MacModal.cs
+++ b/src/Eto.Mac/Forms/MacModal.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.Mac.Forms
 {
 	public class ModalEventArgs : EventArgs
@@ -99,7 +96,7 @@ protected virtual bool RunSessionInternal()
 			var result = (int)app.RunModalSession(Session);
 
 			// Give the main loop some time:
-#if MACOS_NET
+#if MACOS_NET || XAMMAC
 			NSRunLoop.Current.RunUntil(NSRunLoopMode.Default, NSDate.DistantFuture);
 #else
 			NSRunLoop.Current.RunUntil(NSRunLoop.NSDefaultRunLoopMode, NSDate.DistantFuture);
diff --git a/src/Eto.Mac/Forms/MacObject.cs b/src/Eto.Mac/Forms/MacObject.cs
index 5f8960f23c..6ab90ddda4 100644
--- a/src/Eto.Mac/Forms/MacObject.cs
+++ b/src/Eto.Mac/Forms/MacObject.cs
@@ -1,5 +1,3 @@
-using System;
-
 
 #if IOS
 using Foundation;
diff --git a/src/Eto.Mac/Forms/MacPanel.cs b/src/Eto.Mac/Forms/MacPanel.cs
index 39dff35bb8..d67a0c03ba 100644
--- a/src/Eto.Mac/Forms/MacPanel.cs
+++ b/src/Eto.Mac/Forms/MacPanel.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
-
 #if IOS
 using NSResponder = UIKit.UIResponder;
 using NSView = UIKit.UIView;
diff --git a/src/Eto.Mac/Forms/MacView.cs b/src/Eto.Mac/Forms/MacView.cs
index cad3ede56a..b9a3b5b6da 100644
--- a/src/Eto.Mac/Forms/MacView.cs
+++ b/src/Eto.Mac/Forms/MacView.cs
@@ -1,12 +1,5 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.Mac.Forms.Controls;
-using System.Collections.Generic;
 using Eto.Mac.Forms.Printing;
-using System.Linq;
-using System.Runtime.InteropServices;
-
 #if MACOS_NET
 using NSDraggingInfo = AppKit.INSDraggingInfo;
 #endif
diff --git a/src/Eto.Mac/Forms/MacViewTextInput.cs b/src/Eto.Mac/Forms/MacViewTextInput.cs
index c434930d49..16f3cd23d1 100644
--- a/src/Eto.Mac/Forms/MacViewTextInput.cs
+++ b/src/Eto.Mac/Forms/MacViewTextInput.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Eto.Forms;
-using System.Diagnostics;
-
 namespace Eto.Mac.Forms
 {
 	class MacViewTextInput
diff --git a/src/Eto.Mac/Forms/MacWindow.cs b/src/Eto.Mac/Forms/MacWindow.cs
index d5ec293b5f..ad4ddc3597 100644
--- a/src/Eto.Mac/Forms/MacWindow.cs
+++ b/src/Eto.Mac/Forms/MacWindow.cs
@@ -1,10 +1,3 @@
-using System;
-using System.ComponentModel;
-using System.Linq;
-using Eto.Drawing;
-using Eto.Forms;
-using System.Threading;
-
 namespace Eto.Mac.Forms
 {
 	public class EtoWindow : NSWindow, IMacControl
diff --git a/src/Eto.Mac/Forms/MemoryDataObjectHandler.cs b/src/Eto.Mac/Forms/MemoryDataObjectHandler.cs
index 39996cc174..1a77a40946 100644
--- a/src/Eto.Mac/Forms/MemoryDataObjectHandler.cs
+++ b/src/Eto.Mac/Forms/MemoryDataObjectHandler.cs
@@ -1,11 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using Eto.Mac.Drawing;
-using System.Linq;
-using System.Collections.Generic;
-
-
+using Eto.Mac.Drawing;
 namespace Eto.Mac.Forms
 {
 	public class MemoryDataObjectHandler : WidgetHandler<Dictionary<string, MemoryDataObjectHandler.BaseItem>, DataObject, DataObject.ICallback>, DataObject.IHandler, IDataObject, IDataObjectHandler
diff --git a/src/Eto.Mac/Forms/Menu/ButtonMenuItemHandler.cs b/src/Eto.Mac/Forms/Menu/ButtonMenuItemHandler.cs
index 5132adef91..ed53e8cf5a 100644
--- a/src/Eto.Mac/Forms/Menu/ButtonMenuItemHandler.cs
+++ b/src/Eto.Mac/Forms/Menu/ButtonMenuItemHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.Mac.Forms.Actions;
 
 namespace Eto.Mac.Forms.Menu
diff --git a/src/Eto.Mac/Forms/Menu/CheckMenuItemHandler.cs b/src/Eto.Mac/Forms/Menu/CheckMenuItemHandler.cs
index fe764b734f..f2b69c8e61 100644
--- a/src/Eto.Mac/Forms/Menu/CheckMenuItemHandler.cs
+++ b/src/Eto.Mac/Forms/Menu/CheckMenuItemHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.Mac.Forms.Menu
 {
 	public class CheckMenuItemHandler : MenuHandler<NSMenuItem, CheckMenuItem, CheckMenuItem.ICallback>, CheckMenuItem.IHandler, IMenuActionHandler
diff --git a/src/Eto.Mac/Forms/Menu/ContextMenuHandler.cs b/src/Eto.Mac/Forms/Menu/ContextMenuHandler.cs
index e99f6293aa..a7ed5f68d2 100644
--- a/src/Eto.Mac/Forms/Menu/ContextMenuHandler.cs
+++ b/src/Eto.Mac/Forms/Menu/ContextMenuHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
-
 namespace Eto.Mac.Forms.Menu
 {
 	class ContextHandler : NSMenuDelegate
diff --git a/src/Eto.Mac/Forms/Menu/MenuActionHandler.cs b/src/Eto.Mac/Forms/Menu/MenuActionHandler.cs
index fdaf788be0..a130f1b6ae 100644
--- a/src/Eto.Mac/Forms/Menu/MenuActionHandler.cs
+++ b/src/Eto.Mac/Forms/Menu/MenuActionHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.Mac.Forms.Menu
 {
 	public interface IMenuActionHandler
diff --git a/src/Eto.Mac/Forms/Menu/MenuBarHandler.cs b/src/Eto.Mac/Forms/Menu/MenuBarHandler.cs
index 468ded18ad..68aa4f817b 100644
--- a/src/Eto.Mac/Forms/Menu/MenuBarHandler.cs
+++ b/src/Eto.Mac/Forms/Menu/MenuBarHandler.cs
@@ -1,12 +1,5 @@
-using Eto.Forms;
-using System.Collections.Generic;
 using Eto.Mac.Forms.Actions;
-using System.Linq;
 using Eto.Mac.Forms;
-using System.Collections.ObjectModel;
-using System;
-
-
 namespace Eto.Mac.Forms.Menu
 {
 	public class MenuBarHandler : WidgetHandler<NSMenu, MenuBar>, MenuBar.IHandler
diff --git a/src/Eto.Mac/Forms/Menu/MenuHandler.cs b/src/Eto.Mac/Forms/Menu/MenuHandler.cs
index acb580ad92..32c9bd4234 100644
--- a/src/Eto.Mac/Forms/Menu/MenuHandler.cs
+++ b/src/Eto.Mac/Forms/Menu/MenuHandler.cs
@@ -1,8 +1,4 @@
-using Eto.Forms;
 using Eto.Mac.Forms.Actions;
-using System;
-
-
 namespace Eto.Mac.Forms.Menu
 {
 	public interface IMenuHandler
diff --git a/src/Eto.Mac/Forms/Menu/RadioMenuItemHandler.cs b/src/Eto.Mac/Forms/Menu/RadioMenuItemHandler.cs
index 327813dfbb..46fac1254b 100644
--- a/src/Eto.Mac/Forms/Menu/RadioMenuItemHandler.cs
+++ b/src/Eto.Mac/Forms/Menu/RadioMenuItemHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.Mac.Forms.Menu
 {
 	public class RadioMenuItemHandler : MenuHandler<NSMenuItem, RadioMenuItem, RadioMenuItem.ICallback>, RadioMenuItem.IHandler, IMenuActionHandler
diff --git a/src/Eto.Mac/Forms/Menu/SeparatorMenuItem.cs b/src/Eto.Mac/Forms/Menu/SeparatorMenuItem.cs
index 9a49c892b2..406771b17b 100644
--- a/src/Eto.Mac/Forms/Menu/SeparatorMenuItem.cs
+++ b/src/Eto.Mac/Forms/Menu/SeparatorMenuItem.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.Mac.Forms.Menu
 {
 	public class SeparatorMenuItemHandler : MenuHandler<NSMenuItem, SeparatorMenuItem, SeparatorMenuItem.ICallback>, SeparatorMenuItem.IHandler
diff --git a/src/Eto.Mac/Forms/Menu/SubMenuItemHandler.cs b/src/Eto.Mac/Forms/Menu/SubMenuItemHandler.cs
index 1aba6a419c..458464f41e 100644
--- a/src/Eto.Mac/Forms/Menu/SubMenuItemHandler.cs
+++ b/src/Eto.Mac/Forms/Menu/SubMenuItemHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.Mac.Forms.Menu
 {
 	class EtoSubMenuDelegate : NSMenuDelegate
diff --git a/src/Eto.Mac/Forms/MessageBoxHandler.cs b/src/Eto.Mac/Forms/MessageBoxHandler.cs
index 2e14dff730..503490daae 100644
--- a/src/Eto.Mac/Forms/MessageBoxHandler.cs
+++ b/src/Eto.Mac/Forms/MessageBoxHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.Mac.Forms
 {
 	public class MessageBoxHandler : MessageBox.IHandler
diff --git a/src/Eto.Mac/Forms/MouseHandler.cs b/src/Eto.Mac/Forms/MouseHandler.cs
index 4109aedc26..2939928daa 100644
--- a/src/Eto.Mac/Forms/MouseHandler.cs
+++ b/src/Eto.Mac/Forms/MouseHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Runtime.InteropServices;
-
 namespace Eto.Mac.Forms
 {
 	public class MouseHandler : Mouse.IHandler
diff --git a/src/Eto.Mac/Forms/NativeFormHandler.cs b/src/Eto.Mac/Forms/NativeFormHandler.cs
index fe49d9ae7a..d801406fbc 100644
--- a/src/Eto.Mac/Forms/NativeFormHandler.cs
+++ b/src/Eto.Mac/Forms/NativeFormHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Mac.Forms
 {
 	public class NativeFormHandler : FormHandler
diff --git a/src/Eto.Mac/Forms/NotificationHandler.cs b/src/Eto.Mac/Forms/NotificationHandler.cs
index 96d296c594..d0bea7216b 100644
--- a/src/Eto.Mac/Forms/NotificationHandler.cs
+++ b/src/Eto.Mac/Forms/NotificationHandler.cs
@@ -1,11 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Linq;
-
-
-namespace Eto.Mac.Forms
+namespace Eto.Mac.Forms
 {
 	public class NotificationHandler : WidgetHandler<NSUserNotification, Notification, Notification.ICallback>, Notification.IHandler
 	{
diff --git a/src/Eto.Mac/Forms/OpenFileDialogHandler.cs b/src/Eto.Mac/Forms/OpenFileDialogHandler.cs
index b50b42d1e8..413127094c 100644
--- a/src/Eto.Mac/Forms/OpenFileDialogHandler.cs
+++ b/src/Eto.Mac/Forms/OpenFileDialogHandler.cs
@@ -1,9 +1,3 @@
-using System.Linq;
-using Eto.Forms;
-using System.Collections.Generic;
-
-
-
 namespace Eto.Mac.Forms
 {
 	public class OpenFileDialogHandler : MacFileDialog<NSOpenPanel, OpenFileDialog>, OpenFileDialog.IHandler
diff --git a/src/Eto.Mac/Forms/OpenWithDialogHandler.cs b/src/Eto.Mac/Forms/OpenWithDialogHandler.cs
index f44ffc9217..ee4619ea45 100644
--- a/src/Eto.Mac/Forms/OpenWithDialogHandler.cs
+++ b/src/Eto.Mac/Forms/OpenWithDialogHandler.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Diagnostics;
-using Eto.Forms;
-
-
-
-namespace Eto.Mac.Forms
+namespace Eto.Mac.Forms
 {
 	public class OpenWithDialogHandler : WidgetHandler<NSOpenPanel, OpenWithDialog, OpenWithDialog.ICallback>, OpenWithDialog.IHandler
 	{
diff --git a/src/Eto.Mac/Forms/PixelLayoutHandler.cs b/src/Eto.Mac/Forms/PixelLayoutHandler.cs
index 808cd3145d..b36720cc4f 100644
--- a/src/Eto.Mac/Forms/PixelLayoutHandler.cs
+++ b/src/Eto.Mac/Forms/PixelLayoutHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Linq;
 using Eto.Mac.Forms.Controls;
 
 
diff --git a/src/Eto.Mac/Forms/Printing/PrintDialogHandler.cs b/src/Eto.Mac/Forms/Printing/PrintDialogHandler.cs
index a2b36d6768..22b6280073 100644
--- a/src/Eto.Mac/Forms/Printing/PrintDialogHandler.cs
+++ b/src/Eto.Mac/Forms/Printing/PrintDialogHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.Mac.Forms.Printing
 {
 	public class PrintDialogHandler : WidgetHandler<NSPrintPanel, CommonDialog>, PrintDialog.IHandler, PrintPreviewDialog.IHandler
diff --git a/src/Eto.Mac/Forms/Printing/PrintDocumentHandler.cs b/src/Eto.Mac/Forms/Printing/PrintDocumentHandler.cs
index 31c0d2dc56..a7465f4989 100644
--- a/src/Eto.Mac/Forms/Printing/PrintDocumentHandler.cs
+++ b/src/Eto.Mac/Forms/Printing/PrintDocumentHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Mac.Drawing;
 
 namespace Eto.Mac.Forms.Printing
diff --git a/src/Eto.Mac/Forms/Printing/PrintSettingsHandler.cs b/src/Eto.Mac/Forms/Printing/PrintSettingsHandler.cs
index 602c0e2be7..3bd8da5924 100644
--- a/src/Eto.Mac/Forms/Printing/PrintSettingsHandler.cs
+++ b/src/Eto.Mac/Forms/Printing/PrintSettingsHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.Mac.Forms.Printing
 {
 	public class PrintSettingsHandler : WidgetHandler<NSPrintInfo, PrintSettings>, PrintSettings.IHandler
diff --git a/src/Eto.Mac/Forms/SaveFileDialogHandler.cs b/src/Eto.Mac/Forms/SaveFileDialogHandler.cs
index 38119a2b57..18aa72e0a5 100644
--- a/src/Eto.Mac/Forms/SaveFileDialogHandler.cs
+++ b/src/Eto.Mac/Forms/SaveFileDialogHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using System.IO;
-using Eto.Forms;
-
 namespace Eto.Mac.Forms
 {
 	public class SaveFileDialogHandler : MacFileDialog<NSSavePanel, SaveFileDialog>, SaveFileDialog.IHandler
diff --git a/src/Eto.Mac/Forms/ScreenHandler.cs b/src/Eto.Mac/Forms/ScreenHandler.cs
index 95b7498409..396e4e7ead 100644
--- a/src/Eto.Mac/Forms/ScreenHandler.cs
+++ b/src/Eto.Mac/Forms/ScreenHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Runtime.InteropServices;
 using Eto.Mac.Drawing;
 
 namespace Eto.Mac.Forms
diff --git a/src/Eto.Mac/Forms/ScreensHandler.cs b/src/Eto.Mac/Forms/ScreensHandler.cs
index d55e80d84a..fde8b6fb48 100644
--- a/src/Eto.Mac/Forms/ScreensHandler.cs
+++ b/src/Eto.Mac/Forms/ScreensHandler.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using System.Collections.Generic;
-
 namespace Eto.Mac.Forms
 {
 	public class ScreensHandler : Screen.IScreensHandler
diff --git a/src/Eto.Mac/Forms/SelectFolderDialogHandler.cs b/src/Eto.Mac/Forms/SelectFolderDialogHandler.cs
index 489e54f970..24e3c0da89 100644
--- a/src/Eto.Mac/Forms/SelectFolderDialogHandler.cs
+++ b/src/Eto.Mac/Forms/SelectFolderDialogHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.Mac.Forms
 {
 	public class SelectFolderDialogHandler : WidgetHandler<NSOpenPanel, SelectFolderDialog>, SelectFolderDialog.IHandler
diff --git a/src/Eto.Mac/Forms/TableLayoutHandler.cs b/src/Eto.Mac/Forms/TableLayoutHandler.cs
index a38c3b9825..b1b22b5f15 100644
--- a/src/Eto.Mac/Forms/TableLayoutHandler.cs
+++ b/src/Eto.Mac/Forms/TableLayoutHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Linq;
-using Eto.Drawing;
-
-
 #if IOS
 using UIKit;
 using CoreGraphics;
diff --git a/src/Eto.Mac/Forms/TaskbarHandler.cs b/src/Eto.Mac/Forms/TaskbarHandler.cs
index 3d96547fe6..ba807cbb40 100644
--- a/src/Eto.Mac/Forms/TaskbarHandler.cs
+++ b/src/Eto.Mac/Forms/TaskbarHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Diagnostics;
-using Eto.Forms;
-
 namespace Eto.Mac.Forms
 {
 	public class TaskbarHandler : Taskbar.IHandler
diff --git a/src/Eto.Mac/Forms/ToolBar/ButtonToolItemHandler.cs b/src/Eto.Mac/Forms/ToolBar/ButtonToolItemHandler.cs
index 5b32679f0b..d19aae041e 100644
--- a/src/Eto.Mac/Forms/ToolBar/ButtonToolItemHandler.cs
+++ b/src/Eto.Mac/Forms/ToolBar/ButtonToolItemHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.Mac.Forms.ToolBar
 {
 
diff --git a/src/Eto.Mac/Forms/ToolBar/CheckToolItemHandler.cs b/src/Eto.Mac/Forms/ToolBar/CheckToolItemHandler.cs
index ffd93ef347..736a0b5bb6 100644
--- a/src/Eto.Mac/Forms/ToolBar/CheckToolItemHandler.cs
+++ b/src/Eto.Mac/Forms/ToolBar/CheckToolItemHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.Mac.Forms.ToolBar
 {
 	public class CheckToolItemHandler : ToolItemHandler<NSToolbarItem, CheckToolItem>, CheckToolItem.IHandler
diff --git a/src/Eto.Mac/Forms/ToolBar/DropDownToolItemHandler.cs b/src/Eto.Mac/Forms/ToolBar/DropDownToolItemHandler.cs
index 7acdd4ffd8..bdb72616c1 100644
--- a/src/Eto.Mac/Forms/ToolBar/DropDownToolItemHandler.cs
+++ b/src/Eto.Mac/Forms/ToolBar/DropDownToolItemHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Mac.Forms.ToolBar
 {
 	public class DropDownToolItemHandler : ToolItemHandler<NSMenuToolbarItem, DropDownToolItem>, DropDownToolItem.IHandler
diff --git a/src/Eto.Mac/Forms/ToolBar/DropDownToolItemPreCatalinaHandler.cs b/src/Eto.Mac/Forms/ToolBar/DropDownToolItemPreCatalinaHandler.cs
index 52384111e7..8c8141d5c3 100644
--- a/src/Eto.Mac/Forms/ToolBar/DropDownToolItemPreCatalinaHandler.cs
+++ b/src/Eto.Mac/Forms/ToolBar/DropDownToolItemPreCatalinaHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.Mac.Forms.Controls;
 using Eto.Mac.Forms.Menu;
 
diff --git a/src/Eto.Mac/Forms/ToolBar/RadioToolItemHandler.cs b/src/Eto.Mac/Forms/ToolBar/RadioToolItemHandler.cs
index 44232b264a..df11928d79 100644
--- a/src/Eto.Mac/Forms/ToolBar/RadioToolItemHandler.cs
+++ b/src/Eto.Mac/Forms/ToolBar/RadioToolItemHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Linq;
-
 namespace Eto.Mac.Forms.ToolBar
 {
 	public class RadioToolItemHandler : ToolItemHandler<NSToolbarItem, RadioToolItem>, RadioToolItem.IHandler
diff --git a/src/Eto.Mac/Forms/ToolBar/SeparatorToolItemHandler.cs b/src/Eto.Mac/Forms/ToolBar/SeparatorToolItemHandler.cs
index dee4c387e3..612e472225 100644
--- a/src/Eto.Mac/Forms/ToolBar/SeparatorToolItemHandler.cs
+++ b/src/Eto.Mac/Forms/ToolBar/SeparatorToolItemHandler.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using System;
-using Eto.Drawing;
 using Eto.Mac.Drawing;
 
 namespace Eto.Mac.Forms.ToolBar
diff --git a/src/Eto.Mac/Forms/ToolBar/ToolBarHandler.cs b/src/Eto.Mac/Forms/ToolBar/ToolBarHandler.cs
index bb9e4d7640..bff1abca7d 100644
--- a/src/Eto.Mac/Forms/ToolBar/ToolBarHandler.cs
+++ b/src/Eto.Mac/Forms/ToolBar/ToolBarHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Linq;
-using System.Collections.Generic;
-using Eto.Drawing;
-
-
 namespace Eto.Mac.Forms.ToolBar
 {
 	public class ToolBarHandler : WidgetHandler<NSToolbar, Eto.Forms.ToolBar>, Eto.Forms.ToolBar.IHandler
@@ -33,11 +26,7 @@ public DividerToolbarItem(bool willBeInserted) : base(DividerIdentifier)
 				PaletteLabel = Application.Instance.Localize(this, "Divider");
 				MenuFormRepresentation = NSMenuItem.SeparatorItem;
 				if (supportsSeparatorColor)
-#if XAMMAC2
-					_color = NSColor.SeparatorColor.ToEto();
-#else
 					_color = NSColor.Separator.ToEto();
-#endif
 				else
 					_color = new Color(SystemColors.WindowBackground, 0.5f);
 			}
diff --git a/src/Eto.Mac/Forms/ToolBar/ToolItemHandler.cs b/src/Eto.Mac/Forms/ToolBar/ToolItemHandler.cs
index 6561ec5bcf..34daceb453 100644
--- a/src/Eto.Mac/Forms/ToolBar/ToolItemHandler.cs
+++ b/src/Eto.Mac/Forms/ToolBar/ToolItemHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Mac.Forms.Actions;
 
 namespace Eto.Mac.Forms.ToolBar
diff --git a/src/Eto.Mac/Forms/TrayIndicatorHandler.cs b/src/Eto.Mac/Forms/TrayIndicatorHandler.cs
index 4abb8c6938..a77f1b01b7 100644
--- a/src/Eto.Mac/Forms/TrayIndicatorHandler.cs
+++ b/src/Eto.Mac/Forms/TrayIndicatorHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
-
-namespace Eto.Mac.Forms
+namespace Eto.Mac.Forms
 {
 	public class TrayIndicatorHandler : WidgetHandler<NSStatusItem, TrayIndicator, TrayIndicator.ICallback>, TrayIndicator.IHandler
 	{
diff --git a/src/Eto.Mac/Forms/UITimerHandler.cs b/src/Eto.Mac/Forms/UITimerHandler.cs
index a58c091840..ed67e9e230 100644
--- a/src/Eto.Mac/Forms/UITimerHandler.cs
+++ b/src/Eto.Mac/Forms/UITimerHandler.cs
@@ -1,5 +1,3 @@
-using System;
-using Eto.Forms;
 #if IOS
 using Foundation;
 #else
diff --git a/src/Eto.Mac/Forms/WindowHandler.cs b/src/Eto.Mac/Forms/WindowHandler.cs
index 8747708b3b..cd4b420885 100644
--- a/src/Eto.Mac/Forms/WindowHandler.cs
+++ b/src/Eto.Mac/Forms/WindowHandler.cs
@@ -1,7 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-using System.Linq;
-
 namespace Eto.Mac.Forms
 {
 	public class WindowHandler : Window.IWindowHandler
diff --git a/src/Eto.Mac/IO/SystemIconsHandler.cs b/src/Eto.Mac/IO/SystemIconsHandler.cs
index 7baea88fa6..9b17b85925 100644
--- a/src/Eto.Mac/IO/SystemIconsHandler.cs
+++ b/src/Eto.Mac/IO/SystemIconsHandler.cs
@@ -1,11 +1,5 @@
 using Eto.IO;
-using Eto.Drawing;
-using System.IO;
 using Eto.Mac.Drawing;
-using System;
-
-
-
 namespace Eto.Mac.IO
 {
 	public class SystemIconsHandler : SystemIcons.IHandler
diff --git a/src/Eto.Mac/InvokeHelper.cs b/src/Eto.Mac/InvokeHelper.cs
index 9fb86c881d..3b98be7b28 100644
--- a/src/Eto.Mac/InvokeHelper.cs
+++ b/src/Eto.Mac/InvokeHelper.cs
@@ -1,4 +1,3 @@
-using System;
 namespace Eto.Mac
 {
 		class InvokeHelper
diff --git a/src/Eto.Mac/KeyMap.cs b/src/Eto.Mac/KeyMap.cs
index db5964b8bd..64360420a4 100644
--- a/src/Eto.Mac/KeyMap.cs
+++ b/src/Eto.Mac/KeyMap.cs
@@ -1,10 +1,4 @@
-using System.Collections.Generic;
-using Eto.Forms;
-using System.Diagnostics;
-
-
-
-namespace Eto.Mac
+namespace Eto.Mac
 {
 	public static class KeyMap
 	{
diff --git a/src/Eto.Mac/Mac64Extensions.cs b/src/Eto.Mac/Mac64Extensions.cs
index 2d610c9a83..846c6489e2 100644
--- a/src/Eto.Mac/Mac64Extensions.cs
+++ b/src/Eto.Mac/Mac64Extensions.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Runtime.InteropServices;
-
 #if IOS
 namespace Eto.iOS
 #else
diff --git a/src/Eto.Mac/MacConversions.cs b/src/Eto.Mac/MacConversions.cs
index 8151c8212b..801395dd37 100644
--- a/src/Eto.Mac/MacConversions.cs
+++ b/src/Eto.Mac/MacConversions.cs
@@ -1,10 +1,6 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.Mac.Forms;
 using Eto.Mac.Drawing;
 using Eto.Mac.Forms.Printing;
-using System.Linq;
 using Eto.Mac.Forms.Menu;
 
 
diff --git a/src/Eto.Mac/MacConversions.ns.cs b/src/Eto.Mac/MacConversions.ns.cs
index 57f3eeaac5..bbf5f2366a 100644
--- a/src/Eto.Mac/MacConversions.ns.cs
+++ b/src/Eto.Mac/MacConversions.ns.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Mac
 {
 	public static partial class MacConversions
diff --git a/src/Eto.Mac/MacExtensions.cs b/src/Eto.Mac/MacExtensions.cs
index 589063add1..135c04b12a 100644
--- a/src/Eto.Mac/MacExtensions.cs
+++ b/src/Eto.Mac/MacExtensions.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Runtime.InteropServices;
-
 namespace Eto.Mac
 {
 	/// <summary>
diff --git a/src/Eto.Mac/MacHelpers.cs b/src/Eto.Mac/MacHelpers.cs
index 6806ebb554..6f89c7258d 100644
--- a/src/Eto.Mac/MacHelpers.cs
+++ b/src/Eto.Mac/MacHelpers.cs
@@ -1,10 +1,6 @@
-using System;
-using Eto.Forms;
 using Eto.Mac;
 using Eto.Mac.Forms;
 using Eto.Mac.Forms.Controls;
-using Eto.Drawing;
-
 namespace Eto.Forms
 {
 	public static class
diff --git a/src/Eto.Mac/MacVersion.cs b/src/Eto.Mac/MacVersion.cs
index 0e5b882efe..516a4a1e73 100644
--- a/src/Eto.Mac/MacVersion.cs
+++ b/src/Eto.Mac/MacVersion.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Runtime.InteropServices;
-
 namespace Eto.Mac
 {
 	static class MacVersion
diff --git a/src/Eto.Mac/Messaging.cs b/src/Eto.Mac/Messaging.cs
index 253cb6bd40..d820ac12cc 100644
--- a/src/Eto.Mac/Messaging.cs
+++ b/src/Eto.Mac/Messaging.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Runtime.InteropServices;
-
-#if IOS
+#if IOS
 namespace Eto.iOS
 #else
 namespace Eto.Mac
diff --git a/src/Eto.Mac/NSImageExtensions.cs b/src/Eto.Mac/NSImageExtensions.cs
index 47f0959e72..ba357f984f 100644
--- a/src/Eto.Mac/NSImageExtensions.cs
+++ b/src/Eto.Mac/NSImageExtensions.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-
-
 namespace Eto.Mac
 {
 	public static class NSImageExtensions
diff --git a/src/Eto.Mac/ObjCExtensions.cs b/src/Eto.Mac/ObjCExtensions.cs
index efc7be7b86..f5bfedac71 100644
--- a/src/Eto.Mac/ObjCExtensions.cs
+++ b/src/Eto.Mac/ObjCExtensions.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Runtime.InteropServices;
-
 namespace Eto.Mac
 {
 	public static class ObjCExtensions
diff --git a/src/Eto.Mac/Platform.cs b/src/Eto.Mac/Platform.cs
index d5827ee5e4..54a27dd022 100644
--- a/src/Eto.Mac/Platform.cs
+++ b/src/Eto.Mac/Platform.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Reflection;
-using System.IO;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.IO;
 using Eto.Mac.Drawing;
 using Eto.Mac.IO;
@@ -274,7 +269,7 @@ public static void AddTo(Eto.Platform p)
 
 			// General
 			p.Add<EtoEnvironment.IHandler>(() => new EtoEnvironmentHandler());
-			p.Add<Thread.IHandler>(() => new ThreadHandler());
+			p.Add<Eto.Threading.Thread.IHandler>(() => new ThreadHandler());
 		}
 
 		public override IDisposable ThreadStart()
diff --git a/src/Eto.Mac/SDConversions.cs b/src/Eto.Mac/SDConversions.cs
index 72eb870129..1cd213ced4 100644
--- a/src/Eto.Mac/SDConversions.cs
+++ b/src/Eto.Mac/SDConversions.cs
@@ -1,8 +1,4 @@
 #if !UNIFIED
-using System;
-using sd = System.Drawing;
-using Eto.Drawing;
-
 namespace Eto
 {
 	public static partial class Conversions
diff --git a/src/Eto.Mac/Threading/ThreadHandler.cs b/src/Eto.Mac/Threading/ThreadHandler.cs
index 9cc5ca0195..bc2ec4964d 100644
--- a/src/Eto.Mac/Threading/ThreadHandler.cs
+++ b/src/Eto.Mac/Threading/ThreadHandler.cs
@@ -1,5 +1,5 @@
-using System;
 using Eto.Threading;
+using Thread = Eto.Threading.Thread;
 
 #if OSX
 
diff --git a/src/Eto.Serialization.Json/Converters/DelegateConverter.cs b/src/Eto.Serialization.Json/Converters/DelegateConverter.cs
index 3013a11cf2..dd5fbb3dd5 100644
--- a/src/Eto.Serialization.Json/Converters/DelegateConverter.cs
+++ b/src/Eto.Serialization.Json/Converters/DelegateConverter.cs
@@ -1,10 +1,5 @@
-using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using System.Reflection;
-using System.Runtime.Serialization;
-using System.Linq;
-
 namespace Eto.Serialization.Json.Converters
 {
 	public class DelegateConverter : JsonConverter
diff --git a/src/Eto.Serialization.Json/Converters/DynamicLayoutConverter.cs b/src/Eto.Serialization.Json/Converters/DynamicLayoutConverter.cs
index 49e463de3f..af5ad17886 100644
--- a/src/Eto.Serialization.Json/Converters/DynamicLayoutConverter.cs
+++ b/src/Eto.Serialization.Json/Converters/DynamicLayoutConverter.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Globalization;
-using System.Reflection;
-using Eto.Forms;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json;
 
diff --git a/src/Eto.Serialization.Json/Converters/FontConverter.cs b/src/Eto.Serialization.Json/Converters/FontConverter.cs
index bf3114e33a..f27ad1ba94 100644
--- a/src/Eto.Serialization.Json/Converters/FontConverter.cs
+++ b/src/Eto.Serialization.Json/Converters/FontConverter.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Globalization;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Eto.Drawing;
-using System.Linq;
-
 namespace Eto.Serialization.Json.Converters
 {
 	public class FontConverter : TypeConverterConverter
diff --git a/src/Eto.Serialization.Json/Converters/ListItemConverter.cs b/src/Eto.Serialization.Json/Converters/ListItemConverter.cs
index e971c183ff..e0cc9bd9a8 100644
--- a/src/Eto.Serialization.Json/Converters/ListItemConverter.cs
+++ b/src/Eto.Serialization.Json/Converters/ListItemConverter.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Globalization;
-using System.Reflection;
-using Eto.Forms;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json;
 
diff --git a/src/Eto.Serialization.Json/Converters/NameConverter.cs b/src/Eto.Serialization.Json/Converters/NameConverter.cs
index f8e69d6566..b4ef0d40ae 100644
--- a/src/Eto.Serialization.Json/Converters/NameConverter.cs
+++ b/src/Eto.Serialization.Json/Converters/NameConverter.cs
@@ -1,10 +1,6 @@
-using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using System.Reflection;
 using Newtonsoft.Json.Serialization;
-using System.Linq;
-
 namespace Eto.Serialization.Json.Converters
 {
 	public class NameConverter : JsonConverter
diff --git a/src/Eto.Serialization.Json/Converters/PropertyStoreConverter.cs b/src/Eto.Serialization.Json/Converters/PropertyStoreConverter.cs
index b74b5c4753..ff4dd886e0 100644
--- a/src/Eto.Serialization.Json/Converters/PropertyStoreConverter.cs
+++ b/src/Eto.Serialization.Json/Converters/PropertyStoreConverter.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Reflection;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
diff --git a/src/Eto.Serialization.Json/Converters/StackLayoutConverter.cs b/src/Eto.Serialization.Json/Converters/StackLayoutConverter.cs
index 282a6cd239..181077676f 100644
--- a/src/Eto.Serialization.Json/Converters/StackLayoutConverter.cs
+++ b/src/Eto.Serialization.Json/Converters/StackLayoutConverter.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Globalization;
-using System.Reflection;
-using Eto.Forms;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json;
 
diff --git a/src/Eto.Serialization.Json/Converters/TableLayoutConverter.cs b/src/Eto.Serialization.Json/Converters/TableLayoutConverter.cs
index 2d58b596bd..c5b6e1a5ca 100644
--- a/src/Eto.Serialization.Json/Converters/TableLayoutConverter.cs
+++ b/src/Eto.Serialization.Json/Converters/TableLayoutConverter.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Globalization;
-using System.Reflection;
-using Eto.Forms;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json;
 
diff --git a/src/Eto.Serialization.Json/Converters/TypeConverterConverter.cs b/src/Eto.Serialization.Json/Converters/TypeConverterConverter.cs
index 0b64bad177..63f8b57b25 100644
--- a/src/Eto.Serialization.Json/Converters/TypeConverterConverter.cs
+++ b/src/Eto.Serialization.Json/Converters/TypeConverterConverter.cs
@@ -1,8 +1,4 @@
-using System;
 using Newtonsoft.Json;
-using System.Reflection;
-using System.Collections.Generic;
-using sc = System.ComponentModel;
 using Newtonsoft.Json.Linq;
 
 namespace Eto.Serialization.Json.Converters
diff --git a/src/Eto.Serialization.Json/DefaultNamespaceManager.cs b/src/Eto.Serialization.Json/DefaultNamespaceManager.cs
index 3e82eaa866..110c422ec0 100644
--- a/src/Eto.Serialization.Json/DefaultNamespaceManager.cs
+++ b/src/Eto.Serialization.Json/DefaultNamespaceManager.cs
@@ -1,5 +1,3 @@
-using System.Reflection;
-
 namespace Eto.Serialization.Json
 {
 	public class DefaultNamespaceManager : NamespaceManager
diff --git a/src/Eto.Serialization.Json/EtoBinder.cs b/src/Eto.Serialization.Json/EtoBinder.cs
index ff17774b1f..b1d0f83579 100644
--- a/src/Eto.Serialization.Json/EtoBinder.cs
+++ b/src/Eto.Serialization.Json/EtoBinder.cs
@@ -1,4 +1,3 @@
-using System;
 using Newtonsoft.Json.Serialization;
 
 namespace Eto.Serialization.Json
diff --git a/src/Eto.Serialization.Json/EtoContractResolver.cs b/src/Eto.Serialization.Json/EtoContractResolver.cs
index ef12a93529..e8eeb8a347 100644
--- a/src/Eto.Serialization.Json/EtoContractResolver.cs
+++ b/src/Eto.Serialization.Json/EtoContractResolver.cs
@@ -1,9 +1,5 @@
-using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
-using System.Reflection;
-using System.Collections.Generic;
-using System.Linq;
 using Eto.Serialization.Json.Converters;
 
 namespace Eto.Serialization.Json
diff --git a/src/Eto.Serialization.Json/EventValueProvider.cs b/src/Eto.Serialization.Json/EventValueProvider.cs
index 359139e12a..623b5e5fe6 100644
--- a/src/Eto.Serialization.Json/EventValueProvider.cs
+++ b/src/Eto.Serialization.Json/EventValueProvider.cs
@@ -1,7 +1,4 @@
-using System;
 using Newtonsoft.Json.Serialization;
-using System.Reflection;
-
 namespace Eto.Serialization.Json
 {
 	class EventValueProvider : IValueProvider
diff --git a/src/Eto.Serialization.Json/JsonReader.cs b/src/Eto.Serialization.Json/JsonReader.cs
index 0dc5ebd87d..4e2859d641 100644
--- a/src/Eto.Serialization.Json/JsonReader.cs
+++ b/src/Eto.Serialization.Json/JsonReader.cs
@@ -1,8 +1,4 @@
-using System;
-using System.IO;
 using Newtonsoft.Json;
-using System.Runtime.Serialization;
-using System.Reflection;
 using Eto.Serialization.Json.Converters;
 
 namespace Eto.Serialization.Json
diff --git a/src/Eto.Serialization.Json/NamespaceManager.cs b/src/Eto.Serialization.Json/NamespaceManager.cs
index 78eb9f415c..5c594902fe 100644
--- a/src/Eto.Serialization.Json/NamespaceManager.cs
+++ b/src/Eto.Serialization.Json/NamespaceManager.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace Eto.Serialization.Json
 {
 	public class NamespaceManager
diff --git a/src/Eto.Serialization.Xaml/DesignerUserControl.cs b/src/Eto.Serialization.Xaml/DesignerUserControl.cs
index 9c00eacf1a..3aef29c648 100644
--- a/src/Eto.Serialization.Xaml/DesignerUserControl.cs
+++ b/src/Eto.Serialization.Xaml/DesignerUserControl.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Linq;
-using Eto.Drawing;
-using Eto.Forms;
 using Portable.Xaml.Markup;
 using Portable.Xaml;
 
diff --git a/src/Eto.Serialization.Xaml/EtoNameScope.cs b/src/Eto.Serialization.Xaml/EtoNameScope.cs
index 83dd9b5b30..1764cc4429 100644
--- a/src/Eto.Serialization.Xaml/EtoNameScope.cs
+++ b/src/Eto.Serialization.Xaml/EtoNameScope.cs
@@ -1,8 +1,3 @@
-using System;
-using System.IO;
-using System.Reflection;
-using System.Linq;
-using System.Collections.Generic;
 
 #if PORTABLE
 using Portable.Xaml;
diff --git a/src/Eto.Serialization.Xaml/EtoXamlSchemaContext.cs b/src/Eto.Serialization.Xaml/EtoXamlSchemaContext.cs
index 2ead09574a..b7bfa2eeb9 100644
--- a/src/Eto.Serialization.Xaml/EtoXamlSchemaContext.cs
+++ b/src/Eto.Serialization.Xaml/EtoXamlSchemaContext.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Linq;
-using Eto.Drawing;
-using Eto.Forms;
-
-
 #if PORTABLE
 using Portable.Xaml;
 using Portable.Xaml.Markup;
diff --git a/src/Eto.Serialization.Xaml/EtoXamlType.cs b/src/Eto.Serialization.Xaml/EtoXamlType.cs
index d3942d93bd..e2ff97b4a6 100644
--- a/src/Eto.Serialization.Xaml/EtoXamlType.cs
+++ b/src/Eto.Serialization.Xaml/EtoXamlType.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Reflection;
-using System.Linq;
-using System.Collections.Generic;
-using System.Globalization;
-using Eto.Forms;
-
-
 #if PORTABLE
 using Portable.Xaml;
 using Portable.Xaml.Schema;
diff --git a/src/Eto.Serialization.Xaml/Extensions/BindingExtension.cs b/src/Eto.Serialization.Xaml/Extensions/BindingExtension.cs
index 7deec757b8..61dc6135d5 100644
--- a/src/Eto.Serialization.Xaml/Extensions/BindingExtension.cs
+++ b/src/Eto.Serialization.Xaml/Extensions/BindingExtension.cs
@@ -1,11 +1,3 @@
-using Eto.Forms;
-using System;
-using System.ComponentModel;
-using System.IO;
-using System.Reflection;
-using System.Linq;
-using System.Globalization;
-
 #if PORTABLE
 using Portable.Xaml;
 using Portable.Xaml.Markup;
diff --git a/src/Eto.Serialization.Xaml/Extensions/FileExtension.cs b/src/Eto.Serialization.Xaml/Extensions/FileExtension.cs
index bec12d448f..dd489ba80b 100644
--- a/src/Eto.Serialization.Xaml/Extensions/FileExtension.cs
+++ b/src/Eto.Serialization.Xaml/Extensions/FileExtension.cs
@@ -1,7 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.IO;
-using System.Reflection;
 #if PORTABLE
 using Portable.Xaml;
 using Portable.Xaml.Markup;
diff --git a/src/Eto.Serialization.Xaml/Extensions/FontExtension.cs b/src/Eto.Serialization.Xaml/Extensions/FontExtension.cs
index 7601dfc731..38c12bc548 100644
--- a/src/Eto.Serialization.Xaml/Extensions/FontExtension.cs
+++ b/src/Eto.Serialization.Xaml/Extensions/FontExtension.cs
@@ -1,11 +1,3 @@
-using System;
-using System.ComponentModel;
-using System.IO;
-using System.Reflection;
-using Eto.Drawing;
-using System.Linq;
-
-
 #if PORTABLE
 using Portable.Xaml;
 using Portable.Xaml.Markup;
diff --git a/src/Eto.Serialization.Xaml/Extensions/OnExtension.cs b/src/Eto.Serialization.Xaml/Extensions/OnExtension.cs
index 9b49bc2e4f..fa793ca40e 100644
--- a/src/Eto.Serialization.Xaml/Extensions/OnExtension.cs
+++ b/src/Eto.Serialization.Xaml/Extensions/OnExtension.cs
@@ -1,10 +1,3 @@
-using Eto.Forms;
-using System;
-using System.ComponentModel;
-using System.IO;
-using System.Reflection;
-using System.Linq;
-
 #if PORTABLE
 using Portable.Xaml;
 using Portable.Xaml.Markup;
diff --git a/src/Eto.Serialization.Xaml/Extensions/ResourceExtension.cs b/src/Eto.Serialization.Xaml/Extensions/ResourceExtension.cs
index 40aed3a6d0..27e4a61c02 100644
--- a/src/Eto.Serialization.Xaml/Extensions/ResourceExtension.cs
+++ b/src/Eto.Serialization.Xaml/Extensions/ResourceExtension.cs
@@ -1,10 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.IO;
-using System.Reflection;
-using System.Linq;
-using Eto.Drawing;
-
 #if PORTABLE
 using Portable.Xaml;
 using Portable.Xaml.Markup;
diff --git a/src/Eto.Serialization.Xaml/Extensions/StaticResourceExtension.cs b/src/Eto.Serialization.Xaml/Extensions/StaticResourceExtension.cs
index 69e0b74af8..b0aa7c1d5a 100644
--- a/src/Eto.Serialization.Xaml/Extensions/StaticResourceExtension.cs
+++ b/src/Eto.Serialization.Xaml/Extensions/StaticResourceExtension.cs
@@ -1,12 +1,3 @@
-using System;
-using System.ComponentModel;
-using System.IO;
-using System.Reflection;
-using System.Linq;
-using Eto.Drawing;
-using Eto.Forms;
-
-
 #if PORTABLE
 using Portable.Xaml;
 using Portable.Xaml.Markup;
diff --git a/src/Eto.Serialization.Xaml/Properties/AssemblyInfo.cs b/src/Eto.Serialization.Xaml/Properties/AssemblyInfo.cs
index 660e8d76a7..105cc46a17 100644
--- a/src/Eto.Serialization.Xaml/Properties/AssemblyInfo.cs
+++ b/src/Eto.Serialization.Xaml/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
-using System.Reflection;
-#if PORTABLE
+#if PORTABLE
 using Portable.Xaml;
 using Portable.Xaml.Markup;
 #else
diff --git a/src/Eto.Serialization.Xaml/XamlReader.cs b/src/Eto.Serialization.Xaml/XamlReader.cs
index 3d7541c4f8..cd7bfca50a 100644
--- a/src/Eto.Serialization.Xaml/XamlReader.cs
+++ b/src/Eto.Serialization.Xaml/XamlReader.cs
@@ -1,8 +1,3 @@
-using System;
-using System.IO;
-using System.Reflection;
-using System.Linq;
-using System.Collections.Generic;
 using System.Xml;
 
 
diff --git a/src/Eto.WinForms/BubbleEventFilter.cs b/src/Eto.WinForms/BubbleEventFilter.cs
index e9b575e736..d0031a4e08 100644
--- a/src/Eto.WinForms/BubbleEventFilter.cs
+++ b/src/Eto.WinForms/BubbleEventFilter.cs
@@ -1,9 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using swf = System.Windows.Forms;
 using Eto.WinForms.Forms;
 
 namespace Eto.WinForms
diff --git a/src/Eto.WinForms/CustomControls/ExtendedDateTimePicker.cs b/src/Eto.WinForms/CustomControls/ExtendedDateTimePicker.cs
index 72477f0a51..408b25de62 100644
--- a/src/Eto.WinForms/CustomControls/ExtendedDateTimePicker.cs
+++ b/src/Eto.WinForms/CustomControls/ExtendedDateTimePicker.cs
@@ -1,12 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using System.Reflection;
-using System.Globalization;
-using System.ComponentModel;
-
 namespace Eto.WinForms.CustomControls
 {
 	/// <summary>
diff --git a/src/Eto.WinForms/CustomControls/TreeController.cs b/src/Eto.WinForms/CustomControls/TreeController.cs
index f41dc0ebc7..8fcd357e8e 100644
--- a/src/Eto.WinForms/CustomControls/TreeController.cs
+++ b/src/Eto.WinForms/CustomControls/TreeController.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Collections.Specialized;
-using Eto.Forms;
-using System.Collections;
-
 namespace Eto.CustomControls
 {
 	public interface ITreeHandler
diff --git a/src/Eto.WinForms/Drawing/BitmapHandler.cs b/src/Eto.WinForms/Drawing/BitmapHandler.cs
index 4ddd537b08..d561a7c2bd 100644
--- a/src/Eto.WinForms/Drawing/BitmapHandler.cs
+++ b/src/Eto.WinForms/Drawing/BitmapHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Globalization;
-using System.IO;
-using System.Runtime.InteropServices;
-using Eto.Drawing;
-using sd = System.Drawing;
-using sdi = System.Drawing.Imaging;
 using ImageManipulation;
 using Eto.Shared.Drawing;
 
@@ -100,7 +93,7 @@ public BitmapHandler(sd.Bitmap image)
 		public void Create(string fileName)
 		{
 			// We create a temp image from the file
-			// because SD.Bitmap(filename) locks the file
+			// because sd.Bitmap(filename) locks the file
 			// until the image is disposed.
 			// this is not the case in mono
 			if (EtoEnvironment.Platform.IsWindows)
diff --git a/src/Eto.WinForms/Drawing/BrushHandler.cs b/src/Eto.WinForms/Drawing/BrushHandler.cs
index 1a8de17b28..86300bbdd4 100644
--- a/src/Eto.WinForms/Drawing/BrushHandler.cs
+++ b/src/Eto.WinForms/Drawing/BrushHandler.cs
@@ -1,6 +1,3 @@
-using Eto.Drawing;
-using sd = System.Drawing;
-
 namespace Eto.WinForms.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.WinForms/Drawing/FontFamilyHandler.cs b/src/Eto.WinForms/Drawing/FontFamilyHandler.cs
index 91c06e945f..b993bfc7e1 100644
--- a/src/Eto.WinForms/Drawing/FontFamilyHandler.cs
+++ b/src/Eto.WinForms/Drawing/FontFamilyHandler.cs
@@ -1,10 +1,3 @@
-using Eto.Drawing;
-using System.Collections.Generic;
-using sd = System.Drawing;
-using System.Globalization;
-using System.Linq;
-using System.IO;
-using System;
 using Eto.Shared.Drawing;
 
 namespace Eto.WinForms.Drawing
diff --git a/src/Eto.WinForms/Drawing/FontHandler.cs b/src/Eto.WinForms/Drawing/FontHandler.cs
index 4109ff9cec..9205eea6bb 100644
--- a/src/Eto.WinForms/Drawing/FontHandler.cs
+++ b/src/Eto.WinForms/Drawing/FontHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using Eto.Drawing;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using System.ComponentModel;
-
 namespace Eto.WinForms.Drawing
 {
 	public interface IWindowsFontSource
diff --git a/src/Eto.WinForms/Drawing/FontTypefaceHandler.cs b/src/Eto.WinForms/Drawing/FontTypefaceHandler.cs
index 2c6350c8c0..46d128795f 100755
--- a/src/Eto.WinForms/Drawing/FontTypefaceHandler.cs
+++ b/src/Eto.WinForms/Drawing/FontTypefaceHandler.cs
@@ -1,13 +1,4 @@
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.Shared.Drawing;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using sd = System.Drawing;
 using sdt = System.Drawing.Text;
 
 namespace Eto.WinForms.Drawing
diff --git a/src/Eto.WinForms/Drawing/FontsHandler.cs b/src/Eto.WinForms/Drawing/FontsHandler.cs
index 97fda8348b..e29c6babd1 100644
--- a/src/Eto.WinForms/Drawing/FontsHandler.cs
+++ b/src/Eto.WinForms/Drawing/FontsHandler.cs
@@ -1,12 +1,5 @@
-using Eto.Drawing;
 using Eto.Shared.Drawing;
 using Microsoft.Win32;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using sd = System.Drawing;
-
 namespace Eto.WinForms.Drawing
 {
 	public class FontsHandler : WidgetHandler<Widget>, Fonts.IHandler
diff --git a/src/Eto.WinForms/Drawing/FormattedTextHandler.cs b/src/Eto.WinForms/Drawing/FormattedTextHandler.cs
index bee2c313e9..6461e8dda0 100644
--- a/src/Eto.WinForms/Drawing/FormattedTextHandler.cs
+++ b/src/Eto.WinForms/Drawing/FormattedTextHandler.cs
@@ -1,11 +1,3 @@
-using Eto.Drawing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using sd = System.Drawing;
-
 namespace Eto.WinForms.Drawing
 {
 	public class FormattedTextHandler : WidgetHandler<sd.StringFormat, FormattedText, FormattedText.ICallback>, FormattedText.IHandler
diff --git a/src/Eto.WinForms/Drawing/GraphicsHandler.cs b/src/Eto.WinForms/Drawing/GraphicsHandler.cs
index d1845b2442..d330910322 100644
--- a/src/Eto.WinForms/Drawing/GraphicsHandler.cs
+++ b/src/Eto.WinForms/Drawing/GraphicsHandler.cs
@@ -1,11 +1,3 @@
-using System;
-using System.ComponentModel;
-using Eto.Drawing;
-using sd = System.Drawing;
-using sdd = System.Drawing.Drawing2D;
-using swf = System.Windows.Forms;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace Eto.WinForms.Drawing
 {
@@ -118,7 +110,7 @@ public PixelOffsetMode PixelOffsetMode
 				if (Widget.Properties.TrySet(PixelOffsetMode_Key, value))
 				{
 					if (value == PixelOffsetMode.Aligned)
-						Control.PixelOffsetMode = sdd.PixelOffsetMode.None;
+						Control.PixelOffsetMode = sd2.PixelOffsetMode.None;
 				}
 			}
 		}
@@ -129,11 +121,11 @@ void SetOffset(bool fill)
 			if (currentMode == PixelOffsetMode.Aligned)
 				return;
 
-			sdd.PixelOffsetMode mode;
+			sd2.PixelOffsetMode mode;
 			if (!fill && currentMode == PixelOffsetMode.None)
-				mode = sdd.PixelOffsetMode.None;
+				mode = sd2.PixelOffsetMode.None;
 			else
-				mode = sdd.PixelOffsetMode.Half;
+				mode = sd2.PixelOffsetMode.Half;
 			Control.PixelOffsetMode = mode;
 		}
 
@@ -155,9 +147,9 @@ protected override void Initialize()
 
 		public void SetInitialState()
 		{
-			Control.PixelOffsetMode = sdd.PixelOffsetMode.None;
-			Control.SmoothingMode = sdd.SmoothingMode.AntiAlias;
-			Control.InterpolationMode = sdd.InterpolationMode.HighQualityBilinear;
+			Control.PixelOffsetMode = sd2.PixelOffsetMode.None;
+			Control.SmoothingMode = sd2.SmoothingMode.AntiAlias;
+			Control.InterpolationMode = sd2.InterpolationMode.HighQualityBilinear;
 		}
 
 		public void Commit()
@@ -448,7 +440,7 @@ public RectangleF ClipBounds
 			get
 			{
 				var oldValue = this.Control.PixelOffsetMode;
-				this.Control.PixelOffsetMode = sdd.PixelOffsetMode.None;
+				this.Control.PixelOffsetMode = sd2.PixelOffsetMode.None;
 				var result = this.Control.ClipBounds.ToEto();
 				this.Control.PixelOffsetMode = oldValue;
 				return result;
diff --git a/src/Eto.WinForms/Drawing/GraphicsPathHandler.cs b/src/Eto.WinForms/Drawing/GraphicsPathHandler.cs
index 43def4e3e5..76576abf02 100644
--- a/src/Eto.WinForms/Drawing/GraphicsPathHandler.cs
+++ b/src/Eto.WinForms/Drawing/GraphicsPathHandler.cs
@@ -1,8 +1,3 @@
-using System.Linq;
-using Eto.Drawing;
-using sd = System.Drawing;
-using sd2 = System.Drawing.Drawing2D;
-using System.Collections.Generic;
 
 namespace Eto.WinForms.Drawing
 {
diff --git a/src/Eto.WinForms/Drawing/IconFrameHandler.cs b/src/Eto.WinForms/Drawing/IconFrameHandler.cs
index c37c91b697..c1e8e6f7c4 100644
--- a/src/Eto.WinForms/Drawing/IconFrameHandler.cs
+++ b/src/Eto.WinForms/Drawing/IconFrameHandler.cs
@@ -1,11 +1,3 @@
-using System;
-using System.IO;
-using Eto.Drawing;
-using sd = System.Drawing;
-using SWF = System.Windows.Forms;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.WinForms.Drawing
 {
 
diff --git a/src/Eto.WinForms/Drawing/IconHandler.cs b/src/Eto.WinForms/Drawing/IconHandler.cs
index 308bfe0dad..18e246640a 100644
--- a/src/Eto.WinForms/Drawing/IconHandler.cs
+++ b/src/Eto.WinForms/Drawing/IconHandler.cs
@@ -1,11 +1,3 @@
-using System;
-using System.IO;
-using Eto.Drawing;
-using sd = System.Drawing;
-using SWF = System.Windows.Forms;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.WinForms.Drawing
 {
 	public interface IWindowsIconSource
diff --git a/src/Eto.WinForms/Drawing/IndexedBitmapHandler.cs b/src/Eto.WinForms/Drawing/IndexedBitmapHandler.cs
index 4392864260..a9d09d19be 100644
--- a/src/Eto.WinForms/Drawing/IndexedBitmapHandler.cs
+++ b/src/Eto.WinForms/Drawing/IndexedBitmapHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Globalization;
-using System.Linq;
-using Eto.Drawing;
-using SD = System.Drawing;
-using SWF = System.Windows.Forms;
 using Eto.Shared.Drawing;
 
 namespace Eto.WinForms.Drawing
@@ -27,26 +21,26 @@ public override int TranslateDataToArgb(int bitmapData)
 		}
 	}
 
-	public class IndexedBitmapHandler : WidgetHandler<SD.Bitmap, IndexedBitmap>, IndexedBitmap.IHandler, IWindowsImage
+	public class IndexedBitmapHandler : WidgetHandler<sd.Bitmap, IndexedBitmap>, IndexedBitmap.IHandler, IWindowsImage
 	{
 		public void Create(int width, int height, int bitsPerPixel)
 		{
-			SD.Imaging.PixelFormat sdPixelFormat;
+			sd.Imaging.PixelFormat sdPixelFormat;
 			switch (bitsPerPixel)
 			{
 				case 8:
-					sdPixelFormat = SD.Imaging.PixelFormat.Format8bppIndexed;
+					sdPixelFormat = sd.Imaging.PixelFormat.Format8bppIndexed;
 					break;
 				case 4:
-					sdPixelFormat = SD.Imaging.PixelFormat.Format4bppIndexed;
+					sdPixelFormat = sd.Imaging.PixelFormat.Format4bppIndexed;
 					break;
 				case 1:
-					sdPixelFormat = SD.Imaging.PixelFormat.Format1bppIndexed;
+					sdPixelFormat = sd.Imaging.PixelFormat.Format1bppIndexed;
 					break;
 				default:
 					throw new ArgumentOutOfRangeException("bitsPerPixel", bitsPerPixel, string.Format(CultureInfo.CurrentCulture, "Not supported"));
 			}
-			Control = new SD.Bitmap(width, height, sdPixelFormat);
+			Control = new sd.Bitmap(width, height, sdPixelFormat);
 		}
 
 		public Size Size
@@ -56,30 +50,30 @@ public Size Size
 
 		public void Resize(int width, int height)
 		{
-			Control = new SD.Bitmap(Control, new SD.Size(width, height));
+			Control = new sd.Bitmap(Control, new sd.Size(width, height));
 		}
 
 		public BitmapData Lock()
 		{
-			SD.Imaging.BitmapData bd = Control.LockBits(new SD.Rectangle(0, 0, Control.Width, Control.Height), SD.Imaging.ImageLockMode.ReadWrite, Control.PixelFormat);
+			sd.Imaging.BitmapData bd = Control.LockBits(new sd.Rectangle(0, 0, Control.Width, Control.Height), sd.Imaging.ImageLockMode.ReadWrite, Control.PixelFormat);
 			return new BitmapDataHandler(Widget, bd.Scan0, bd.Stride, bd.PixelFormat.BitsPerPixel(), bd, bd.PixelFormat.IsPremultiplied());
 		}
 
 		public void Unlock(BitmapData bitmapData)
 		{
-			Control.UnlockBits((SD.Imaging.BitmapData)bitmapData.ControlObject);
+			Control.UnlockBits((sd.Imaging.BitmapData)bitmapData.ControlObject);
 		}
 
 		public Palette Palette
 		{
 			get
 			{
-				SD.Imaging.ColorPalette cp = Control.Palette;
+				sd.Imaging.ColorPalette cp = Control.Palette;
 				return new Palette(cp.Entries.Select(r => r.ToEto ()).ToList ());
 			}
 			set
 			{
-				SD.Imaging.ColorPalette cp = Control.Palette;
+				sd.Imaging.ColorPalette cp = Control.Palette;
 				if (value.Count != cp.Entries.Length)
 					throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, "Input palette must have the same colors as the output"));
 				for (int i=0; i<value.Count; i++)
@@ -91,19 +85,19 @@ public Palette Palette
 		}
 
 
-		public SD.Image GetImageWithSize(int? size)
+		public sd.Image GetImageWithSize(int? size)
 		{
 			return Control;
 		}
 
-		public SD.Image GetImageWithSize(Size? size)
+		public sd.Image GetImageWithSize(Size? size)
 		{
 			return Control;
 		}
 
 		public void DrawImage (GraphicsHandler graphics, RectangleF source, RectangleF destination)
 		{
-			graphics.Control.DrawImage (Control, destination.ToSD (), source.ToSD (), SD.GraphicsUnit.Pixel);
+			graphics.Control.DrawImage (Control, destination.ToSD (), source.ToSD (), sd.GraphicsUnit.Pixel);
 		}
 
 		public void DrawImage (GraphicsHandler graphics, float x, float y)
diff --git a/src/Eto.WinForms/Drawing/LinearGradientBrushHandler.cs b/src/Eto.WinForms/Drawing/LinearGradientBrushHandler.cs
index d27105d484..844b31908e 100644
--- a/src/Eto.WinForms/Drawing/LinearGradientBrushHandler.cs
+++ b/src/Eto.WinForms/Drawing/LinearGradientBrushHandler.cs
@@ -1,8 +1,3 @@
-using System.Linq;
-using Eto.Drawing;
-using sd = System.Drawing;
-using sd2 = System.Drawing.Drawing2D;
-using System;
 
 namespace Eto.WinForms.Drawing
 {
diff --git a/src/Eto.WinForms/Drawing/MatrixHandler.cs b/src/Eto.WinForms/Drawing/MatrixHandler.cs
index b33947d00b..6678011df1 100644
--- a/src/Eto.WinForms/Drawing/MatrixHandler.cs
+++ b/src/Eto.WinForms/Drawing/MatrixHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using sd = System.Drawing;
-using sd2 = System.Drawing.Drawing2D;
 
 namespace Eto.WinForms.Drawing
 {
diff --git a/src/Eto.WinForms/Drawing/PenHandler.cs b/src/Eto.WinForms/Drawing/PenHandler.cs
index 3afe73c350..4c70c338a5 100644
--- a/src/Eto.WinForms/Drawing/PenHandler.cs
+++ b/src/Eto.WinForms/Drawing/PenHandler.cs
@@ -1,7 +1,3 @@
-using Eto.Drawing;
-using System;
-using sd = System.Drawing;
-using sd2 = System.Drawing.Drawing2D;
 
 namespace Eto.WinForms.Drawing
 {
diff --git a/src/Eto.WinForms/Drawing/RadialGradientBrushHandler.cs b/src/Eto.WinForms/Drawing/RadialGradientBrushHandler.cs
index b660f26e97..1a5fae9492 100644
--- a/src/Eto.WinForms/Drawing/RadialGradientBrushHandler.cs
+++ b/src/Eto.WinForms/Drawing/RadialGradientBrushHandler.cs
@@ -1,8 +1,3 @@
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Linq;
-using sd = System.Drawing;
-using sd2 = System.Drawing.Drawing2D;
 
 namespace Eto.WinForms.Drawing
 {
diff --git a/src/Eto.WinForms/Drawing/SolidBrushHandler.cs b/src/Eto.WinForms/Drawing/SolidBrushHandler.cs
index e8a9fee9f6..374701afaf 100644
--- a/src/Eto.WinForms/Drawing/SolidBrushHandler.cs
+++ b/src/Eto.WinForms/Drawing/SolidBrushHandler.cs
@@ -1,6 +1,3 @@
-using Eto.Drawing;
-using sd = System.Drawing;
-
 namespace Eto.WinForms.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.WinForms/Drawing/SystemColorsHandler.cs b/src/Eto.WinForms/Drawing/SystemColorsHandler.cs
index 0ff74566b4..9cb3f89afa 100644
--- a/src/Eto.WinForms/Drawing/SystemColorsHandler.cs
+++ b/src/Eto.WinForms/Drawing/SystemColorsHandler.cs
@@ -1,7 +1,3 @@
-using Eto.Drawing;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-
 namespace Eto.WinForms.Drawing
 {
 	public class SystemColorsHandler : SystemColors.IHandler
diff --git a/src/Eto.WinForms/Drawing/TextureBrushHandler.cs b/src/Eto.WinForms/Drawing/TextureBrushHandler.cs
index 631546d730..90394bca60 100644
--- a/src/Eto.WinForms/Drawing/TextureBrushHandler.cs
+++ b/src/Eto.WinForms/Drawing/TextureBrushHandler.cs
@@ -1,7 +1,3 @@
-using Eto.Drawing;
-using sd = System.Drawing;
-using sd2 = System.Drawing.Drawing2D;
-using sdi = System.Drawing.Imaging;
 
 namespace Eto.WinForms.Drawing
 {
diff --git a/src/Eto.WinForms/Eto.WinForms.csproj b/src/Eto.WinForms/Eto.WinForms.csproj
index d400687dff..a7435644e8 100755
--- a/src/Eto.WinForms/Eto.WinForms.csproj
+++ b/src/Eto.WinForms/Eto.WinForms.csproj
@@ -42,6 +42,13 @@ You do not need to use any of the classes of this assembly (unless customizing t
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DebugType>pdbonly</DebugType>
   </PropertyGroup>
+  
+  <ItemGroup>
+    <Using Include="System.Windows.Forms" Alias="swf" />
+    <Using Include="System.Drawing" Alias="sd" />
+    <Using Include="System.Drawing.Imaging" Alias="sdi" />
+    <Using Include="System.Drawing.Drawing2D" Alias="sd2" />
+  </ItemGroup>
 
   <ItemGroup>
     <Reference Include="..\..\lib\SHDocVw\Interop.SHDocVw.dll" EmbedInteropTypes="False" Private="False" />
diff --git a/src/Eto.WinForms/EtoEnvironmentHandler.cs b/src/Eto.WinForms/EtoEnvironmentHandler.cs
index a659d92c46..f87eb893a7 100644
--- a/src/Eto.WinForms/EtoEnvironmentHandler.cs
+++ b/src/Eto.WinForms/EtoEnvironmentHandler.cs
@@ -1,9 +1,4 @@
-using System;
 using Eto;
-using System.Reflection;
-using System.IO;
-using System.Diagnostics;
-
 namespace Eto.WinForms
 {
 	public class EtoEnvironmentHandler : WidgetHandler<Widget>, EtoEnvironment.IHandler
diff --git a/src/Eto.WinForms/Forms/ApplicationHandler.cs b/src/Eto.WinForms/Forms/ApplicationHandler.cs
index 8d6b97126a..d18fe795a8 100644
--- a/src/Eto.WinForms/Forms/ApplicationHandler.cs
+++ b/src/Eto.WinForms/Forms/ApplicationHandler.cs
@@ -1,12 +1,4 @@
-using System;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Forms;
-using System.Diagnostics;
-using System.Threading;
 using Microsoft.WindowsAPICodePack.Taskbar;
-using System.Collections.Generic;
-
 namespace Eto.WinForms.Forms
 {
 	public class ApplicationHandler : WidgetHandler<object, Application, Application.ICallback>, Application.IHandler
diff --git a/src/Eto.WinForms/Forms/Cells/CellHandler.cs b/src/Eto.WinForms/Forms/Cells/CellHandler.cs
index f2bc00d48e..e0f17e29ec 100644
--- a/src/Eto.WinForms/Forms/Cells/CellHandler.cs
+++ b/src/Eto.WinForms/Forms/Cells/CellHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms.Cells
 {
 	public interface ICellConfigHandler
diff --git a/src/Eto.WinForms/Forms/Cells/CheckBoxCellHandler.cs b/src/Eto.WinForms/Forms/Cells/CheckBoxCellHandler.cs
index 86b6583a5f..3fd34aba04 100644
--- a/src/Eto.WinForms/Forms/Cells/CheckBoxCellHandler.cs
+++ b/src/Eto.WinForms/Forms/Cells/CheckBoxCellHandler.cs
@@ -1,7 +1,3 @@
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms.Cells
 {
 	public class CheckBoxCellHandler : CellHandler<swf.DataGridViewCheckBoxCell, CheckBoxCell, CheckBoxCell.ICallback>, CheckBoxCell.IHandler
diff --git a/src/Eto.WinForms/Forms/Cells/ComboBoxCellHandler.cs b/src/Eto.WinForms/Forms/Cells/ComboBoxCellHandler.cs
index c36f01f309..ed82047ade 100644
--- a/src/Eto.WinForms/Forms/Cells/ComboBoxCellHandler.cs
+++ b/src/Eto.WinForms/Forms/Cells/ComboBoxCellHandler.cs
@@ -1,9 +1,3 @@
-using System.Linq;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Forms;
-using System.Collections.Generic;
-
 namespace Eto.WinForms.Forms.Cells
 {
 	public class ComboBoxCellHandler : CellHandler<swf.DataGridViewComboBoxCell, ComboBoxCell, ComboBoxCell.ICallback>, ComboBoxCell.IHandler
diff --git a/src/Eto.WinForms/Forms/Cells/CustomCellHandler.cs b/src/Eto.WinForms/Forms/Cells/CustomCellHandler.cs
index a4ed6477fb..9252884e96 100644
--- a/src/Eto.WinForms/Forms/Cells/CustomCellHandler.cs
+++ b/src/Eto.WinForms/Forms/Cells/CustomCellHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.WinForms.Drawing;
 
 namespace Eto.WinForms.Forms.Cells
diff --git a/src/Eto.WinForms/Forms/Cells/DrawableCellHandler.cs b/src/Eto.WinForms/Forms/Cells/DrawableCellHandler.cs
index bfda3cc11d..782994f485 100644
--- a/src/Eto.WinForms/Forms/Cells/DrawableCellHandler.cs
+++ b/src/Eto.WinForms/Forms/Cells/DrawableCellHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.WinForms.Drawing;
 
 namespace Eto.WinForms.Forms.Cells
diff --git a/src/Eto.WinForms/Forms/Cells/ImageTextCellHandler.cs b/src/Eto.WinForms/Forms/Cells/ImageTextCellHandler.cs
index 5a61ba7da8..8a8c0adfa3 100644
--- a/src/Eto.WinForms/Forms/Cells/ImageTextCellHandler.cs
+++ b/src/Eto.WinForms/Forms/Cells/ImageTextCellHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Forms;
-using Eto.Drawing;
-using Eto.WinForms.Drawing;
+using Eto.WinForms.Drawing;
 
 namespace Eto.WinForms.Forms.Cells
 {
diff --git a/src/Eto.WinForms/Forms/Cells/ImageViewCellHandler.cs b/src/Eto.WinForms/Forms/Cells/ImageViewCellHandler.cs
index dda2291af9..2e83771327 100644
--- a/src/Eto.WinForms/Forms/Cells/ImageViewCellHandler.cs
+++ b/src/Eto.WinForms/Forms/Cells/ImageViewCellHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.WinForms.Drawing;
 
 namespace Eto.WinForms.Forms.Cells
diff --git a/src/Eto.WinForms/Forms/Cells/ProgressCellHandler.cs b/src/Eto.WinForms/Forms/Cells/ProgressCellHandler.cs
index fd12fb602c..6e83c2ac30 100644
--- a/src/Eto.WinForms/Forms/Cells/ProgressCellHandler.cs
+++ b/src/Eto.WinForms/Forms/Cells/ProgressCellHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Forms;
-
-namespace Eto.WinForms.Forms.Cells
+namespace Eto.WinForms.Forms.Cells
 {
     public class ProgressCellHandler : CellHandler<ProgressCellHandler.EtoCell, ProgressCell, ProgressCell.ICallback>, ProgressCell.IHandler
     {
diff --git a/src/Eto.WinForms/Forms/Cells/TextBoxCellHandler.cs b/src/Eto.WinForms/Forms/Cells/TextBoxCellHandler.cs
index b1ac62c586..6613890c28 100644
--- a/src/Eto.WinForms/Forms/Cells/TextBoxCellHandler.cs
+++ b/src/Eto.WinForms/Forms/Cells/TextBoxCellHandler.cs
@@ -1,9 +1,4 @@
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Forms;
-using System;
-
-namespace Eto.WinForms.Forms.Cells
+namespace Eto.WinForms.Forms.Cells
 {
 	interface ITextCellHandler
 	{
diff --git a/src/Eto.WinForms/Forms/ClipboardHandler.cs b/src/Eto.WinForms/Forms/ClipboardHandler.cs
index af02e42f28..fb68fd747d 100755
--- a/src/Eto.WinForms/Forms/ClipboardHandler.cs
+++ b/src/Eto.WinForms/Forms/ClipboardHandler.cs
@@ -1,17 +1,4 @@
-using System;
-using Eto.Forms;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using sdi = System.Drawing.Imaging;
 using Eto.WinForms.Drawing;
-using Eto.Drawing;
-using System.Runtime.InteropServices;
-using System.IO;
-using sc = System.ComponentModel;
-using System.Text;
-using System.Collections.Specialized;
-using System.Linq;
-
 namespace Eto.WinForms.Forms
 {
 	public class ClipboardHandler : DataObjectHandler<Clipboard, Clipboard.ICallback>, Clipboard.IHandler
diff --git a/src/Eto.WinForms/Forms/ColorDialogHandler.cs b/src/Eto.WinForms/Forms/ColorDialogHandler.cs
index 6e00b4b4f0..6d8fc1eb76 100644
--- a/src/Eto.WinForms/Forms/ColorDialogHandler.cs
+++ b/src/Eto.WinForms/Forms/ColorDialogHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.WinForms.Forms
 {
 	public class ColorDialogHandler : WidgetHandler<swf.ColorDialog, ColorDialog, ColorDialog.ICallback>, ColorDialog.IHandler
diff --git a/src/Eto.WinForms/Forms/Controls/ButtonHandler.cs b/src/Eto.WinForms/Forms/Controls/ButtonHandler.cs
index 48abca5317..e090ccc785 100644
--- a/src/Eto.WinForms/Forms/Controls/ButtonHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/ButtonHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Linq;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class ButtonHandler : ButtonHandler<ButtonHandler.EtoButton, Button, Button.ICallback>, Button.IHandler
diff --git a/src/Eto.WinForms/Forms/Controls/CalendarHandler.cs b/src/Eto.WinForms/Forms/Controls/CalendarHandler.cs
index 7b4c087153..fceea3b3b0 100644
--- a/src/Eto.WinForms/Forms/Controls/CalendarHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/CalendarHandler.cs
@@ -1,11 +1,4 @@
-using Eto.Forms;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using swf = System.Windows.Forms;
-
-namespace Eto.WinForms.Forms.Controls
+namespace Eto.WinForms.Forms.Controls
 {
 	public class CalendarHandler : WindowsControl<swf.MonthCalendar, Calendar, Calendar.ICallback>, Calendar.IHandler
 	{
diff --git a/src/Eto.WinForms/Forms/Controls/CheckBoxHandler.cs b/src/Eto.WinForms/Forms/Controls/CheckBoxHandler.cs
index 5eee27ad9d..4b4aa4e095 100644
--- a/src/Eto.WinForms/Forms/Controls/CheckBoxHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/CheckBoxHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Linq;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class CheckBoxHandler : WindowsControl<swf.CheckBox, CheckBox, CheckBox.ICallback>, CheckBox.IHandler
diff --git a/src/Eto.WinForms/Forms/Controls/ColorPickerHandler.cs b/src/Eto.WinForms/Forms/Controls/ColorPickerHandler.cs
index 2a0bc6da2f..d07f87c269 100644
--- a/src/Eto.WinForms/Forms/Controls/ColorPickerHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/ColorPickerHandler.cs
@@ -1,13 +1,4 @@
-using Eto.Drawing;
-using Eto.Forms;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-
-namespace Eto.WinForms.Forms.Controls
+namespace Eto.WinForms.Forms.Controls
 {
 	public class ColorPickerHandler : WindowsControl<swf.Button, ColorPicker, ColorPicker.ICallback>, ColorPicker.IHandler
 	{
diff --git a/src/Eto.WinForms/Forms/Controls/ComboBoxHandler.cs b/src/Eto.WinForms/Forms/Controls/ComboBoxHandler.cs
index c8c7fe4d78..e3450643dc 100644
--- a/src/Eto.WinForms/Forms/Controls/ComboBoxHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/ComboBoxHandler.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class ComboBoxHandler : DropDownHandler<EtoComboBox, ComboBox, ComboBox.ICallback>, ComboBox.IHandler
diff --git a/src/Eto.WinForms/Forms/Controls/ControlHandler.cs b/src/Eto.WinForms/Forms/Controls/ControlHandler.cs
index 6d10cf04a3..69a7332239 100644
--- a/src/Eto.WinForms/Forms/Controls/ControlHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/ControlHandler.cs
@@ -1,13 +1,10 @@
-using SWF = System.Windows.Forms;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms.Controls
 {
-	public class ControlHandler : WindowsControl<SWF.Control, Control, Control.ICallback>
+	public class ControlHandler : WindowsControl<swf.Control, Control, Control.ICallback>
 	{
 		public ControlHandler()
 		{
-			Control = new SWF.Control();
+			Control = new swf.Control();
 		}
 	}
 }
diff --git a/src/Eto.WinForms/Forms/Controls/DateTimePickerHandler.cs b/src/Eto.WinForms/Forms/Controls/DateTimePickerHandler.cs
index 9187ca99e1..a06e1c2689 100644
--- a/src/Eto.WinForms/Forms/Controls/DateTimePickerHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/DateTimePickerHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Linq;
-using Eto.Forms;
-using System.Globalization;
-using swf = System.Windows.Forms;
 using Eto.WinForms.CustomControls;
 
 namespace Eto.WinForms.Forms.Controls
diff --git a/src/Eto.WinForms/Forms/Controls/DrawableHandler.cs b/src/Eto.WinForms/Forms/Controls/DrawableHandler.cs
index 4d8633115e..ab3f07fc31 100644
--- a/src/Eto.WinForms/Forms/Controls/DrawableHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/DrawableHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.WinForms.Drawing;
 
 namespace Eto.WinForms.Forms.Controls
diff --git a/src/Eto.WinForms/Forms/Controls/DropDownHandler.cs b/src/Eto.WinForms/Forms/Controls/DropDownHandler.cs
index 7039d9b07c..4b68299ac2 100644
--- a/src/Eto.WinForms/Forms/Controls/DropDownHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/DropDownHandler.cs
@@ -1,11 +1,3 @@
-using System;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Forms;
-using System.Collections.Generic;
-using System.Linq;
-using Eto.Drawing;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class DropDownHandler : DropDownHandler<EtoComboBox, DropDown, DropDown.ICallback>, DropDown.IHandler
diff --git a/src/Eto.WinForms/Forms/Controls/GridColumnHandler.cs b/src/Eto.WinForms/Forms/Controls/GridColumnHandler.cs
index 1a9d97117f..2e7d15b2f6 100644
--- a/src/Eto.WinForms/Forms/Controls/GridColumnHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/GridColumnHandler.cs
@@ -1,9 +1,4 @@
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Forms;
 using Eto.WinForms.Forms.Cells;
-using System;
-using System.Diagnostics;
 using System.Windows.Forms;
 
 namespace Eto.WinForms.Forms.Controls
diff --git a/src/Eto.WinForms/Forms/Controls/GridHandler.cs b/src/Eto.WinForms/Forms/Controls/GridHandler.cs
index fcde453dab..acf48e04c1 100644
--- a/src/Eto.WinForms/Forms/Controls/GridHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/GridHandler.cs
@@ -1,13 +1,4 @@
-using System;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-using System.Linq;
-using System.Collections.Generic;
-using sd = System.Drawing;
-using Eto.Drawing;
 using Eto.WinForms.Drawing;
-using System.Diagnostics;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public interface IGridHandler
diff --git a/src/Eto.WinForms/Forms/Controls/GridViewHandler.cs b/src/Eto.WinForms/Forms/Controls/GridViewHandler.cs
index 819af13837..94fcef37ba 100644
--- a/src/Eto.WinForms/Forms/Controls/GridViewHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/GridViewHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-using System.Collections.Generic;
-using System.Linq;
-using Eto.Drawing;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class GridViewHandler : GridHandler<GridView, GridView.ICallback>, GridView.IHandler
diff --git a/src/Eto.WinForms/Forms/Controls/GroupBoxHandler.cs b/src/Eto.WinForms/Forms/Controls/GroupBoxHandler.cs
index 75f0b5885c..7453495d3e 100644
--- a/src/Eto.WinForms/Forms/Controls/GroupBoxHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/GroupBoxHandler.cs
@@ -1,9 +1,3 @@
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-using Eto.Drawing;
-using System;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class GroupBoxHandler : WindowsPanel<GroupBoxHandler.EtoGroupBox, GroupBox, GroupBox.ICallback>, GroupBox.IHandler
diff --git a/src/Eto.WinForms/Forms/Controls/ImageViewHandler.cs b/src/Eto.WinForms/Forms/Controls/ImageViewHandler.cs
index cee8b64a3f..9cd2471ad9 100644
--- a/src/Eto.WinForms/Forms/Controls/ImageViewHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/ImageViewHandler.cs
@@ -1,11 +1,4 @@
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.WinForms.Drawing;
-using System;
-using System.ComponentModel;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class ImageViewHandler : WindowsControl<swf.PictureBox, ImageView, ImageView.ICallback>, ImageView.IHandler
diff --git a/src/Eto.WinForms/Forms/Controls/LabelHandler.cs b/src/Eto.WinForms/Forms/Controls/LabelHandler.cs
index ca3d9cde2e..f54dbbaa52 100644
--- a/src/Eto.WinForms/Forms/Controls/LabelHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/LabelHandler.cs
@@ -1,12 +1,3 @@
-using System;
-using System.IO;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Diagnostics;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class LabelHandler : WindowsControl<LabelHandler.EtoLabel, Label, Label.ICallback>, Label.IHandler
diff --git a/src/Eto.WinForms/Forms/Controls/LinkButtonHandler.cs b/src/Eto.WinForms/Forms/Controls/LinkButtonHandler.cs
index ebf0d1d81d..330480280c 100644
--- a/src/Eto.WinForms/Forms/Controls/LinkButtonHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/LinkButtonHandler.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Linq;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-using Eto.Drawing;
-
-namespace Eto.WinForms.Forms.Controls
+namespace Eto.WinForms.Forms.Controls
 {
 	public class LinkButtonHandler : WindowsControl<swf.LinkLabel, LinkButton, LinkButton.ICallback>, LinkButton.IHandler
 	{
@@ -48,7 +41,7 @@ void ClearSize()
 
 			public override sd.Size GetPreferredSize(sd.Size proposedSize)
 			{
-				var bordersAndPadding = Margin.Size; // this.SizeFromClientSize (SD.Size.Empty);
+				var bordersAndPadding = Margin.Size; // this.SizeFromClientSize (sd.Size.Empty);
 				if( proposedSize.Width <= 1 )
 					proposedSize.Width = int.MaxValue;
 
diff --git a/src/Eto.WinForms/Forms/Controls/ListBoxHandler.cs b/src/Eto.WinForms/Forms/Controls/ListBoxHandler.cs
index 85b7855b92..22d856b061 100644
--- a/src/Eto.WinForms/Forms/Controls/ListBoxHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/ListBoxHandler.cs
@@ -1,12 +1,4 @@
-using System;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Forms;
-using System.Collections.Generic;
-using System.Linq;
 using Eto.WinForms.Drawing;
-using Eto.Drawing;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class ListBoxHandler : WindowsControl<swf.ListBox, ListBox, ListBox.ICallback>, ListBox.IHandler
diff --git a/src/Eto.WinForms/Forms/Controls/NativeControlHandler.cs b/src/Eto.WinForms/Forms/Controls/NativeControlHandler.cs
index 66f2adae58..b80d4f81e7 100644
--- a/src/Eto.WinForms/Forms/Controls/NativeControlHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/NativeControlHandler.cs
@@ -1,8 +1,4 @@
-using System;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-
-namespace Eto.WinForms.Forms.Controls
+namespace Eto.WinForms.Forms.Controls
 {
 	public class NativeControlHandler : WindowsControl<swf.Control, Control, Control.ICallback>
 	{
diff --git a/src/Eto.WinForms/Forms/Controls/NumericStepperHandler.cs b/src/Eto.WinForms/Forms/Controls/NumericStepperHandler.cs
index 14e23e09ff..cb6524c1f0 100644
--- a/src/Eto.WinForms/Forms/Controls/NumericStepperHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/NumericStepperHandler.cs
@@ -1,12 +1,3 @@
-using System;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Globalization;
-using System.Text.RegularExpressions;
-using System.ComponentModel;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class NumericStepperHandler : WindowsControl<NumericStepperHandler.EtoNumericUpDown, NumericStepper, NumericStepper.ICallback>, NumericStepper.IHandler
diff --git a/src/Eto.WinForms/Forms/Controls/PanelHandler.cs b/src/Eto.WinForms/Forms/Controls/PanelHandler.cs
index 7bab0800b9..b2a2421995 100644
--- a/src/Eto.WinForms/Forms/Controls/PanelHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/PanelHandler.cs
@@ -1,8 +1,3 @@
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Forms;
-using System;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class PanelHandler : WindowsPanel<PanelHandler.EtoPanel, Panel, Panel.ICallback>, Panel.IHandler
diff --git a/src/Eto.WinForms/Forms/Controls/PasswordBoxHandler.cs b/src/Eto.WinForms/Forms/Controls/PasswordBoxHandler.cs
index 8b1bab010e..2e3b60bdff 100644
--- a/src/Eto.WinForms/Forms/Controls/PasswordBoxHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/PasswordBoxHandler.cs
@@ -1,8 +1,3 @@
-using SD = System.Drawing;
-using swf = System.Windows.Forms;
-using System.Linq;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class PasswordBoxHandler : WindowsControl<swf.TextBox, PasswordBox, PasswordBox.ICallback>, PasswordBox.IHandler
diff --git a/src/Eto.WinForms/Forms/Controls/ProgressBarHandler.cs b/src/Eto.WinForms/Forms/Controls/ProgressBarHandler.cs
index be6c713f79..d823a75893 100644
--- a/src/Eto.WinForms/Forms/Controls/ProgressBarHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/ProgressBarHandler.cs
@@ -1,27 +1,24 @@
-using SWF = System.Windows.Forms;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms.Controls
 {
-	public class ProgressBarHandler : WindowsControl<SWF.ProgressBar, ProgressBar, ProgressBar.ICallback>, ProgressBar.IHandler
+	public class ProgressBarHandler : WindowsControl<swf.ProgressBar, ProgressBar, ProgressBar.ICallback>, ProgressBar.IHandler
 	{
 		public ProgressBarHandler ()
 		{
-			this.Control = new SWF.ProgressBar {
+			this.Control = new swf.ProgressBar {
 				Maximum = 100,
-				Style = SWF.ProgressBarStyle.Blocks
+				Style = swf.ProgressBarStyle.Blocks
 			};
 		}
 
-		static SWF.ProgressBarStyle IndeterminateStyle
+		static swf.ProgressBarStyle IndeterminateStyle
 		{
-			get { return (SWF.Application.RenderWithVisualStyles) ? SWF.ProgressBarStyle.Marquee : SWF.ProgressBarStyle.Continuous; }
+			get { return (swf.Application.RenderWithVisualStyles) ? swf.ProgressBarStyle.Marquee : swf.ProgressBarStyle.Continuous; }
 		}
 
 		public bool Indeterminate {
-			get { return Control.Style == SWF.ProgressBarStyle.Continuous || Control.Style == SWF.ProgressBarStyle.Marquee; }
+			get { return Control.Style == swf.ProgressBarStyle.Continuous || Control.Style == swf.ProgressBarStyle.Marquee; }
 			set { 
-				Control.Style = value ? IndeterminateStyle : SWF.ProgressBarStyle.Blocks;
+				Control.Style = value ? IndeterminateStyle : swf.ProgressBarStyle.Blocks;
 			}
 		}
 
diff --git a/src/Eto.WinForms/Forms/Controls/RadioButton.cs b/src/Eto.WinForms/Forms/Controls/RadioButton.cs
index 8a324b2112..ccb172f21c 100644
--- a/src/Eto.WinForms/Forms/Controls/RadioButton.cs
+++ b/src/Eto.WinForms/Forms/Controls/RadioButton.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Linq;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-using System.Collections.Generic;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class RadioButtonHandler : WindowsControl<swf.RadioButton, RadioButton, RadioButton.ICallback>, RadioButton.IHandler
diff --git a/src/Eto.WinForms/Forms/Controls/RichTextAreaHandler.cs b/src/Eto.WinForms/Forms/Controls/RichTextAreaHandler.cs
index 209f618009..a2fbb8498e 100644
--- a/src/Eto.WinForms/Forms/Controls/RichTextAreaHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/RichTextAreaHandler.cs
@@ -1,13 +1,3 @@
-using Eto.Forms;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Eto.Drawing;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class RichTextAreaHandler : TextAreaHandler<RichTextArea, RichTextArea.ICallback>, RichTextArea.IHandler, ITextBuffer
diff --git a/src/Eto.WinForms/Forms/Controls/ScrollableHandler.cs b/src/Eto.WinForms/Forms/Controls/ScrollableHandler.cs
index b59e7b1d5c..47279b8c38 100644
--- a/src/Eto.WinForms/Forms/Controls/ScrollableHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/ScrollableHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class ScrollableHandler : WindowsPanel<ScrollableHandler.CustomScrollable, Scrollable, Scrollable.ICallback>, Scrollable.IHandler
diff --git a/src/Eto.WinForms/Forms/Controls/SearchBoxHandler.cs b/src/Eto.WinForms/Forms/Controls/SearchBoxHandler.cs
index 6e65b64a28..122275bcf6 100755
--- a/src/Eto.WinForms/Forms/Controls/SearchBoxHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/SearchBoxHandler.cs
@@ -1,9 +1,4 @@
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Forms;
 using Eto.WinForms.CustomControls;
-using System;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class EtoSearchTextBox : EtoTextBox
diff --git a/src/Eto.WinForms/Forms/Controls/SliderHandler.cs b/src/Eto.WinForms/Forms/Controls/SliderHandler.cs
index d5bf070050..ff676b945f 100644
--- a/src/Eto.WinForms/Forms/Controls/SliderHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/SliderHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Linq;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class SliderHandler : WindowsControl<swf.TrackBar, Slider, Slider.ICallback>, Slider.IHandler
diff --git a/src/Eto.WinForms/Forms/Controls/SplitterHandler.cs b/src/Eto.WinForms/Forms/Controls/SplitterHandler.cs
index dcffbc6d3c..a19daadd76 100644
--- a/src/Eto.WinForms/Forms/Controls/SplitterHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/SplitterHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Collections.Generic;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class SplitterHandler : WindowsControl<swf.SplitContainer, Splitter, Splitter.ICallback>, Splitter.IHandler
diff --git a/src/Eto.WinForms/Forms/Controls/StepperHandler.cs b/src/Eto.WinForms/Forms/Controls/StepperHandler.cs
index 9177be1fa0..410bc05ae9 100644
--- a/src/Eto.WinForms/Forms/Controls/StepperHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/StepperHandler.cs
@@ -1,14 +1,4 @@
-using Eto.Forms;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using swf = System.Windows.Forms;
-using System.Drawing;
-using System.Reflection;
-
-namespace Eto.WinForms.Forms.Controls
+namespace Eto.WinForms.Forms.Controls
 {
 	public class StepperHandler : WindowsControl<StepperHandler.EtoUpDown, Stepper, Stepper.ICallback>, Stepper.IHandler
 	{
@@ -27,7 +17,7 @@ public override void UpButton()
 				UpButtonClicked?.Invoke(this, EventArgs.Empty);
 			}
 
-			protected override Size DefaultSize => new Size(18, base.DefaultSize.Height);
+			protected override sd.Size DefaultSize => new sd.Size(18, base.DefaultSize.Height);
 
 			protected override void UpdateEditText()
 			{
diff --git a/src/Eto.WinForms/Forms/Controls/TabControlHandler.cs b/src/Eto.WinForms/Forms/Controls/TabControlHandler.cs
index 7d14a8d0d6..aee5511341 100644
--- a/src/Eto.WinForms/Forms/Controls/TabControlHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/TabControlHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class TabControlHandler : WindowsContainer<swf.TabControl, TabControl, TabControl.ICallback>, TabControl.IHandler
diff --git a/src/Eto.WinForms/Forms/Controls/TabPageHandler.cs b/src/Eto.WinForms/Forms/Controls/TabPageHandler.cs
index 5c01314af8..a5d1822d0f 100644
--- a/src/Eto.WinForms/Forms/Controls/TabPageHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/TabPageHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class TabPageHandler : WindowsPanel<swf.TabPage, TabPage, TabPage.ICallback>, TabPage.IHandler
diff --git a/src/Eto.WinForms/Forms/Controls/TextAreaHandler.cs b/src/Eto.WinForms/Forms/Controls/TextAreaHandler.cs
index fe4ab7799b..8a523f8a90 100644
--- a/src/Eto.WinForms/Forms/Controls/TextAreaHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/TextAreaHandler.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Linq;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-using System.Runtime.InteropServices;
-using Eto.Drawing;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class TextAreaHandler : TextAreaHandler<TextArea, TextArea.ICallback>
diff --git a/src/Eto.WinForms/Forms/Controls/TextBoxHandler.cs b/src/Eto.WinForms/Forms/Controls/TextBoxHandler.cs
index d221eaab9f..0b02fef188 100644
--- a/src/Eto.WinForms/Forms/Controls/TextBoxHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/TextBoxHandler.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Linq;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-using System.Runtime.InteropServices;
-using System.ComponentModel;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	[DesignerCategory("Code")]
diff --git a/src/Eto.WinForms/Forms/Controls/TextStepperHandler.cs b/src/Eto.WinForms/Forms/Controls/TextStepperHandler.cs
index 03b67367de..aadf674704 100644
--- a/src/Eto.WinForms/Forms/Controls/TextStepperHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/TextStepperHandler.cs
@@ -1,14 +1,4 @@
-using Eto.Forms;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using System.Reflection;
-
-namespace Eto.WinForms.Forms.Controls
+namespace Eto.WinForms.Forms.Controls
 {
 	public class TextStepperHandler : TextBoxHandler<TextStepperHandler.EtoUpDown, TextStepper, TextStepper.ICallback>, TextStepper.IHandler
 	{
diff --git a/src/Eto.WinForms/Forms/Controls/ToggleButtonHandler.cs b/src/Eto.WinForms/Forms/Controls/ToggleButtonHandler.cs
index fe1662fc02..535f7807e2 100644
--- a/src/Eto.WinForms/Forms/Controls/ToggleButtonHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/ToggleButtonHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Linq;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class ToggleButtonHandler : ButtonHandler<ToggleButtonHandler.EtoButton, ToggleButton, ToggleButton.ICallback>, ToggleButton.IHandler
diff --git a/src/Eto.WinForms/Forms/Controls/TreeGridViewHandler.cs b/src/Eto.WinForms/Forms/Controls/TreeGridViewHandler.cs
index eab4cf41a2..e9c654b5bf 100644
--- a/src/Eto.WinForms/Forms/Controls/TreeGridViewHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/TreeGridViewHandler.cs
@@ -1,14 +1,4 @@
-using System;
-using System.Linq;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Forms;
-using System.Collections.Generic;
-using Eto.Drawing;
 using Eto.CustomControls;
-using System.Collections.Specialized;
-using System.Runtime.InteropServices;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class TreeGridViewHandler : GridHandler<TreeGridView, TreeGridView.ICallback>, TreeGridView.IHandler, ITreeHandler
diff --git a/src/Eto.WinForms/Forms/Controls/TreeViewHandler.cs b/src/Eto.WinForms/Forms/Controls/TreeViewHandler.cs
index 1ef999d5e6..24ea1f004b 100644
--- a/src/Eto.WinForms/Forms/Controls/TreeViewHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/TreeViewHandler.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Linq;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Forms;
-using System.Collections.Generic;
-using Eto.Drawing;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	[Obsolete("Since 2.4. TreeView is deprecated, please use TreeGridView instead.")]
diff --git a/src/Eto.WinForms/Forms/Controls/WebViewHandler.cs b/src/Eto.WinForms/Forms/Controls/WebViewHandler.cs
index 515aea61fe..9caa5545c2 100644
--- a/src/Eto.WinForms/Forms/Controls/WebViewHandler.cs
+++ b/src/Eto.WinForms/Forms/Controls/WebViewHandler.cs
@@ -1,14 +1,5 @@
-using System;
-using System.Linq;
 using SHDocVw;
-using swf = System.Windows.Forms;
-using Eto.Forms;
 using Eto.CustomControls;
-using System.Runtime.InteropServices;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Eto.Drawing;
-
 namespace Eto.WinForms.Forms.Controls
 {
 	public class WebViewHandler : WindowsControl<swf.WebBrowser, WebView, WebView.ICallback>, WebView.IHandler
diff --git a/src/Eto.WinForms/Forms/CursorHandler.cs b/src/Eto.WinForms/Forms/CursorHandler.cs
index a6d3184932..b87cbfdc14 100755
--- a/src/Eto.WinForms/Forms/CursorHandler.cs
+++ b/src/Eto.WinForms/Forms/CursorHandler.cs
@@ -1,11 +1,3 @@
-using System;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Forms;
-using Eto.Drawing;
-using System.IO;
-using System.Runtime.InteropServices;
-
 namespace Eto.WinForms.Forms
 {
 	public class CursorHandler : WidgetHandler<swf.Cursor, Cursor>, Cursor.IHandler
diff --git a/src/Eto.WinForms/Forms/DialogHandler.cs b/src/Eto.WinForms/Forms/DialogHandler.cs
index 2f536ad78a..90d126a6ce 100644
--- a/src/Eto.WinForms/Forms/DialogHandler.cs
+++ b/src/Eto.WinForms/Forms/DialogHandler.cs
@@ -1,10 +1,3 @@
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-using System;
-using System.Threading.Tasks;
-using Eto.Drawing;
-
 namespace Eto.WinForms.Forms
 {
     public class DialogHandler : WindowHandler<swf.Form, Dialog, Dialog.ICallback>, Dialog.IHandler
diff --git a/src/Eto.WinForms/Forms/Extensions.cs b/src/Eto.WinForms/Forms/Extensions.cs
index b554a4515d..1cfee31614 100644
--- a/src/Eto.WinForms/Forms/Extensions.cs
+++ b/src/Eto.WinForms/Forms/Extensions.cs
@@ -1,5 +1,3 @@
-using SD = System.Drawing;
-using Eto.Drawing;
 using Eto.WinForms.Drawing;
 
 namespace Eto.WinForms.Forms
@@ -14,12 +12,12 @@ public static void AddImage (this System.Windows.Forms.ImageList list, Image ima
 				return;
 			}
 
-			var sdimage = image.ControlObject as SD.Image;
+			var sdimage = image.ControlObject as sd.Image;
 			if (sdimage != null) {
 				list.Images.Add (key, sdimage);
 				return;
 			}
-			var icon = image.ControlObject as SD.Icon;
+			var icon = image.ControlObject as sd.Icon;
 			if (icon != null) {
 				list.Images.Add (key, icon);
 				return;
diff --git a/src/Eto.WinForms/Forms/FloatingFormHandler.cs b/src/Eto.WinForms/Forms/FloatingFormHandler.cs
index e0233e416d..2406add263 100755
--- a/src/Eto.WinForms/Forms/FloatingFormHandler.cs
+++ b/src/Eto.WinForms/Forms/FloatingFormHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms
 {
 	public class FloatingFormHandler : FormHandler, FloatingForm.IHandler
diff --git a/src/Eto.WinForms/Forms/FontDialogHandler.cs b/src/Eto.WinForms/Forms/FontDialogHandler.cs
index 36df2d0f74..21a9a3ba76 100755
--- a/src/Eto.WinForms/Forms/FontDialogHandler.cs
+++ b/src/Eto.WinForms/Forms/FontDialogHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.WinForms.Drawing;
 
 namespace Eto.WinForms.Forms
diff --git a/src/Eto.WinForms/Forms/FormHandler.cs b/src/Eto.WinForms/Forms/FormHandler.cs
index be31d1b03f..29a0384c5f 100644
--- a/src/Eto.WinForms/Forms/FormHandler.cs
+++ b/src/Eto.WinForms/Forms/FormHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms
 {
 	public delegate void WndProcDelegate(ref swf.Message m);
diff --git a/src/Eto.WinForms/Forms/HwndFormHandler.cs b/src/Eto.WinForms/Forms/HwndFormHandler.cs
old mode 100644
new mode 100755
index e98fab19b9..46efaed021
--- a/src/Eto.WinForms/Forms/HwndFormHandler.cs
+++ b/src/Eto.WinForms/Forms/HwndFormHandler.cs
@@ -1,13 +1,4 @@
-using Eto.Forms;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Eto.Drawing;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-
 #if WPF
-using swi = System.Windows.Interop;
 
 namespace Eto.Wpf.Forms
 #elif WINFORMS
@@ -29,7 +20,7 @@ System.Windows.Window IWpfWindow.Control
 		}
 		public void SetOwnerFor(System.Windows.Window child)
 		{
-			new swi.WindowInteropHelper(child).Owner = Control;
+			new swin.WindowInteropHelper(child).Owner = Control;
 		}
 #elif WINFORMS
 
diff --git a/src/Eto.WinForms/Forms/KeyboardHandler.cs b/src/Eto.WinForms/Forms/KeyboardHandler.cs
index e87379496f..ca79b22504 100644
--- a/src/Eto.WinForms/Forms/KeyboardHandler.cs
+++ b/src/Eto.WinForms/Forms/KeyboardHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using Eto.Forms;
-using swf = System.Windows.Forms;
-using System.Collections.Generic;
-
-namespace Eto.WinForms.Forms
+namespace Eto.WinForms.Forms
 {
 	public class KeyboardHandler : Keyboard.IHandler
 	{
diff --git a/src/Eto.WinForms/Forms/Menu/ButtonMenuItemHandler.cs b/src/Eto.WinForms/Forms/Menu/ButtonMenuItemHandler.cs
index 260b5bc001..85063ea47c 100644
--- a/src/Eto.WinForms/Forms/Menu/ButtonMenuItemHandler.cs
+++ b/src/Eto.WinForms/Forms/Menu/ButtonMenuItemHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Linq;
-using SD = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms.Menu
 {
 	public class ButtonMenuItemHandler : ButtonMenuItemHandler<ButtonMenuItem, ButtonMenuItem.ICallback>
diff --git a/src/Eto.WinForms/Forms/Menu/CheckMenuItemHandler.cs b/src/Eto.WinForms/Forms/Menu/CheckMenuItemHandler.cs
index a90e2c3e8a..d066b42e29 100644
--- a/src/Eto.WinForms/Forms/Menu/CheckMenuItemHandler.cs
+++ b/src/Eto.WinForms/Forms/Menu/CheckMenuItemHandler.cs
@@ -1,15 +1,10 @@
-using System;
-using SD = System.Drawing;
-using SWF = System.Windows.Forms;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms.Menu
 {
-	public class CheckMenuItemHandler : MenuItemHandler<SWF.ToolStripMenuItem, CheckMenuItem, CheckMenuItem.ICallback>, CheckMenuItem.IHandler
+	public class CheckMenuItemHandler : MenuItemHandler<swf.ToolStripMenuItem, CheckMenuItem, CheckMenuItem.ICallback>, CheckMenuItem.IHandler
 	{
 		public CheckMenuItemHandler()
 		{
-			Control = new SWF.ToolStripMenuItem();
+			Control = new swf.ToolStripMenuItem();
 			Control.Click += (sender, e) =>
 			{
 				Control.Checked = !Control.Checked;
diff --git a/src/Eto.WinForms/Forms/Menu/ContextMenuHandler.cs b/src/Eto.WinForms/Forms/Menu/ContextMenuHandler.cs
index 2a70fa8a9b..207b6b09e0 100644
--- a/src/Eto.WinForms/Forms/Menu/ContextMenuHandler.cs
+++ b/src/Eto.WinForms/Forms/Menu/ContextMenuHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Linq;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.WinForms.Forms.Menu
 {
 	public class ContextMenuHandler : WidgetHandler<swf.ContextMenuStrip, ContextMenu, ContextMenu.ICallback>, ContextMenu.IHandler
diff --git a/src/Eto.WinForms/Forms/Menu/MenuBarHandler.cs b/src/Eto.WinForms/Forms/Menu/MenuBarHandler.cs
index 69715d55ae..385c8a9149 100644
--- a/src/Eto.WinForms/Forms/Menu/MenuBarHandler.cs
+++ b/src/Eto.WinForms/Forms/Menu/MenuBarHandler.cs
@@ -1,27 +1,23 @@
-using SWF = System.Windows.Forms;
-using Eto.Forms;
-using System.Collections.Generic;
-
 namespace Eto.WinForms.Forms.Menu
 {
-	public class MenuBarHandler : WidgetHandler<SWF.MenuStrip, MenuBar>, MenuBar.IHandler
+	public class MenuBarHandler : WidgetHandler<swf.MenuStrip, MenuBar>, MenuBar.IHandler
 	{
 		public MenuBarHandler()
 		{
-			Control = new SWF.MenuStrip { Visible = false };
+			Control = new swf.MenuStrip { Visible = false };
 		}
 
 		#region IMenu Members
 
 		public void AddMenu(int index, MenuItem item)
 		{
-			Control.Items.Insert(index, (SWF.ToolStripItem)item.ControlObject);
+			Control.Items.Insert(index, (swf.ToolStripItem)item.ControlObject);
 			Control.Visible = true;
 		}
 
 		public void RemoveMenu(MenuItem item)
 		{
-			Control.Items.Remove((SWF.ToolStripItem)item.ControlObject);
+			Control.Items.Remove((swf.ToolStripItem)item.ControlObject);
 			Control.Visible = Control.Items.Count > 0;
 		}
 
diff --git a/src/Eto.WinForms/Forms/Menu/MenuHandler.cs b/src/Eto.WinForms/Forms/Menu/MenuHandler.cs
index d811c8d18e..0bf48255ee 100644
--- a/src/Eto.WinForms/Forms/Menu/MenuHandler.cs
+++ b/src/Eto.WinForms/Forms/Menu/MenuHandler.cs
@@ -1,6 +1,3 @@
-using SWF = System.Windows.Forms;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms.Menu
 {
 	interface IMenuItemHandler
@@ -8,12 +5,12 @@ interface IMenuItemHandler
 		Keys Shortcut { get; }
 		bool Enabled { get; }
 		MenuItem Widget { get; }
-		SWF.ToolStripMenuItem Control { get; }
+		swf.ToolStripMenuItem Control { get; }
 		MenuItem.ICallback Callback { get; }
 	}
 
 	public abstract class MenuItemHandler<TControl, TWidget, TCallback> : MenuHandler<TControl, TWidget, TCallback>, Eto.Forms.MenuItem.IHandler, IMenuItemHandler
-		where TControl: SWF.ToolStripMenuItem
+		where TControl: swf.ToolStripMenuItem
 		where TCallback: MenuItem.ICallback
 		where TWidget: MenuItem
 	{
@@ -49,14 +46,14 @@ public Keys Shortcut
 			set
 			{
 				var key = value.ToSWF();
-				if (!value.HasFlag(Keys.Application) && SWF.ToolStripManager.IsValidShortcut(key))
+				if (!value.HasFlag(Keys.Application) && swf.ToolStripManager.IsValidShortcut(key))
 				{
 					Control.ShortcutKeys = key;
 					Widget.Properties.Set(CustomShortcutKey, default(Keys));
 				}
 				else
 				{
-					Control.ShortcutKeys = SWF.Keys.None;
+					Control.ShortcutKeys = swf.Keys.None;
 					Widget.Properties.Set(CustomShortcutKey, value);
 					if (value != Keys.None)
 						Control.ShortcutKeyDisplayString = value.ToShortcutString();
@@ -70,7 +67,7 @@ MenuItem IMenuItemHandler.Widget
 			get { return Widget; }
 		}
 
-		SWF.ToolStripMenuItem IMenuItemHandler.Control
+		swf.ToolStripMenuItem IMenuItemHandler.Control
 		{
 			get { return Control; }
 		}
@@ -82,7 +79,7 @@ MenuItem.ICallback IMenuItemHandler.Callback
 	}
 
 	public abstract class MenuHandler<TControl, TWidget, TCallback> : WidgetHandler<TControl, TWidget, TCallback>, Eto.Forms.Menu.IHandler
-		where TControl: SWF.ToolStripItem
+		where TControl: swf.ToolStripItem
 		where TWidget: Widget
 	{
 
diff --git a/src/Eto.WinForms/Forms/Menu/RadioMenuItemHandler.cs b/src/Eto.WinForms/Forms/Menu/RadioMenuItemHandler.cs
index 5342ee2727..043a5954ba 100644
--- a/src/Eto.WinForms/Forms/Menu/RadioMenuItemHandler.cs
+++ b/src/Eto.WinForms/Forms/Menu/RadioMenuItemHandler.cs
@@ -1,20 +1,12 @@
-using System;
-using System.Collections;
-using SD = System.Drawing;
-using SWF = System.Windows.Forms;
-using Eto.Forms;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.WinForms.Forms.Menu
 {
-	public class RadioMenuItemHandler : MenuItemHandler<SWF.ToolStripMenuItem, RadioMenuItem, RadioMenuItem.ICallback>, RadioMenuItem.IHandler
+	public class RadioMenuItemHandler : MenuItemHandler<swf.ToolStripMenuItem, RadioMenuItem, RadioMenuItem.ICallback>, RadioMenuItem.IHandler
 	{
 		List<RadioMenuItem> group;
 
 		public RadioMenuItemHandler()
 		{
-			Control = new SWF.ToolStripMenuItem();
+			Control = new swf.ToolStripMenuItem();
 			Control.Click += control_Click;
 		}
 
diff --git a/src/Eto.WinForms/Forms/Menu/SeparatorMenuItem.cs b/src/Eto.WinForms/Forms/Menu/SeparatorMenuItem.cs
index 2b5a245cce..4a3e81d65c 100644
--- a/src/Eto.WinForms/Forms/Menu/SeparatorMenuItem.cs
+++ b/src/Eto.WinForms/Forms/Menu/SeparatorMenuItem.cs
@@ -1,16 +1,11 @@
-using SD = System.Drawing;
-using SWF = System.Windows.Forms;
-using Eto.Forms;
-using System;
-
 namespace Eto.WinForms.Forms.Menu
 {
-	public class SeparatorMenuItemHandler : MenuHandler<SWF.ToolStripSeparator, SeparatorMenuItem, SeparatorMenuItem.ICallback>, SeparatorMenuItem.IHandler
+	public class SeparatorMenuItemHandler : MenuHandler<swf.ToolStripSeparator, SeparatorMenuItem, SeparatorMenuItem.ICallback>, SeparatorMenuItem.IHandler
 	{
 		
 		public SeparatorMenuItemHandler()
 		{
-			Control = new SWF.ToolStripSeparator();
+			Control = new swf.ToolStripSeparator();
 		}
 
 		public string Text
diff --git a/src/Eto.WinForms/Forms/Menu/SubMenuItemHandler.cs b/src/Eto.WinForms/Forms/Menu/SubMenuItemHandler.cs
index 69108b001b..ab4f36d539 100755
--- a/src/Eto.WinForms/Forms/Menu/SubMenuItemHandler.cs
+++ b/src/Eto.WinForms/Forms/Menu/SubMenuItemHandler.cs
@@ -1,7 +1,3 @@
-using swf = System.Windows.Forms;
-using Eto.Forms;
-using System;
-
 namespace Eto.WinForms.Forms.Menu
 {
 	public class SubMenuItemHandler : ButtonMenuItemHandler<SubMenuItem, SubMenuItem.ICallback>, SubMenuItem.IHandler
diff --git a/src/Eto.WinForms/Forms/MessageBoxHandler.cs b/src/Eto.WinForms/Forms/MessageBoxHandler.cs
index 59d8e1ce4e..e00f06a7d2 100644
--- a/src/Eto.WinForms/Forms/MessageBoxHandler.cs
+++ b/src/Eto.WinForms/Forms/MessageBoxHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms
 {
 	public class MessageBoxHandler : WidgetHandler<Widget>, MessageBox.IHandler
diff --git a/src/Eto.WinForms/Forms/MouseHandler.cs b/src/Eto.WinForms/Forms/MouseHandler.cs
index 750bc4bbc3..e4efcb5fba 100644
--- a/src/Eto.WinForms/Forms/MouseHandler.cs
+++ b/src/Eto.WinForms/Forms/MouseHandler.cs
@@ -1,7 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-using swf = System.Windows.Forms;
-
 namespace Eto.WinForms.Forms
 {
 	public class MouseHandler : Mouse.IHandler
diff --git a/src/Eto.WinForms/Forms/NativeFormHandler.cs b/src/Eto.WinForms/Forms/NativeFormHandler.cs
index 367c05115f..176f9610c9 100644
--- a/src/Eto.WinForms/Forms/NativeFormHandler.cs
+++ b/src/Eto.WinForms/Forms/NativeFormHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using swf = System.Windows.Forms;
-
 namespace Eto.WinForms.Forms
 {
 	public class NativeFormHandler : WindowHandler<swf.Form, Form, Form.ICallback>, Form.IHandler
diff --git a/src/Eto.WinForms/Forms/OpenFileDialogHandler.cs b/src/Eto.WinForms/Forms/OpenFileDialogHandler.cs
index e5e486390d..0dc993968b 100644
--- a/src/Eto.WinForms/Forms/OpenFileDialogHandler.cs
+++ b/src/Eto.WinForms/Forms/OpenFileDialogHandler.cs
@@ -1,15 +1,10 @@
-using SD = System.Drawing;
-using SWF = System.Windows.Forms;
-using Eto.Forms;
-using System.Collections.Generic;
-
 namespace Eto.WinForms.Forms
 {
-	public class OpenFileDialogHandler : WindowsFileDialog<SWF.OpenFileDialog, OpenFileDialog>, OpenFileDialog.IHandler
+	public class OpenFileDialogHandler : WindowsFileDialog<swf.OpenFileDialog, OpenFileDialog>, OpenFileDialog.IHandler
 	{
 		public OpenFileDialogHandler()
 		{
-			Control = new SWF.OpenFileDialog();
+			Control = new swf.OpenFileDialog();
 		}
 
 		public bool MultiSelect
diff --git a/src/Eto.WinForms/Forms/OpenWithDialogHandler.cs b/src/Eto.WinForms/Forms/OpenWithDialogHandler.cs
index 4478b21761..18d6daf8b6 100644
--- a/src/Eto.WinForms/Forms/OpenWithDialogHandler.cs
+++ b/src/Eto.WinForms/Forms/OpenWithDialogHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using Eto.Forms;
-
-namespace Eto.WinForms.Forms
+namespace Eto.WinForms.Forms
 {
 	public class OpenWithDialogHandler : WidgetHandler<System.Windows.Forms.CommonDialog, OpenWithDialog, OpenWithDialog.ICallback>, OpenWithDialog.IHandler
     {
diff --git a/src/Eto.WinForms/Forms/PixelLayoutHandler.cs b/src/Eto.WinForms/Forms/PixelLayoutHandler.cs
index 3b86995955..7d6918942d 100644
--- a/src/Eto.WinForms/Forms/PixelLayoutHandler.cs
+++ b/src/Eto.WinForms/Forms/PixelLayoutHandler.cs
@@ -1,8 +1,3 @@
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.WinForms.Forms
 {
 	public class PixelLayoutHandler : WindowsContainer<PixelLayoutHandler.Panel, PixelLayout, PixelLayout.ICallback>, PixelLayout.IHandler
diff --git a/src/Eto.WinForms/Forms/Printing/PrintDialogHandler.cs b/src/Eto.WinForms/Forms/Printing/PrintDialogHandler.cs
index 1a908e5508..a28336a4c2 100644
--- a/src/Eto.WinForms/Forms/Printing/PrintDialogHandler.cs
+++ b/src/Eto.WinForms/Forms/Printing/PrintDialogHandler.cs
@@ -1,7 +1,4 @@
-using swf = System.Windows.Forms;
 using sdp = System.Drawing.Printing;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms.Printing
 {
 	public class PrintDialogHandler : WidgetHandler<swf.PrintDialog, PrintDialog>, PrintDialog.IHandler
diff --git a/src/Eto.WinForms/Forms/Printing/PrintDocumentHandler.cs b/src/Eto.WinForms/Forms/Printing/PrintDocumentHandler.cs
index 8d6885344f..eed4594afb 100644
--- a/src/Eto.WinForms/Forms/Printing/PrintDocumentHandler.cs
+++ b/src/Eto.WinForms/Forms/Printing/PrintDocumentHandler.cs
@@ -1,10 +1,4 @@
-using swf = System.Windows.Forms;
 using sdp = System.Drawing.Printing;
-using sd = System.Drawing;
-using Eto.Forms;
-using Eto.Drawing;
-using System;
-
 namespace Eto.WinForms.Forms.Printing
 {
 	public class PrintDocumentHandler : WidgetHandler<sdp.PrintDocument, PrintDocument, PrintDocument.ICallback>, PrintDocument.IHandler
diff --git a/src/Eto.WinForms/Forms/Printing/PrintPreviewDialogHandler.cs b/src/Eto.WinForms/Forms/Printing/PrintPreviewDialogHandler.cs
index 8650e9a48d..3ac8897cf0 100755
--- a/src/Eto.WinForms/Forms/Printing/PrintPreviewDialogHandler.cs
+++ b/src/Eto.WinForms/Forms/Printing/PrintPreviewDialogHandler.cs
@@ -1,10 +1,4 @@
-using swf = System.Windows.Forms;
 using sdp = System.Drawing.Printing;
-using sd = System.Drawing;
-using Eto.Forms;
-using System;
-using System.Linq;
-
 namespace Eto.WinForms.Forms.Printing
 {
 	public class PrintPreviewDialogHandler : WidgetHandler<swf.PrintPreviewDialog, PrintPreviewDialog>, PrintPreviewDialog.IHandler
diff --git a/src/Eto.WinForms/Forms/Printing/PrintSettingsHandler.cs b/src/Eto.WinForms/Forms/Printing/PrintSettingsHandler.cs
index 42ed24b33e..d243876245 100644
--- a/src/Eto.WinForms/Forms/Printing/PrintSettingsHandler.cs
+++ b/src/Eto.WinForms/Forms/Printing/PrintSettingsHandler.cs
@@ -1,7 +1,4 @@
 using sdp = System.Drawing.Printing;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms.Printing
 {
 	public class PrintSettingsHandler : WidgetHandler<sdp.PrinterSettings, PrintSettings>, PrintSettings.IHandler
diff --git a/src/Eto.WinForms/Forms/SaveFileDialogHandler.cs b/src/Eto.WinForms/Forms/SaveFileDialogHandler.cs
index 29a8a90fad..bef2f5bf5f 100644
--- a/src/Eto.WinForms/Forms/SaveFileDialogHandler.cs
+++ b/src/Eto.WinForms/Forms/SaveFileDialogHandler.cs
@@ -1,15 +1,11 @@
-using SD = System.Drawing;
-using SWF = System.Windows.Forms;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms
 {
-	public class SaveFileDialogHandler : WindowsFileDialog<SWF.SaveFileDialog, SaveFileDialog>, SaveFileDialog.IHandler
+	public class SaveFileDialogHandler : WindowsFileDialog<swf.SaveFileDialog, SaveFileDialog>, SaveFileDialog.IHandler
 	{
 
 		public SaveFileDialogHandler()
 		{
-			Control = new SWF.SaveFileDialog();
+			Control = new swf.SaveFileDialog();
 		}
 
 	}
diff --git a/src/Eto.WinForms/Forms/ScreenHandler.cs b/src/Eto.WinForms/Forms/ScreenHandler.cs
index 4889bda583..85c13b5c68 100755
--- a/src/Eto.WinForms/Forms/ScreenHandler.cs
+++ b/src/Eto.WinForms/Forms/ScreenHandler.cs
@@ -1,11 +1,4 @@
-using System;
-using Eto.Forms;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Drawing;
 using Eto.WinForms.Drawing;
-using System.Runtime.InteropServices;
-
 namespace Eto.WinForms.Forms
 {
 	public class ScreenHandler : WidgetHandler<swf.Screen, Screen>, Screen.IHandler
diff --git a/src/Eto.WinForms/Forms/ScreensHandler.cs b/src/Eto.WinForms/Forms/ScreensHandler.cs
index b9d625ec2a..5c635e3f74 100644
--- a/src/Eto.WinForms/Forms/ScreensHandler.cs
+++ b/src/Eto.WinForms/Forms/ScreensHandler.cs
@@ -1,8 +1,3 @@
-using Eto.Forms;
-using System.Collections.Generic;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-
 namespace Eto.WinForms.Forms
 {
 	public class ScreensHandler : Screen.IScreensHandler
diff --git a/src/Eto.WinForms/Forms/SelectFolderDialogHandler.cs b/src/Eto.WinForms/Forms/SelectFolderDialogHandler.cs
index 7f3d0894bd..404c3a4e59 100644
--- a/src/Eto.WinForms/Forms/SelectFolderDialogHandler.cs
+++ b/src/Eto.WinForms/Forms/SelectFolderDialogHandler.cs
@@ -1,14 +1,10 @@
-using SWF = System.Windows.Forms;
-using SD = System.Drawing;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms
 {
-	public class SelectFolderDialogHandler : WidgetHandler<SWF.FolderBrowserDialog, SelectFolderDialog>, SelectFolderDialog.IHandler
+	public class SelectFolderDialogHandler : WidgetHandler<swf.FolderBrowserDialog, SelectFolderDialog>, SelectFolderDialog.IHandler
 	{
 		public SelectFolderDialogHandler ()
 		{
-			Control = new SWF.FolderBrowserDialog();
+			Control = new swf.FolderBrowserDialog();
 		}
 	
 
@@ -17,8 +13,8 @@ public DialogResult ShowDialog (Window parent)
 			if (parent?.HasFocus == false)
 				parent.Focus();
 
-			SWF.DialogResult dr;
-			if (parent != null) dr = Control.ShowDialog((SWF.IWin32Window)parent.ControlObject);
+			swf.DialogResult dr;
+			if (parent != null) dr = Control.ShowDialog((swf.IWin32Window)parent.ControlObject);
 			else dr = Control.ShowDialog();
 			return dr.ToEto ();
 		}
diff --git a/src/Eto.WinForms/Forms/SwfDragEventArgs.cs b/src/Eto.WinForms/Forms/SwfDragEventArgs.cs
index a5829ed9e1..14480c4b06 100644
--- a/src/Eto.WinForms/Forms/SwfDragEventArgs.cs
+++ b/src/Eto.WinForms/Forms/SwfDragEventArgs.cs
@@ -1,7 +1,3 @@
-using swf = System.Windows.Forms;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms
 {
 	class SwfDragEventArgs : DragEventArgs
diff --git a/src/Eto.WinForms/Forms/SwfShellDropBehavior.cs b/src/Eto.WinForms/Forms/SwfShellDropBehavior.cs
index 565d1b5d3d..c090923134 100644
--- a/src/Eto.WinForms/Forms/SwfShellDropBehavior.cs
+++ b/src/Eto.WinForms/Forms/SwfShellDropBehavior.cs
@@ -1,7 +1,3 @@
-using System;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-
 namespace Eto.WinForms.Forms
 {
 	public class SwfShellDropBehavior
diff --git a/src/Eto.WinForms/Forms/TableLayoutHandler.cs b/src/Eto.WinForms/Forms/TableLayoutHandler.cs
index 3d51da6a4a..02caa532d5 100644
--- a/src/Eto.WinForms/Forms/TableLayoutHandler.cs
+++ b/src/Eto.WinForms/Forms/TableLayoutHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Linq;
-
 namespace Eto.WinForms.Forms
 {
 	public class TableLayoutHandler : WindowsContainer<swf.TableLayoutPanel, TableLayout, TableLayout.ICallback>, TableLayout.IHandler
diff --git a/src/Eto.WinForms/Forms/ToolBar/ButtonToolItemHandler.cs b/src/Eto.WinForms/Forms/ToolBar/ButtonToolItemHandler.cs
index 58d5460df3..5c4d5cb190 100644
--- a/src/Eto.WinForms/Forms/ToolBar/ButtonToolItemHandler.cs
+++ b/src/Eto.WinForms/Forms/ToolBar/ButtonToolItemHandler.cs
@@ -1,15 +1,10 @@
-using System;
-using SD = System.Drawing;
-using SWF = System.Windows.Forms;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms.ToolBar
 {
-	public class ButtonToolItemHandler : ToolItemHandler<SWF.ToolStripButton, ButtonToolItem>, ButtonToolItem.IHandler
+	public class ButtonToolItemHandler : ToolItemHandler<swf.ToolStripButton, ButtonToolItem>, ButtonToolItem.IHandler
 	{
 		public ButtonToolItemHandler()
 		{
-			Control = new SWF.ToolStripButton();
+			Control = new swf.ToolStripButton();
 			Control.Tag = this;
 			Control.Click += control_Click;
 		}
diff --git a/src/Eto.WinForms/Forms/ToolBar/CheckToolItemHandler.cs b/src/Eto.WinForms/Forms/ToolBar/CheckToolItemHandler.cs
index 881652a964..8254212ac1 100644
--- a/src/Eto.WinForms/Forms/ToolBar/CheckToolItemHandler.cs
+++ b/src/Eto.WinForms/Forms/ToolBar/CheckToolItemHandler.cs
@@ -1,15 +1,10 @@
-using System;
-using SD = System.Drawing;
-using SWF = System.Windows.Forms;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms.ToolBar
 {
-	public class CheckToolItemHandler : ToolItemHandler<SWF.ToolStripButton, CheckToolItem>, CheckToolItem.IHandler
+	public class CheckToolItemHandler : ToolItemHandler<swf.ToolStripButton, CheckToolItem>, CheckToolItem.IHandler
 	{
 		public CheckToolItemHandler()
 		{
-			Control = new SWF.ToolStripButton();
+			Control = new swf.ToolStripButton();
 			Control.Tag = this;
 			Control.Click += control_Click;
 		}
diff --git a/src/Eto.WinForms/Forms/ToolBar/DropDownToolItemHandler.cs b/src/Eto.WinForms/Forms/ToolBar/DropDownToolItemHandler.cs
index 8d215f0b97..c55e0b3692 100644
--- a/src/Eto.WinForms/Forms/ToolBar/DropDownToolItemHandler.cs
+++ b/src/Eto.WinForms/Forms/ToolBar/DropDownToolItemHandler.cs
@@ -1,17 +1,12 @@
-using System;
-using SD = System.Drawing;
-using SWF = System.Windows.Forms;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms.ToolBar
 {
-	public class DropDownToolItemHandler : ToolItemHandler<SWF.ToolStripDropDownButton, DropDownToolItem>, DropDownToolItem.IHandler
+	public class DropDownToolItemHandler : ToolItemHandler<swf.ToolStripDropDownButton, DropDownToolItem>, DropDownToolItem.IHandler
 	{
 		bool openedHandled;
 
 		public DropDownToolItemHandler()
 		{
-			Control = new SWF.ToolStripDropDownButton();
+			Control = new swf.ToolStripDropDownButton();
 			Control.Tag = this;
 			Control.Click += control_Click;
 		}
@@ -53,7 +48,7 @@ public override void CreateControl(ToolBarHandler handler, int index)
 		
 		public void AddMenu(int index, MenuItem item)
 		{
-			Control.DropDownItems.Insert(index, (SWF.ToolStripItem)item.ControlObject);
+			Control.DropDownItems.Insert(index, (swf.ToolStripItem)item.ControlObject);
 			if (!openedHandled)
 			{
 				Control.DropDownOpening += HandleDropDownOpened;
@@ -63,7 +58,7 @@ public void AddMenu(int index, MenuItem item)
 
 		public void RemoveMenu(MenuItem item)
 		{
-			Control.DropDownItems.Remove((SWF.ToolStripItem)item.ControlObject);
+			Control.DropDownItems.Remove((swf.ToolStripItem)item.ControlObject);
 		}
 
 		public void Clear()
diff --git a/src/Eto.WinForms/Forms/ToolBar/RadioToolItemHandler.cs b/src/Eto.WinForms/Forms/ToolBar/RadioToolItemHandler.cs
index 20708b5f0d..b5beba3939 100644
--- a/src/Eto.WinForms/Forms/ToolBar/RadioToolItemHandler.cs
+++ b/src/Eto.WinForms/Forms/ToolBar/RadioToolItemHandler.cs
@@ -1,16 +1,10 @@
-using System;
-using System.Linq;
-using SD = System.Drawing;
-using SWF = System.Windows.Forms;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms.ToolBar
 {
-	public class RadioToolItemHandler : ToolItemHandler<SWF.ToolStripButton, RadioToolItem>, RadioToolItem.IHandler
+	public class RadioToolItemHandler : ToolItemHandler<swf.ToolStripButton, RadioToolItem>, RadioToolItem.IHandler
 	{
 		public RadioToolItemHandler()
 		{
-			Control = new SWF.ToolStripButton();
+			Control = new swf.ToolStripButton();
 			Control.Tag = this;
 			Control.Click += control_Click;
 		}
@@ -20,7 +14,7 @@ void control_Click(object sender, EventArgs e)
 			var parent = Control.GetCurrentParent();
 			if (parent != null)
 			{
-				foreach (var button in parent.Items.OfType<SWF.ToolStripButton>().Select(r => r.Tag).OfType<RadioToolItemHandler>().Where(r => r != this))
+				foreach (var button in parent.Items.OfType<swf.ToolStripButton>().Select(r => r.Tag).OfType<RadioToolItemHandler>().Where(r => r != this))
 				{
 					button.Checked = false;
 				}
diff --git a/src/Eto.WinForms/Forms/ToolBar/SeparatorToolBarItemHandler.cs b/src/Eto.WinForms/Forms/ToolBar/SeparatorToolBarItemHandler.cs
index 880d2f3389..b147b3d7cd 100644
--- a/src/Eto.WinForms/Forms/ToolBar/SeparatorToolBarItemHandler.cs
+++ b/src/Eto.WinForms/Forms/ToolBar/SeparatorToolBarItemHandler.cs
@@ -1,15 +1,10 @@
-using SD = System.Drawing;
-using SWF = System.Windows.Forms;
-using Eto.Forms;
-using System;
-
 namespace Eto.WinForms.Forms.ToolBar
 {
-	public class SeparatorToolBarItemHandler : ToolItemHandler<SWF.ToolStripSeparator, SeparatorToolItem>, SeparatorToolItem.IHandler, IToolBarItemHandler
+	public class SeparatorToolBarItemHandler : ToolItemHandler<swf.ToolStripSeparator, SeparatorToolItem>, SeparatorToolItem.IHandler, IToolBarItemHandler
 	{
 		public SeparatorToolBarItemHandler()
 		{
-			Control = new SWF.ToolStripSeparator();
+			Control = new swf.ToolStripSeparator();
 		}
 
 		public override void CreateControl(ToolBarHandler handler, int index)
diff --git a/src/Eto.WinForms/Forms/ToolBar/ToolBarHandler.cs b/src/Eto.WinForms/Forms/ToolBar/ToolBarHandler.cs
index d5e1462fd1..9e41c88b91 100644
--- a/src/Eto.WinForms/Forms/ToolBar/ToolBarHandler.cs
+++ b/src/Eto.WinForms/Forms/ToolBar/ToolBarHandler.cs
@@ -1,8 +1,3 @@
-using SD = System.Drawing;
-using SWF = System.Windows.Forms;
-using Eto.Forms;
-using System;
-
 namespace Eto.WinForms.Forms.ToolBar
 {
 	public class ToolBarHandler : WidgetHandler<ToolStripEx, Eto.Forms.ToolBar>, Eto.Forms.ToolBar.IHandler
@@ -29,7 +24,7 @@ public void AddButton(ToolItem item, int index)
 
 		public void RemoveButton(ToolItem item, int index)
 		{
-			Control.Items.Remove((SWF.ToolStripItem)item.ControlObject);
+			Control.Items.Remove((swf.ToolStripItem)item.ControlObject);
 		}
 
 		public ToolBarTextAlign TextAlign
@@ -38,10 +33,10 @@ public ToolBarTextAlign TextAlign
 			{
 				/*switch (control.TextAlign)
 				{
-					case SWF.ToolBarTextAlign.Right:
+					case swf.ToolBarTextAlign.Right:
 						return ToolBarTextAlign.Right;
 					default:
-					case SWF.ToolBarTextAlign.Underneath:
+					case swf.ToolBarTextAlign.Underneath:
 						return ToolBarTextAlign.Underneath;
 				}
 				 */
@@ -52,10 +47,10 @@ public ToolBarTextAlign TextAlign
 				switch (value)
 				{
 					case ToolBarTextAlign.Right:
-						//control.TextAlign = SWF.ToolBarTextAlign.Right;
+						//control.TextAlign = swf.ToolBarTextAlign.Right;
 						break;
 					case ToolBarTextAlign.Underneath:
-						//control.TextAlign = SWF.ToolBarTextAlign.Underneath;
+						//control.TextAlign = swf.ToolBarTextAlign.Underneath;
 						break;
 					default:
 						throw new NotSupportedException();
@@ -74,7 +69,7 @@ public void Clear()
 	/// <see cref="http://blogs.msdn.com/b/rickbrew/archive/2006/01/09/511003.aspx"/>
 	/// </summary>
 	public class ToolStripEx
-		: SWF.ToolStrip
+		: swf.ToolStrip
 	{
 		/// <summary>
 		/// Gets or sets whether the ToolStripEx honors item clicks when its containing form does
@@ -85,7 +80,7 @@ public class ToolStripEx
 		/// </remarks>
 		public bool ClickThrough { get; set; }
 
-		protected override void WndProc(ref SWF.Message m)
+		protected override void WndProc(ref swf.Message m)
 		{
 			base.WndProc(ref m);
 			if (this.ClickThrough &&
diff --git a/src/Eto.WinForms/Forms/ToolBar/ToolItemHandler.cs b/src/Eto.WinForms/Forms/ToolBar/ToolItemHandler.cs
index 6163682951..737eb342ef 100644
--- a/src/Eto.WinForms/Forms/ToolBar/ToolItemHandler.cs
+++ b/src/Eto.WinForms/Forms/ToolBar/ToolItemHandler.cs
@@ -1,9 +1,3 @@
-using SWF = System.Windows.Forms;
-using SD = System.Drawing;
-using Eto.Forms;
-using Eto.Drawing;
-using System;
-
 namespace Eto.WinForms.Forms.ToolBar
 {
 	public interface IToolBarItemHandler
@@ -12,7 +6,7 @@ public interface IToolBarItemHandler
 	}
 
 	public abstract class ToolItemHandler<TControl, TWidget> : WidgetHandler<TControl, TWidget>, ToolItem.IHandler, IToolBarItemHandler
-		where TControl : SWF.ToolStripItem
+		where TControl : swf.ToolStripItem
 		where TWidget : ToolItem
 	{
 		Image image;
diff --git a/src/Eto.WinForms/Forms/TrayIndicatorHandler.cs b/src/Eto.WinForms/Forms/TrayIndicatorHandler.cs
index 285d0ddf08..12ce914137 100644
--- a/src/Eto.WinForms/Forms/TrayIndicatorHandler.cs
+++ b/src/Eto.WinForms/Forms/TrayIndicatorHandler.cs
@@ -1,13 +1,8 @@
-using Eto.Drawing;
-using Eto.Forms;
-using System;
-using Sd = System.Drawing;
-using Swf = System.Windows.Forms;
-using Eto.WinForms.Forms.Menu;
+using Eto.WinForms.Forms.Menu;
 
 namespace Eto.WinForms.Forms
 {
-    public class TrayIndicatorHandler : WidgetHandler<Swf.NotifyIcon, TrayIndicator, TrayIndicator.ICallback>, TrayIndicator.IHandler
+    public class TrayIndicatorHandler : WidgetHandler<swf.NotifyIcon, TrayIndicator, TrayIndicator.ICallback>, TrayIndicator.IHandler
     {
 		Image _image;
 		ContextMenu _menu;
@@ -33,8 +28,8 @@ public Image Image
 					Control.Icon = null;
 				else
 				{
-					var bitmap = new Sd.Bitmap(_image.ToSD());
-					Control.Icon = Sd.Icon.FromHandle(bitmap.GetHicon());
+					var bitmap = new sd.Bitmap(_image.ToSD());
+					Control.Icon = sd.Icon.FromHandle(bitmap.GetHicon());
 				}
 			}
 		}
@@ -51,7 +46,7 @@ public ContextMenu Menu
 
 		public TrayIndicatorHandler()
         {
-            Control = new Swf.NotifyIcon();
+            Control = new swf.NotifyIcon();
         }
 
         public override void AttachEvent(string id)
@@ -61,7 +56,7 @@ public override void AttachEvent(string id)
                 case TrayIndicator.ActivatedEvent:
                     Control.MouseClick += (sender, e) =>
                     {
-                        if (e.Button.HasFlag(Swf.MouseButtons.Left))
+                        if (e.Button.HasFlag(swf.MouseButtons.Left))
                             Callback.OnActivated(Widget, EventArgs.Empty);
                     };
                     break;
diff --git a/src/Eto.WinForms/Forms/UITimerHandler.cs b/src/Eto.WinForms/Forms/UITimerHandler.cs
index 6975c62fc0..98165bd25b 100644
--- a/src/Eto.WinForms/Forms/UITimerHandler.cs
+++ b/src/Eto.WinForms/Forms/UITimerHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.WinForms.Forms
 {
 	public class UITimerHandler : WidgetHandler<System.Windows.Forms.Timer, UITimer, UITimer.ICallback>, UITimer.IHandler
diff --git a/src/Eto.WinForms/Forms/WindowHandler.cs b/src/Eto.WinForms/Forms/WindowHandler.cs
index 2fe9f70739..152a67bcf3 100755
--- a/src/Eto.WinForms/Forms/WindowHandler.cs
+++ b/src/Eto.WinForms/Forms/WindowHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.ComponentModel;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.WinForms.Forms;
 using Eto.WinForms.Drawing;
 
diff --git a/src/Eto.WinForms/Forms/WindowsContainer.cs b/src/Eto.WinForms/Forms/WindowsContainer.cs
index b7ae15cc46..77a7cba8b8 100644
--- a/src/Eto.WinForms/Forms/WindowsContainer.cs
+++ b/src/Eto.WinForms/Forms/WindowsContainer.cs
@@ -1,12 +1,4 @@
-using System;
-using System.Linq;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.WinForms.Forms.Controls;
-using System.Collections.Generic;
-
 namespace Eto.WinForms.Forms
 {
 
diff --git a/src/Eto.WinForms/Forms/WindowsControl.cs b/src/Eto.WinForms/Forms/WindowsControl.cs
index 39591f6445..ece795da7b 100644
--- a/src/Eto.WinForms/Forms/WindowsControl.cs
+++ b/src/Eto.WinForms/Forms/WindowsControl.cs
@@ -1,15 +1,5 @@
-using System;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.WinForms.Drawing;
-using System.Collections.Generic;
-using System.Linq;
 using Eto.WinForms.Forms.Menu;
-using System.Reflection;
-using System.Diagnostics;
-
 namespace Eto.WinForms.Forms
 {
 	public interface IWindowsControl : Control.IHandler
diff --git a/src/Eto.WinForms/Forms/WindowsFileDialog.cs b/src/Eto.WinForms/Forms/WindowsFileDialog.cs
index c9ab681bef..9d1dfd85d4 100644
--- a/src/Eto.WinForms/Forms/WindowsFileDialog.cs
+++ b/src/Eto.WinForms/Forms/WindowsFileDialog.cs
@@ -1,11 +1,3 @@
-using System;
-using System.IO;
-using System.Linq;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-using System.Collections.Generic;
-
 namespace Eto.WinForms.Forms
 {
 	public abstract class WindowsFileDialog<TControl, TWidget> : WidgetHandler<TControl, TWidget>, FileDialog.IHandler
diff --git a/src/Eto.WinForms/Forms/WindowsPanel.cs b/src/Eto.WinForms/Forms/WindowsPanel.cs
index 8ee04f8f3b..f8249e6518 100644
--- a/src/Eto.WinForms/Forms/WindowsPanel.cs
+++ b/src/Eto.WinForms/Forms/WindowsPanel.cs
@@ -1,9 +1,3 @@
-using System;
-using sd = System.Drawing;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.WinForms.Forms
 {
 	public abstract class WindowsPanel<TControl, TWidget, TCallback> : WindowsContainer<TControl, TWidget, TCallback>, Panel.IHandler
diff --git a/src/Eto.WinForms/IO/ShellIcon.cs b/src/Eto.WinForms/IO/ShellIcon.cs
index 90095ea4c6..fc86c4cf74 100644
--- a/src/Eto.WinForms/IO/ShellIcon.cs
+++ b/src/Eto.WinForms/IO/ShellIcon.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Runtime.InteropServices;
-
 #if WINFORMS
 namespace Eto.WinForms.IO
 #elif WPF
diff --git a/src/Eto.WinForms/IO/SystemIcons.cs b/src/Eto.WinForms/IO/SystemIcons.cs
index cf3ca60b83..9283ca62f5 100644
--- a/src/Eto.WinForms/IO/SystemIcons.cs
+++ b/src/Eto.WinForms/IO/SystemIcons.cs
@@ -1,9 +1,5 @@
-using SD = System.Drawing;
-using Eto.Drawing;
 using Eto.IO;
 using Eto.WinForms.Drawing;
-using System;
-
 namespace Eto.WinForms.IO
 {
 	public class SystemIconsHandler : SystemIcons.IHandler
@@ -23,7 +19,7 @@ public Icon GetFileIcon(string fileName, IconSize size)
 					throw new NotSupportedException();
 			}
 
-			SD.Icon icon = ShellIcon.GetFileIcon(fileName, iconSize, false);
+			sd.Icon icon = ShellIcon.GetFileIcon(fileName, iconSize, false);
 			return new Icon(new IconHandler(icon));
 		}
 
@@ -55,7 +51,7 @@ public Icon GetStaticIcon(StaticIconType type, IconSize size)
 					throw new NotSupportedException();
 			}
 			
-			SD.Icon icon = ShellIcon.GetFolderIcon(iconSize, folderType);
+			sd.Icon icon = ShellIcon.GetFolderIcon(iconSize, folderType);
 			return new Icon(new IconHandler(icon));
 		}
 	}
diff --git a/src/Eto.WinForms/KeyMap.cs b/src/Eto.WinForms/KeyMap.cs
index ffc3918165..7328204227 100644
--- a/src/Eto.WinForms/KeyMap.cs
+++ b/src/Eto.WinForms/KeyMap.cs
@@ -1,6 +1,3 @@
-using swf = System.Windows.Forms;
-using Eto.Forms;
-using System.Collections.Generic;
 using System.Diagnostics;
 
 #if WPF
diff --git a/src/Eto.WinForms/LeakHelper.cs b/src/Eto.WinForms/LeakHelper.cs
index 6890b5c2ed..2252f00207 100644
--- a/src/Eto.WinForms/LeakHelper.cs
+++ b/src/Eto.WinForms/LeakHelper.cs
@@ -1,9 +1,4 @@
 using Microsoft.Win32;
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Collections;
-
 namespace Eto.WinForms
 {
 	/// <summary>
diff --git a/src/Eto.WinForms/OctreeQuantizer.cs b/src/Eto.WinForms/OctreeQuantizer.cs
index 260e723794..da7db559f1 100644
--- a/src/Eto.WinForms/OctreeQuantizer.cs
+++ b/src/Eto.WinForms/OctreeQuantizer.cs
@@ -6,12 +6,6 @@ PARTICULAR PURPOSE.
   
     This is sample code and is freely distributable. 
 */ 
-using System;
-using System.Collections;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Globalization;
-
 namespace ImageManipulation
 {
 	/// <summary>
@@ -77,17 +71,17 @@ protected override byte QuantizePixel(Color32* pixel)
 		/// </summary>
 		/// <param name="original">Any old palette, this is overrwritten</param>
 		/// <returns>The new color palette</returns>
-		protected override ColorPalette GetPalette(ColorPalette original)
+		protected override sdi.ColorPalette GetPalette(sdi.ColorPalette original)
 		{
 			// First off convert the octree to _maxColors colors
 			ArrayList	palette = _octree.Palletize(_maxColors - 1);
 
 			// Then convert the palette based on those colors
 			for (int index = 0; index < palette.Count; index++)
-				original.Entries[index] = (Color)palette[index];
+				original.Entries[index] = (sd.Color)palette[index];
 
 			// Add the transparent color
-			original.Entries[_maxColors] = Color.FromArgb(0, 0, 0, 0);
+			original.Entries[_maxColors] = sd.Color.FromArgb(0, 0, 0, 0);
 
 			return original;
 		}
@@ -389,7 +383,7 @@ public void ConstructPalette(ArrayList palette, ref int paletteIndex)
 						_paletteIndex = paletteIndex++;
 
 						// And set the color of the palette entry
-						palette.Add(Color.FromArgb(_red / _pixelCount, _green / _pixelCount, _blue / _pixelCount));
+						palette.Add(sd.Color.FromArgb(_red / _pixelCount, _green / _pixelCount, _blue / _pixelCount));
 					}
 					else
 					{
diff --git a/src/Eto.WinForms/PaletteQuantizer.cs b/src/Eto.WinForms/PaletteQuantizer.cs
index c5cb25fcb9..4d91463624 100644
--- a/src/Eto.WinForms/PaletteQuantizer.cs
+++ b/src/Eto.WinForms/PaletteQuantizer.cs
@@ -7,9 +7,6 @@ PARTICULAR PURPOSE.
     This is sample code and is freely distributable. 
 */ 
 
-using System.Collections;
-using System.Drawing;
-using System.Drawing.Imaging;
 
 namespace ImageManipulation
 {
@@ -29,7 +26,7 @@ public PaletteQuantizer ( ArrayList palette ) : base ( true )
 		{
 			_colorMap = new Hashtable ( ) ;
 
-			_colors = new Color[palette.Count] ;
+			_colors = new sd.Color[palette.Count] ;
 			palette.CopyTo ( _colors ) ;
 		}
 
@@ -73,7 +70,7 @@ protected override byte QuantizePixel ( Color32* pixel )
 					// Loop through the entire palette, looking for the closest color match
 					for ( int index = 0 ; index < _colors.Length ; index++ )
 					{
-						Color	paletteColor = _colors[index];
+						sd.Color	paletteColor = _colors[index];
 						
 						int	redDistance = paletteColor.R - red ;
 						int	greenDistance = paletteColor.G - green ;
@@ -107,7 +104,7 @@ protected override byte QuantizePixel ( Color32* pixel )
 		/// </summary>
 		/// <param name="original">Any old palette, this is overrwritten</param>
 		/// <returns>The new color palette</returns>
-		protected override ColorPalette GetPalette ( ColorPalette original )
+		protected override sdi.ColorPalette GetPalette ( sdi.ColorPalette original )
 		{
 			for ( int index = 0 ; index < _colors.Length ; index++ )
 				original.Entries[index] = _colors[index] ;
@@ -123,6 +120,6 @@ protected override ColorPalette GetPalette ( ColorPalette original )
 		/// <summary>
 		/// List of all colors in the palette
 		/// </summary>
-		readonly Color[] _colors ;
+		readonly sd.Color[] _colors ;
 	}
 }
diff --git a/src/Eto.WinForms/Platform.cs b/src/Eto.WinForms/Platform.cs
index 5beabcb930..a21619c3f5 100644
--- a/src/Eto.WinForms/Platform.cs
+++ b/src/Eto.WinForms/Platform.cs
@@ -1,8 +1,4 @@
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.IO;
-using SD = System.Drawing;
-using SWF = System.Windows.Forms;
 using Eto.WinForms.Drawing;
 using Eto.WinForms.Forms;
 using Eto.WinForms.Forms.Printing;
@@ -13,8 +9,6 @@
 using Eto.WinForms.Forms.Menu;
 using Eto.WinForms.Forms.ToolBar;
 using Eto.Shared.Forms;
-using System.Diagnostics;
-
 namespace Eto.WinForms
 {
 	public class Platform : Eto.Platform
diff --git a/src/Eto.WinForms/Quantizer.cs b/src/Eto.WinForms/Quantizer.cs
index 2bd67e7e6a..d2a87b11fd 100644
--- a/src/Eto.WinForms/Quantizer.cs
+++ b/src/Eto.WinForms/Quantizer.cs
@@ -7,11 +7,6 @@ PARTICULAR PURPOSE.
     This is sample code and is freely distributable. 
 */ 
 
-using System;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Runtime.InteropServices;
-
 namespace ImageManipulation
 {
 	/// <summary>
@@ -38,25 +33,25 @@ protected Quantizer(bool singlePass)
 		/// </summary>
 		/// <param name="source">The image to quantize</param>
 		/// <returns>A quantized version of the image</returns>
-		public Bitmap Quantize(Image source)
+		public sd.Bitmap Quantize(sd.Image source)
 		{
 			// Get the size of the source image
 			int	height = source.Height;
 			int width = source.Width;
 
 			// And construct a rectangle from these dimensions
-			var bounds = new Rectangle(0, 0, width, height);
+			var bounds = new sd.Rectangle(0, 0, width, height);
 
 			// First off take a 32bpp copy of the image
-			var copy = new Bitmap(width, height, PixelFormat.Format32bppArgb);
+			var copy = new sd.Bitmap(width, height, sdi.PixelFormat.Format32bppArgb);
 
 			// And construct an 8bpp version
-			var output = new Bitmap(width, height, PixelFormat.Format8bppIndexed);
+			var output = new sd.Bitmap(width, height, sdi.PixelFormat.Format8bppIndexed);
 
 			// Now lock the bitmap into memory
-			using (Graphics g = Graphics.FromImage(copy))
+			using (var g = sd.Graphics.FromImage(copy))
 			{
-				g.PageUnit = GraphicsUnit.Pixel;
+				g.PageUnit = sd.GraphicsUnit.Pixel;
 
 				// Draw the source image onto the copy bitmap,
 				// which will effect a widening as appropriate.
@@ -64,12 +59,12 @@ public Bitmap Quantize(Image source)
 			}
 
 			// Define a pointer to the bitmap data
-			BitmapData	sourceData = null;
+			sdi.BitmapData	sourceData = null;
 
 			try
 			{
 				// Get the source image bits and lock into memory
-				sourceData = copy.LockBits(bounds, ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
+				sourceData = copy.LockBits(bounds, sdi.ImageLockMode.ReadOnly, sdi.PixelFormat.Format32bppArgb);
 
 				// Call the FirstPass function if not a single pass algorithm.
 				// For something like an octree quantizer, this will run through
@@ -100,7 +95,7 @@ public Bitmap Quantize(Image source)
 		/// <param name="sourceData">The source data</param>
 		/// <param name="width">The width in pixels of the image</param>
 		/// <param name="height">The height in pixels of the image</param>
-		protected virtual void FirstPass(BitmapData sourceData, int width, int height)
+		protected virtual void FirstPass(sdi.BitmapData sourceData, int width, int height)
 		{
 			// Define the source data pointers. The source row is a byte to
 			// keep addition of the stride value easier (as this is in bytes)
@@ -131,14 +126,14 @@ protected virtual void FirstPass(BitmapData sourceData, int width, int height)
 		/// <param name="width">The width in pixels of the image</param>
 		/// <param name="height">The height in pixels of the image</param>
 		/// <param name="bounds">The bounding rectangle</param>
-		protected virtual void SecondPass(BitmapData sourceData, Bitmap output, int width, int height, Rectangle bounds)
+		protected virtual void SecondPass(sdi.BitmapData sourceData, sd.Bitmap output, int width, int height, sd.Rectangle bounds)
 		{
-			BitmapData	outputData = null;
+			sdi.BitmapData	outputData = null;
 
 			try
 			{
 				// Lock the output bitmap into memory
-				outputData = output.LockBits(bounds, ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
+				outputData = output.LockBits(bounds, sdi.ImageLockMode.WriteOnly, sdi.PixelFormat.Format8bppIndexed);
 
 				// Define the source data pointers. The source row is a byte to
 				// keep addition of the stride value easier (as this is in bytes)
@@ -221,7 +216,7 @@ protected virtual void InitialQuantizePixel(Color32* pixel)
 		/// </summary>
 		/// <param name="original">Any old palette, this is overrwritten</param>
 		/// <returns>The new color palette</returns>
-		protected abstract ColorPalette GetPalette(ColorPalette original) ;
+		protected abstract sdi.ColorPalette GetPalette(sdi.ColorPalette original) ;
 
 		/// <summary>
 		/// Flag used to indicate whether a single pass or two passes are needed for quantization.
@@ -268,9 +263,9 @@ public struct Color32
 			/// <summary>
 			/// Return the color for this Color32 object
 			/// </summary>
-			public Color Color
+			public sd.Color Color
 			{
-				get	{ return Color.FromArgb(Alpha, Red, Green, Blue); }
+				get	{ return sd.Color.FromArgb(Alpha, Red, Green, Blue); }
 			}
 		}
 	}
diff --git a/src/Eto.WinForms/ScrollMessageFilter.cs b/src/Eto.WinForms/ScrollMessageFilter.cs
index 5a121cee5c..675dd8acf1 100755
--- a/src/Eto.WinForms/ScrollMessageFilter.cs
+++ b/src/Eto.WinForms/ScrollMessageFilter.cs
@@ -1,35 +1,33 @@
-using System.Windows.Forms;
-
 namespace Eto.WinForms
 {
-	class ScrollMessageFilter : IMessageFilter
+	class ScrollMessageFilter : swf.IMessageFilter
 	{
-		public static bool IsScrollable(Control control)
+		public static bool IsScrollable(swf.Control control)
 		{
-			var p = control as ScrollableControl;
+			var p = control as swf.ScrollableControl;
 			if (p != null)
 				return p.AutoScroll;
-			return control is DataGridView
+			return control is swf.DataGridView
 #if !NETCOREAPP3_1
-			|| control is DataGrid
+			|| control is swf.DataGrid
 #endif
-			|| control is TreeView
-			|| control is ListControl
-			|| control is RichTextBox;
+			|| control is swf.TreeView
+			|| control is swf.ListControl
+			|| control is swf.RichTextBox;
 		}
 
-		public bool PreFilterMessage(ref Message m)
+		public bool PreFilterMessage(ref swf.Message m)
 		{
 			if (m.Msg == (int)Win32.WM.MOUSEWHEEL)
 			{
-				var c = Control.FromHandle(m.HWnd);
+				var c = swf.Control.FromHandle(m.HWnd);
 				if (c == null)
 					return false;
 				while (c.Parent != null)
 					c = c.Parent;
 
-				var cp = Cursor.Position;
-				Control scrollChild = null;
+				var cp = swf.Cursor.Position;
+				swf.Control scrollChild = null;
 				while (c != null)
 				{
 					if (IsScrollable(c))
@@ -38,7 +36,7 @@ public bool PreFilterMessage(ref Message m)
 					if (!c.HasChildren)
 						break;
 
-					c = c.GetChildAtPoint(c.PointToClient(cp), GetChildAtPointSkip.Invisible);
+					c = c.GetChildAtPoint(c.PointToClient(cp), swf.GetChildAtPointSkip.Invisible);
 				}
 
 				if (scrollChild == null)
diff --git a/src/Eto.WinForms/Win32.cs b/src/Eto.WinForms/Win32.cs
index a38ecc01ac..988c97230c 100755
--- a/src/Eto.WinForms/Win32.cs
+++ b/src/Eto.WinForms/Win32.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Runtime.InteropServices;
-using System.Windows.Forms;
-using System.Text;
-using System.Diagnostics;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto
 {
 	static partial class Win32
@@ -254,21 +246,21 @@ public enum MK
 			XBUTTON2 = 0x0040
 		}
 
-		public static MouseButtons GetMouseButtonWParam(IntPtr wParam)
+		public static swf.MouseButtons GetMouseButtonWParam(IntPtr wParam)
 		{
 			var mask = (MK)LOWORD(wParam);
-			var buttons = MouseButtons.None;
+			var buttons = swf.MouseButtons.None;
 
 			if (mask.HasFlag(MK.LBUTTON))
-				buttons |= MouseButtons.Left;
+				buttons |= swf.MouseButtons.Left;
 			if (mask.HasFlag(MK.RBUTTON))
-				buttons |= MouseButtons.Right;
+				buttons |= swf.MouseButtons.Right;
 			if (mask.HasFlag(MK.MBUTTON))
-				buttons |= MouseButtons.Middle;
+				buttons |= swf.MouseButtons.Middle;
 			if (mask.HasFlag(MK.XBUTTON1))
-				buttons |= MouseButtons.XButton1;
+				buttons |= swf.MouseButtons.XButton1;
 			if (mask.HasFlag(MK.XBUTTON2))
-				buttons |= MouseButtons.XButton2;
+				buttons |= swf.MouseButtons.XButton2;
 			return buttons;
 		}
 
@@ -323,13 +315,13 @@ public static MouseButtons GetMouseButtonWParam(IntPtr wParam)
 
 
 		[DllImport("user32.dll", CharSet = CharSet.Auto)]
-		public static extern bool PeekMessage(ref Message wMsg, IntPtr hwnd, int msgMin, int msgMax, int remove);
+		public static extern bool PeekMessage(ref swf.Message wMsg, IntPtr hwnd, int msgMin, int msgMax, int remove);
 
 
-		public static Message? GetNextMessage(Control ctl, params WM[] wMsg)
+		public static swf.Message? GetNextMessage(swf.Control ctl, params WM[] wMsg)
 		{
-			Message? msg = null;
-			Message pmsg = default(Message);
+			swf.Message? msg = null;
+			swf.Message pmsg = default(swf.Message);
 			var ret = false;
 			do
 			{
diff --git a/src/Eto.WinForms/Win32.dpi.cs b/src/Eto.WinForms/Win32.dpi.cs
index 65568044da..679af4b3a1 100644
--- a/src/Eto.WinForms/Win32.dpi.cs
+++ b/src/Eto.WinForms/Win32.dpi.cs
@@ -1,13 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Drawing;
 #if WPF
 using Eto.Wpf.Forms;
 #elif WINFORMS
diff --git a/src/Eto.WinForms/Win32.gdi.cs b/src/Eto.WinForms/Win32.gdi.cs
index 62ca58fade..cdbe978a63 100755
--- a/src/Eto.WinForms/Win32.gdi.cs
+++ b/src/Eto.WinForms/Win32.gdi.cs
@@ -1,13 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
-using Eto.Drawing;
 #if WPF
 using Eto.Wpf.Forms;
 #elif WINFORMS
diff --git a/src/Eto.WinForms/Win32TextBox.cs b/src/Eto.WinForms/Win32TextBox.cs
index a17bd3189e..9967141e49 100644
--- a/src/Eto.WinForms/Win32TextBox.cs
+++ b/src/Eto.WinForms/Win32TextBox.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
 using System.Security;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Eto.WinForms
diff --git a/src/Eto.WinForms/WinConversions.cs b/src/Eto.WinForms/WinConversions.cs
index 4dadbb4ffd..a0312ebffb 100644
--- a/src/Eto.WinForms/WinConversions.cs
+++ b/src/Eto.WinForms/WinConversions.cs
@@ -1,13 +1,5 @@
-using System;
-using System.Globalization;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.WinForms.Drawing;
-using sd = System.Drawing;
 using sdp = System.Drawing.Printing;
-using sd2 = System.Drawing.Drawing2D;
-using swf = System.Windows.Forms;
-using sdi = System.Drawing.Imaging;
 using Eto.WinForms.Forms.Printing;
 using Eto.WinForms.Forms;
 
diff --git a/src/Eto.WinForms/WinConversions.shared.cs b/src/Eto.WinForms/WinConversions.shared.cs
index 1d8f668ac4..ce67ee6f64 100644
--- a/src/Eto.WinForms/WinConversions.shared.cs
+++ b/src/Eto.WinForms/WinConversions.shared.cs
@@ -1,13 +1,4 @@
-using System;
-using System.Globalization;
-using Eto.Drawing;
-using Eto.Forms;
-using sd = System.Drawing;
 using sdp = System.Drawing.Printing;
-using sd2 = System.Drawing.Drawing2D;
-using swf = System.Windows.Forms;
-using sdi = System.Drawing.Imaging;
-
 #if WPF
 namespace Eto.Wpf
 #else
diff --git a/src/Eto.WinForms/WinFormsHelpers.cs b/src/Eto.WinForms/WinFormsHelpers.cs
index 42edf98e66..74570ae67f 100644
--- a/src/Eto.WinForms/WinFormsHelpers.cs
+++ b/src/Eto.WinForms/WinFormsHelpers.cs
@@ -1,7 +1,4 @@
-using System;
-using Eto.Forms;
 using Eto.WinForms;
-using swf = System.Windows.Forms;
 using Eto.WinForms.Forms.Controls;
 using Eto.WinForms.Forms;
 
diff --git a/src/Eto.Wpf/CustomControls/DragDropLib.Swf.cs b/src/Eto.Wpf/CustomControls/DragDropLib.Swf.cs
index b0e38471f5..2fe5fa602a 100755
--- a/src/Eto.Wpf/CustomControls/DragDropLib.Swf.cs
+++ b/src/Eto.Wpf/CustomControls/DragDropLib.Swf.cs
@@ -8,12 +8,7 @@
 
 namespace System.Windows.Forms
 {
-	using System;
-	using System.ComponentModel;
 	using System.Drawing;
-	using System.IO;
-	using System.Runtime.InteropServices;
-	using System.Runtime.Serialization;
 	using System.Runtime.Serialization.Formatters.Binary;
 	using DragDropLib;
 	using ComIDataObject = System.Runtime.InteropServices.ComTypes.IDataObject;
@@ -333,10 +328,7 @@ public static object GetDataEx(this IDataObject dataObject, string format)
 
 namespace DragDropLib
 {
-	using System;
-	using System.Collections.Generic;
 	using System.Drawing;
-	using System.Text;
 
 	static class SwfDragDropLibExtensions
 	{
@@ -361,8 +353,6 @@ public static Win32Point ToWin32Point(this Point pt)
 
 namespace System.Windows.Forms
 {
-	using System;
-	using System.Collections.Generic;
 	using System.Drawing;
 	using System.Windows.Forms;
 	using DragDropLib;
@@ -528,12 +518,8 @@ public static void Show(bool show)
 
 namespace System.Windows.Forms
 {
-	using System;
-	using System.Collections.Generic;
 	using System.Drawing;
-	using System.IO;
-	using System.Runtime.InteropServices;
-	using DragDropLib;
+		using DragDropLib;
 	using ComTypes = System.Runtime.InteropServices.ComTypes;
 
 	/// <summary>
diff --git a/src/Eto.Wpf/CustomControls/DragDropLib.Wpf.cs b/src/Eto.Wpf/CustomControls/DragDropLib.Wpf.cs
index 24fea5854d..426d212bec 100755
--- a/src/Eto.Wpf/CustomControls/DragDropLib.Wpf.cs
+++ b/src/Eto.Wpf/CustomControls/DragDropLib.Wpf.cs
@@ -7,7 +7,6 @@
 
 namespace DragDropLib
 {
-	using System;
 	using System.Windows;
 
 	static class WpfDragDropLibExtensions
@@ -33,12 +32,7 @@ public static Win32Point ToWin32Point(this Point pt)
 
 namespace System.Windows
 {
-	using System;
 	using System.Collections.Generic;
-	using System.IO;
-	using System.Linq;
-	using System.Runtime.InteropServices;
-	using System.Windows.Input;
 	using System.Windows.Media.Imaging;
 	using DragDropLib;
 	using ComTypes = System.Runtime.InteropServices.ComTypes;
@@ -664,7 +658,6 @@ public void OnViewChange(int aspect, int index)
 
 namespace System.Windows
 {
-	using System;
 	using System.Windows;
 	using System.Windows.Interop;
 	using ComIDataObject = System.Runtime.InteropServices.ComTypes.IDataObject;
@@ -793,13 +786,7 @@ public static void Show(bool show)
 
 namespace System.Windows
 {
-	using System;
-	using System.Collections.Generic;
-	using System.ComponentModel;
 	using System.Drawing.Imaging;
-	using System.IO;
-	using System.Runtime.InteropServices;
-	using System.Runtime.Serialization;
 	using System.Runtime.Serialization.Formatters.Binary;
 	using System.Windows.Media;
 	using System.Windows.Media.Imaging;
diff --git a/src/Eto.Wpf/CustomControls/DragDropLib.cs b/src/Eto.Wpf/CustomControls/DragDropLib.cs
index 9e879a0c16..b79bfbed3a 100755
--- a/src/Eto.Wpf/CustomControls/DragDropLib.cs
+++ b/src/Eto.Wpf/CustomControls/DragDropLib.cs
@@ -7,10 +7,7 @@
 
 namespace DragDropLib
 {
-	using System;
-	using System.Runtime.InteropServices;
-
-	[ComImport]
+		[ComImport]
 	[Guid("4657278A-411B-11d2-839A-00C04FD918D0")]
 	class DragDropHelper { }
 }
@@ -21,8 +18,6 @@ class DragDropHelper { }
 
 namespace DragDropLib
 {
-	using System;
-	using System.Runtime.InteropServices;
 	using System.Runtime.InteropServices.ComTypes;
 
 	[ComVisible(true)]
@@ -67,8 +62,6 @@ void SetFlags(
 
 namespace DragDropLib
 {
-	using System;
-	using System.Runtime.InteropServices;
 	using System.Runtime.InteropServices.ComTypes;
 
 	[ComVisible(true)]
@@ -105,9 +98,6 @@ void Show(
 
 namespace DragDropLib
 {
-	using System;
-	using System.Runtime.InteropServices;
-
 	[StructLayout(LayoutKind.Sequential)]
 	struct Win32Point
 	{
@@ -148,14 +138,8 @@ struct DropDescription
 
 namespace System.Runtime.InteropServices.ComTypes
 {
-	using System;
-	using System.Collections.Generic;
-	using System.Runtime.InteropServices;
 	using System.Runtime.InteropServices.ComTypes;
-	using System.Text;
 	using DragDropLib;
-	using System.ComponentModel;
-	using System.IO;
 	using System.Runtime.Serialization.Formatters.Binary;
 
 	/// <summary>
@@ -545,10 +529,6 @@ private static TypeConverter GetTypeConverterForType(Type dataType)
 
 namespace DragDropLib
 {
-	using System;
-	using System.Collections.Generic;
-	using System.Linq;
-	using System.Runtime.InteropServices;
 	using System.Runtime.InteropServices.ComTypes;
 
 	/// <summary>
diff --git a/src/Eto.Wpf/CustomControls/EditableTextBlock.cs b/src/Eto.Wpf/CustomControls/EditableTextBlock.cs
index b2789084a5..35894516a9 100644
--- a/src/Eto.Wpf/CustomControls/EditableTextBlock.cs
+++ b/src/Eto.Wpf/CustomControls/EditableTextBlock.cs
@@ -2,8 +2,8 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
-using System.Windows.Input;
-using System;
+using TextBox = System.Windows.Controls.TextBox;
+using Control = System.Windows.Controls.Control;
 
 namespace Eto.Wpf.CustomControls
 {
@@ -17,7 +17,7 @@ public EditableTextBlock()
 			var textBox = new FrameworkElementFactory(typeof(TextBox));
 			textBox.SetValue(Control.PaddingProperty, new Thickness(1)); // 1px for border
 			textBox.AddHandler(FrameworkElement.LoadedEvent, new RoutedEventHandler(TextBox_Loaded));
-			textBox.AddHandler(UIElement.KeyDownEvent, new KeyEventHandler(TextBox_KeyDown));
+			textBox.AddHandler(UIElement.KeyDownEvent, new swi.KeyEventHandler(TextBox_KeyDown));
 			textBox.AddHandler(UIElement.LostFocusEvent, new RoutedEventHandler(TextBox_LostFocus));
 			textBox.AddHandler(UIElement.GotFocusEvent, new RoutedEventHandler(TextBox_GotFocus));
 			textBox.SetBinding(TextBox.TextProperty, new System.Windows.Data.Binding("Text") { Source = this, Mode = BindingMode.TwoWay, UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged });
@@ -25,7 +25,7 @@ public EditableTextBlock()
 
 			var textBlock = new FrameworkElementFactory(typeof(TextBlock));
 			textBlock.SetValue(FrameworkElement.MarginProperty, new Thickness(2));
-			textBlock.AddHandler(UIElement.MouseDownEvent, new MouseButtonEventHandler(TextBlock_MouseDown));
+			textBlock.AddHandler(UIElement.MouseDownEvent, new swi.MouseButtonEventHandler(TextBlock_MouseDown));
 			textBlock.SetBinding(TextBlock.TextProperty, new System.Windows.Data.Binding("Text") { Source = this });
 			var viewTemplate = new DataTemplate { VisualTree = textBlock };
 
@@ -130,15 +130,15 @@ bool SetParentFocus()
 		}
 
 
-		void TextBox_KeyDown(object sender, KeyEventArgs e)
+		void TextBox_KeyDown(object sender, swi.KeyEventArgs e)
 		{
-			if (e.Key == Key.Enter)
+			if (e.Key == swi.Key.Enter)
 			{
 				if (!SetParentFocus())
 					IsInEditMode = false;
 				e.Handled = true;
 			}
-			else if (e.Key == Key.Escape)
+			else if (e.Key == swi.Key.Escape)
 			{
 				var prev = Text;
 				Text = oldText;
@@ -150,9 +150,9 @@ void TextBox_KeyDown(object sender, KeyEventArgs e)
 			}
 		}
 
-		void TextBlock_MouseDown(object sender, MouseButtonEventArgs e)
+		void TextBlock_MouseDown(object sender, swi.MouseButtonEventArgs e)
 		{
-			if (e.ButtonState == MouseButtonState.Pressed && e.ClickCount >= 2 && e.ChangedButton == MouseButton.Left)
+			if (e.ButtonState == swi.MouseButtonState.Pressed && e.ClickCount >= 2 && e.ChangedButton == swi.MouseButton.Left)
 			{
 				IsInEditMode = true;
 				e.Handled = true;
diff --git a/src/Eto.Wpf/CustomControls/FontDialog/fontchooser.xaml.cs b/src/Eto.Wpf/CustomControls/FontDialog/fontchooser.xaml.cs
index 976ce1dc27..450c7dab33 100644
--- a/src/Eto.Wpf/CustomControls/FontDialog/fontchooser.xaml.cs
+++ b/src/Eto.Wpf/CustomControls/FontDialog/fontchooser.xaml.cs
@@ -1,12 +1,18 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Threading;
+using Window = System.Windows.Window;
+using FontFamily = System.Windows.Media.FontFamily;
+using FontStyle = System.Windows.FontStyle;
+using Grid = System.Windows.Controls.Grid;
+using ListBox = System.Windows.Controls.ListBox;
+using TextBox = System.Windows.Controls.TextBox;
+using RadioButton = System.Windows.Controls.RadioButton;
+using Fonts = System.Windows.Media.Fonts;
+using Key = System.Windows.Input.Key;
+using KeyEventArgs = System.Windows.Input.KeyEventArgs;
 
 namespace Eto.Wpf.CustomControls.FontDialog
 {
@@ -173,7 +179,7 @@ void FontChooser_Loaded (object sender, RoutedEventArgs e)
 			// Hook up events for the font family list and associated text box.
 			fontFamilyTextBox.SelectionChanged += new RoutedEventHandler (fontFamilyTextBox_SelectionChanged);
 			fontFamilyTextBox.TextChanged += new TextChangedEventHandler (fontFamilyTextBox_TextChanged);
-			fontFamilyTextBox.PreviewKeyDown += new KeyEventHandler (fontFamilyTextBox_PreviewKeyDown);
+			fontFamilyTextBox.PreviewKeyDown += new swi.KeyEventHandler (fontFamilyTextBox_PreviewKeyDown);
 			fontFamilyList.SelectionChanged += new SelectionChangedEventHandler (fontFamilyList_SelectionChanged);
 
 			// Hook up events for the typeface list.
@@ -181,7 +187,7 @@ void FontChooser_Loaded (object sender, RoutedEventArgs e)
 
 			// Hook up events for the font size list and associated text box.
 			sizeTextBox.TextChanged += new TextChangedEventHandler (sizeTextBox_TextChanged);
-			sizeTextBox.PreviewKeyDown += new KeyEventHandler (sizeTextBox_PreviewKeyDown);
+			sizeTextBox.PreviewKeyDown += new swi.KeyEventHandler (sizeTextBox_PreviewKeyDown);
 			sizeList.SelectionChanged += new SelectionChangedEventHandler (sizeList_SelectionChanged);
 
 			// Hook up events for text decoration check boxes.
@@ -1474,7 +1480,7 @@ void InitializeFeaturePage(Grid grid, DependencyProperty chooserProperty, Typogr
                         radioButton.Name = tag;
                         radioButton.Content = radioContent;
                         radioButton.Margin = new Thickness(5.0, 0.0, 0.0, 0.0);
-                        radioButton.VerticalAlignment = VerticalAlignment.Center;
+                        radioButton.VerticalAlignment = sw.VerticalAlignment.Center;
                         Grid.SetRow(radioButton, i);
                         grid.Children.Add(radioButton);
 
@@ -1503,7 +1509,7 @@ void InitializeFeaturePage(Grid grid, DependencyProperty chooserProperty, Typogr
                     {
                         var border = new Border();
                         border.BorderThickness = new Thickness(0.0, 0.0, 0.0, 1.0);
-                        border.BorderBrush = SystemColors.ControlLightBrush;
+                        border.BorderBrush = sw.SystemColors.ControlLightBrush;
                         Grid.SetRow(border, i);
                         Grid.SetColumnSpan(border, 2);
                         grid.Children.Add(border);
@@ -1533,10 +1539,10 @@ void featureRadioButton_Checked(object sender, RoutedEventArgs e)
 
         static void AddTableRow(TableRowGroup rowGroup, string leftText, string rightText)
         {
-            var row = new TableRow();
+            var row = new swdoc.TableRow();
 
-            row.Cells.Add(new TableCell(new Paragraph(new Run(leftText))));
-            row.Cells.Add(new TableCell(new Paragraph(new Run(rightText))));
+            row.Cells.Add(new swdoc.TableCell(new Paragraph(new Run(leftText))));
+            row.Cells.Add(new swdoc.TableCell(new Paragraph(new Run(rightText))));
 
             rowGroup.Rows.Add(row);
         }
diff --git a/src/Eto.Wpf/CustomControls/FontDialog/fontfamilylistitem.cs b/src/Eto.Wpf/CustomControls/FontDialog/fontfamilylistitem.cs
index f3bf855119..6d2d72ccf9 100644
--- a/src/Eto.Wpf/CustomControls/FontDialog/fontfamilylistitem.cs
+++ b/src/Eto.Wpf/CustomControls/FontDialog/fontfamilylistitem.cs
@@ -1,17 +1,14 @@
-using System;
 using System.Windows;
 using System.Windows.Documents;
 using System.Windows.Controls;
 using System.Windows.Media;
-using System.Globalization;
-
 namespace Eto.Wpf.CustomControls.FontDialog
 {
     class FontFamilyListItem : TextBlock, IComparable
     {
         readonly string _displayName;
 
-        public FontFamilyListItem(FontFamily fontFamily)
+        public FontFamilyListItem(swm.FontFamily fontFamily)
         {
             _displayName = GetDisplayName(fontFamily);
 
@@ -23,7 +20,7 @@ public FontFamilyListItem(FontFamily fontFamily)
             if (IsSymbolFont(fontFamily))
             {
                 var range = new TextRange(ContentStart, ContentEnd);
-                range.ApplyPropertyValue(TextBlock.FontFamilyProperty, SystemFonts.MessageFontFamily);
+                range.ApplyPropertyValue(TextBlock.FontFamilyProperty, sw.SystemFonts.MessageFontFamily);
             }
         }
 
@@ -37,11 +34,11 @@ int IComparable.CompareTo(object obj)
             return string.Compare(_displayName, obj.ToString(), true, CultureInfo.CurrentCulture);
         }
 
-        internal static bool IsSymbolFont(FontFamily fontFamily)
+        internal static bool IsSymbolFont(swm.FontFamily fontFamily)
         {
-            foreach (Typeface typeface in fontFamily.GetTypefaces())
+            foreach (swm.Typeface typeface in fontFamily.GetTypefaces())
             {
-                GlyphTypeface face;
+                swm.GlyphTypeface face;
                 if (typeface.TryGetGlyphTypeface(out face))
                 {
                     return face.Symbol;
@@ -50,7 +47,7 @@ internal static bool IsSymbolFont(FontFamily fontFamily)
             return false;
         }
 
-        internal static string GetDisplayName(FontFamily family)
+        internal static string GetDisplayName(swm.FontFamily family)
         {
             return NameDictionaryExtensions.GetDisplayName(family.FamilyNames);
         }
diff --git a/src/Eto.Wpf/CustomControls/FontDialog/fontsizelistitem.cs b/src/Eto.Wpf/CustomControls/FontDialog/fontsizelistitem.cs
index 22050980d4..91d61e4d89 100644
--- a/src/Eto.Wpf/CustomControls/FontDialog/fontsizelistitem.cs
+++ b/src/Eto.Wpf/CustomControls/FontDialog/fontsizelistitem.cs
@@ -1,12 +1,8 @@
-using System;
-using System.Text;
 using System.Windows;
 using System.Windows.Documents;
 using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Markup;
-using System.Globalization;
-
 namespace Eto.Wpf.CustomControls.FontDialog
 {
     class FontSizeListItem : TextBlock, IComparable
diff --git a/src/Eto.Wpf/CustomControls/FontDialog/typefacelistitem.cs b/src/Eto.Wpf/CustomControls/FontDialog/typefacelistitem.cs
index 966259aef1..608ea3c9e0 100644
--- a/src/Eto.Wpf/CustomControls/FontDialog/typefacelistitem.cs
+++ b/src/Eto.Wpf/CustomControls/FontDialog/typefacelistitem.cs
@@ -1,10 +1,7 @@
-using System;
 using System.Windows;
 using System.Windows.Documents;
 using System.Windows.Controls;
 using System.Windows.Media;
-using System.Globalization;
-
 namespace Eto.Wpf.CustomControls.FontDialog
 {
     class TypefaceListItem : TextBlock, IComparable
@@ -40,7 +37,7 @@ public TypefaceListItem(Typeface typeface)
             if (FontFamilyListItem.IsSymbolFont(typeface.FontFamily))
             {
                 var range = new TextRange(ContentStart, ContentEnd);
-                range.ApplyPropertyValue(TextBlock.FontFamilyProperty, SystemFonts.MessageFontFamily);
+                range.ApplyPropertyValue(TextBlock.FontFamilyProperty, sw.SystemFonts.MessageFontFamily);
             }
         }
 
@@ -76,8 +73,8 @@ int IComparable.CompareTo(object obj)
             }
 
             // If style differs then sort based on style (Normal, Italic, then Oblique).
-            FontStyle thisStyle = FontStyle;
-            FontStyle otherStyle = item.FontStyle;
+            sw.FontStyle thisStyle = FontStyle;
+            sw.FontStyle otherStyle = item.FontStyle;
 
             if (thisStyle != otherStyle)
 			{
diff --git a/src/Eto.Wpf/CustomControls/FontDialog/typographicfeaturelistitem.cs b/src/Eto.Wpf/CustomControls/FontDialog/typographicfeaturelistitem.cs
index dc33e8f209..0ac2167cdc 100644
--- a/src/Eto.Wpf/CustomControls/FontDialog/typographicfeaturelistitem.cs
+++ b/src/Eto.Wpf/CustomControls/FontDialog/typographicfeaturelistitem.cs
@@ -1,8 +1,5 @@
-using System;
 using System.Windows;
 using System.Windows.Controls;
-using System.Globalization;
-
 namespace Eto.Wpf.CustomControls.FontDialog
 {
     class TypographicFeatureListItem : TextBlock, IComparable
diff --git a/src/Eto.Wpf/CustomControls/GlassHelper.cs b/src/Eto.Wpf/CustomControls/GlassHelper.cs
index d7dde07362..8b34f92a76 100644
--- a/src/Eto.Wpf/CustomControls/GlassHelper.cs
+++ b/src/Eto.Wpf/CustomControls/GlassHelper.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Globalization;
-using System.Runtime.InteropServices;
-using sw = System.Windows;
-using swm = System.Windows.Media;
-
 namespace Eto.Wpf.CustomControls
 {
 	/// <summary>
diff --git a/src/Eto.Wpf/CustomControls/HttpServer.cs b/src/Eto.Wpf/CustomControls/HttpServer.cs
index 5764ef96a6..c64a291b2f 100644
--- a/src/Eto.Wpf/CustomControls/HttpServer.cs
+++ b/src/Eto.Wpf/CustomControls/HttpServer.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Text;
 using System.Net;
-using System.Diagnostics;
 using System.Net.Mime;
-using System.IO;
-
 namespace Eto.CustomControls
 {
 	public class HttpServer : IDisposable
diff --git a/src/Eto.Wpf/CustomControls/MultiSizeImage.cs b/src/Eto.Wpf/CustomControls/MultiSizeImage.cs
index d2e0a31a63..e46736da1d 100755
--- a/src/Eto.Wpf/CustomControls/MultiSizeImage.cs
+++ b/src/Eto.Wpf/CustomControls/MultiSizeImage.cs
@@ -1,11 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Windows.Controls;
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using Eto.Wpf.Forms;
+using Image = System.Windows.Controls.Image;
+using Size = System.Windows.Size;
+using Brush = System.Windows.Media.Brush;
 
 namespace Eto.Wpf.CustomControls
 {
@@ -242,7 +242,7 @@ protected override void OnRender(DrawingContext dc)
 				if (frame.PixelWidth * frame.PixelHeight >= ourSize)
 					break;
 			}
-			dc.DrawImage(src, new Rect(new Point(0, 0), RenderSize));
+			dc.DrawImage(src, new sw.Rect(new sw.Point(0, 0), RenderSize));
 		}
 	}
 }
diff --git a/src/Eto.Wpf/CustomControls/SelectableTreeView.cs b/src/Eto.Wpf/CustomControls/SelectableTreeView.cs
index dfe658e5c1..841534cc97 100644
--- a/src/Eto.Wpf/CustomControls/SelectableTreeView.cs
+++ b/src/Eto.Wpf/CustomControls/SelectableTreeView.cs
@@ -1,9 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
+using TreeView = System.Windows.Controls.TreeView;
 
 namespace Eto.Wpf.CustomControls
 {
diff --git a/src/Eto.Wpf/CustomControls/TreeGridView/TreeToggleButton.cs b/src/Eto.Wpf/CustomControls/TreeGridView/TreeToggleButton.cs
index d9c4463112..4fff519fc1 100755
--- a/src/Eto.Wpf/CustomControls/TreeGridView/TreeToggleButton.cs
+++ b/src/Eto.Wpf/CustomControls/TreeGridView/TreeToggleButton.cs
@@ -1,14 +1,7 @@
-using System;
 using System.Windows.Controls.Primitives;
 using System.Windows;
-using Eto.Forms;
 using System.Windows.Controls;
 using Eto.CustomControls;
-using swc = System.Windows.Controls;
-using swcp = System.Windows.Controls.Primitives;
-using swm = System.Windows.Media;
-using System.Windows.Input;
-
 namespace Eto.Wpf.CustomControls.TreeGridView
 {
 	public class TreeTogglePanel : DockPanel
@@ -94,7 +87,7 @@ static TreeToggleButton ()
 			DefaultStyleKeyProperty.OverrideMetadata (typeof (TreeToggleButton), new FrameworkPropertyMetadata (typeof (TreeToggleButton)));
 		}
 
-		protected override void OnPreviewMouseLeftButtonUp(MouseButtonEventArgs e)
+		protected override void OnPreviewMouseLeftButtonUp(swi.MouseButtonEventArgs e)
 		{
 			base.OnPreviewMouseLeftButtonUp(e);
 
@@ -107,7 +100,7 @@ protected override void OnPreviewMouseLeftButtonUp(MouseButtonEventArgs e)
 				e.Handled = true;
 			}
 		}
-		protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e)
+		protected override void OnPreviewMouseLeftButtonDown(swi.MouseButtonEventArgs e)
 		{
 			base.OnPreviewMouseLeftButtonDown(e);
 			e.Handled = true;
diff --git a/src/Eto.Wpf/DragDropConversions.cs b/src/Eto.Wpf/DragDropConversions.cs
index 48ceadb339..56d7aa0195 100644
--- a/src/Eto.Wpf/DragDropConversions.cs
+++ b/src/Eto.Wpf/DragDropConversions.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
 using Eto.Wpf.Forms;
-using sw = System.Windows;
 
 namespace Eto.Wpf
 {
diff --git a/src/Eto.Wpf/Drawing/BitmapHandler.cs b/src/Eto.Wpf/Drawing/BitmapHandler.cs
index eb35ea79f0..cf57538ffe 100644
--- a/src/Eto.Wpf/Drawing/BitmapHandler.cs
+++ b/src/Eto.Wpf/Drawing/BitmapHandler.cs
@@ -1,16 +1,5 @@
-using System;
-using swm = System.Windows.Media;
-using sw = System.Windows;
-using swmi = System.Windows.Media.Imaging;
-using Eto.Drawing;
 using Eto.Wpf.Forms;
-using System.IO;
 using Eto.Shared.Drawing;
-using System.Linq;
-using System.Collections.Generic;
-using Eto.Forms;
-using System.Runtime.InteropServices;
-
 namespace Eto.Wpf.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.Wpf/Drawing/CachedBitmapFrame.cs b/src/Eto.Wpf/Drawing/CachedBitmapFrame.cs
index 0af0e6d1fc..828886d713 100644
--- a/src/Eto.Wpf/Drawing/CachedBitmapFrame.cs
+++ b/src/Eto.Wpf/Drawing/CachedBitmapFrame.cs
@@ -1,8 +1,3 @@
-using System;
-using sw = System.Windows;
-using swm = System.Windows.Media;
-using swmi = System.Windows.Media.Imaging;
-
 namespace Eto.Wpf.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.Wpf/Drawing/FontFamilyHandler.cs b/src/Eto.Wpf/Drawing/FontFamilyHandler.cs
index a7b80dea46..bf96649d0d 100755
--- a/src/Eto.Wpf/Drawing/FontFamilyHandler.cs
+++ b/src/Eto.Wpf/Drawing/FontFamilyHandler.cs
@@ -1,14 +1,4 @@
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Linq;
-using swm = System.Windows.Media;
-using sw = System.Windows;
 using swd = System.Windows.Documents;
-using System.Diagnostics;
-using System.Globalization;
-using Eto.Forms;
-using System.IO;
-using System;
 using Eto.Shared.Drawing;
 using Eto.Wpf.CustomControls.FontDialog;
 
diff --git a/src/Eto.Wpf/Drawing/FontHandler.cs b/src/Eto.Wpf/Drawing/FontHandler.cs
index fcfd1ab34c..72403bcf95 100644
--- a/src/Eto.Wpf/Drawing/FontHandler.cs
+++ b/src/Eto.Wpf/Drawing/FontHandler.cs
@@ -1,12 +1,4 @@
-using System;
-using Eto.Drawing;
-using swc = System.Windows.Controls;
-using swm = System.Windows.Media;
-using sw = System.Windows;
-using sd = System.Drawing;
 using swd = System.Windows.Documents;
-using System.Globalization;
-
 namespace Eto.Wpf.Drawing
 {
 	public class FontHandler : WidgetHandler<object, Font>, Font.IHandler
diff --git a/src/Eto.Wpf/Drawing/FontTypefaceHandler.cs b/src/Eto.Wpf/Drawing/FontTypefaceHandler.cs
index a09edc2902..274aca5e3c 100755
--- a/src/Eto.Wpf/Drawing/FontTypefaceHandler.cs
+++ b/src/Eto.Wpf/Drawing/FontTypefaceHandler.cs
@@ -1,15 +1,5 @@
-using Eto.Drawing;
-using System.Globalization;
-using System.Linq;
-using swm = System.Windows.Media;
-using sw = System.Windows;
 using swd = System.Windows.Documents;
 using Eto.Wpf.CustomControls.FontDialog;
-using System.Collections.Generic;
-using Eto.Forms;
-using System.IO;
-using System.Runtime.InteropServices;
-using System;
 using Eto.Shared.Drawing;
 
 namespace Eto.Wpf.Drawing
diff --git a/src/Eto.Wpf/Drawing/FontsHandler.cs b/src/Eto.Wpf/Drawing/FontsHandler.cs
index 914eee1808..916b690d57 100644
--- a/src/Eto.Wpf/Drawing/FontsHandler.cs
+++ b/src/Eto.Wpf/Drawing/FontsHandler.cs
@@ -1,9 +1,3 @@
-using Eto.Drawing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using swm = System.Windows.Media;
-
 namespace Eto.Wpf.Drawing
 {
 	public class FontsHandler : WidgetHandler<Widget>, Fonts.IHandler
diff --git a/src/Eto.Wpf/Drawing/FormattedTextHandler.cs b/src/Eto.Wpf/Drawing/FormattedTextHandler.cs
index e950263c86..ca760a0edf 100644
--- a/src/Eto.Wpf/Drawing/FormattedTextHandler.cs
+++ b/src/Eto.Wpf/Drawing/FormattedTextHandler.cs
@@ -1,15 +1,3 @@
-using Eto.Drawing;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using sw = System.Windows;
-using swm = System.Windows.Media;
-using swmt = System.Windows.Media.TextFormatting;
-
 namespace Eto.Wpf.Drawing
 {
 	public class FormattedTextHandler : WidgetHandler<swm.FormattedText, FormattedText, FormattedText.ICallback>, FormattedText.IHandler
diff --git a/src/Eto.Wpf/Drawing/GraphicsHandler.cs b/src/Eto.Wpf/Drawing/GraphicsHandler.cs
index 562d44081f..180b34bfc8 100644
--- a/src/Eto.Wpf/Drawing/GraphicsHandler.cs
+++ b/src/Eto.Wpf/Drawing/GraphicsHandler.cs
@@ -1,13 +1,3 @@
-using System;
-using swm = System.Windows.Media;
-using sw = System.Windows;
-using swmi = System.Windows.Media.Imaging;
-using Eto.Drawing;
-using System.Globalization;
-using System.Diagnostics;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.Wpf.Drawing
 {
     /// <summary>
diff --git a/src/Eto.Wpf/Drawing/GraphicsPathHandler.cs b/src/Eto.Wpf/Drawing/GraphicsPathHandler.cs
index d7934708a6..48ef9d7fe3 100644
--- a/src/Eto.Wpf/Drawing/GraphicsPathHandler.cs
+++ b/src/Eto.Wpf/Drawing/GraphicsPathHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using sw = System.Windows;
-using swm = System.Windows.Media;
-using Eto.Drawing;
-
 namespace Eto.Wpf.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.Wpf/Drawing/IconFrameHandler.cs b/src/Eto.Wpf/Drawing/IconFrameHandler.cs
index 93f9a2c3f5..861b537dc3 100644
--- a/src/Eto.Wpf/Drawing/IconFrameHandler.cs
+++ b/src/Eto.Wpf/Drawing/IconFrameHandler.cs
@@ -1,15 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using Eto.Drawing;
-using System.IO;
-using sw = System.Windows;
-using swi = System.Windows.Interop;
-using swm = System.Windows.Media;
-using swmi = System.Windows.Media.Imaging;
-using sd = System.Drawing;
-using System.Linq;
-
 namespace Eto.Wpf.Drawing
 {
 
diff --git a/src/Eto.Wpf/Drawing/IconHandler.cs b/src/Eto.Wpf/Drawing/IconHandler.cs
index efcfed2cbd..11b6ec08c0 100755
--- a/src/Eto.Wpf/Drawing/IconHandler.cs
+++ b/src/Eto.Wpf/Drawing/IconHandler.cs
@@ -1,15 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using Eto.Drawing;
-using System.IO;
-using sw = System.Windows;
-using swi = System.Windows.Interop;
-using swm = System.Windows.Media;
-using swmi = System.Windows.Media.Imaging;
-using sd = System.Drawing;
-using System.Linq;
-
 namespace Eto.Wpf.Drawing
 {
 	public interface IWpfImage
@@ -29,7 +17,7 @@ public IconHandler()
 		public IconHandler(sd.Icon icon)
 		{
 			var rect = new sw.Int32Rect(0, 0, icon.Width, icon.Height);
-			var img = swi.Imaging.CreateBitmapSourceFromHIcon(icon.Handle, rect, swmi.BitmapSizeOptions.FromEmptyOptions());
+			var img = swin.Imaging.CreateBitmapSourceFromHIcon(icon.Handle, rect, swmi.BitmapSizeOptions.FromEmptyOptions());
 			Control = swmi.BitmapFrame.Create(img);
 		}
 
diff --git a/src/Eto.Wpf/Drawing/IndexedBitmapHandler.cs b/src/Eto.Wpf/Drawing/IndexedBitmapHandler.cs
index 9a5b04eee3..4bb5907ea1 100644
--- a/src/Eto.Wpf/Drawing/IndexedBitmapHandler.cs
+++ b/src/Eto.Wpf/Drawing/IndexedBitmapHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using sw = System.Windows;
-using swm = System.Windows.Media;
-using swmi = System.Windows.Media.Imaging;
-using Eto.Drawing;
 using Eto.Wpf.Forms;
 
 namespace Eto.Wpf.Drawing
diff --git a/src/Eto.Wpf/Drawing/LinearGradientBrushHandler.cs b/src/Eto.Wpf/Drawing/LinearGradientBrushHandler.cs
index 0be2d5b5fa..3a8535aae1 100644
--- a/src/Eto.Wpf/Drawing/LinearGradientBrushHandler.cs
+++ b/src/Eto.Wpf/Drawing/LinearGradientBrushHandler.cs
@@ -1,6 +1,3 @@
-using Eto.Drawing;
-using swm = System.Windows.Media;
-
 namespace Eto.Wpf.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.Wpf/Drawing/MatrixHandler.cs b/src/Eto.Wpf/Drawing/MatrixHandler.cs
index e2f1ff489e..3df700cec2 100644
--- a/src/Eto.Wpf/Drawing/MatrixHandler.cs
+++ b/src/Eto.Wpf/Drawing/MatrixHandler.cs
@@ -1,6 +1,3 @@
-using Eto.Drawing;
-using swm = System.Windows.Media;
-
 namespace Eto.Wpf.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.Wpf/Drawing/PenHandler.cs b/src/Eto.Wpf/Drawing/PenHandler.cs
index 31f1098e9a..296e2c94b5 100644
--- a/src/Eto.Wpf/Drawing/PenHandler.cs
+++ b/src/Eto.Wpf/Drawing/PenHandler.cs
@@ -1,8 +1,3 @@
-using Eto.Drawing;
-using System;
-using swm = System.Windows.Media;
-using sw = System.Windows;
-
 namespace Eto.Wpf.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.Wpf/Drawing/RadialGradientBrushHandler.cs b/src/Eto.Wpf/Drawing/RadialGradientBrushHandler.cs
index a90f957867..1122d728ac 100644
--- a/src/Eto.Wpf/Drawing/RadialGradientBrushHandler.cs
+++ b/src/Eto.Wpf/Drawing/RadialGradientBrushHandler.cs
@@ -1,6 +1,3 @@
-using Eto.Drawing;
-using swm = System.Windows.Media;
-
 namespace Eto.Wpf.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.Wpf/Drawing/SolidBrushHandler.cs b/src/Eto.Wpf/Drawing/SolidBrushHandler.cs
index 4bf99ecad0..1396c56457 100644
--- a/src/Eto.Wpf/Drawing/SolidBrushHandler.cs
+++ b/src/Eto.Wpf/Drawing/SolidBrushHandler.cs
@@ -1,6 +1,3 @@
-using Eto.Drawing;
-using swm = System.Windows.Media;
-
 namespace Eto.Wpf.Drawing
 {
 	class FrozenBrushWrapper
diff --git a/src/Eto.Wpf/Drawing/SystemColorsHandler.cs b/src/Eto.Wpf/Drawing/SystemColorsHandler.cs
index e8793621da..7a72b0798b 100644
--- a/src/Eto.Wpf/Drawing/SystemColorsHandler.cs
+++ b/src/Eto.Wpf/Drawing/SystemColorsHandler.cs
@@ -1,12 +1,3 @@
-using Eto.Drawing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using sw = System.Windows;
-using swm = System.Windows.Media;
-
 namespace Eto.Wpf.Drawing
 {
 	public class SystemColorsHandler : SystemColors.IHandler
diff --git a/src/Eto.Wpf/Drawing/TextureBrushHandler.cs b/src/Eto.Wpf/Drawing/TextureBrushHandler.cs
index 1835607df8..c253be8b44 100644
--- a/src/Eto.Wpf/Drawing/TextureBrushHandler.cs
+++ b/src/Eto.Wpf/Drawing/TextureBrushHandler.cs
@@ -1,6 +1,3 @@
-using Eto.Drawing;
-using swm = System.Windows.Media;
-
 namespace Eto.Wpf.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.Wpf/Drawing/TransformStack.cs b/src/Eto.Wpf/Drawing/TransformStack.cs
index 30f0f41a75..5cd51d1d6d 100644
--- a/src/Eto.Wpf/Drawing/TransformStack.cs
+++ b/src/Eto.Wpf/Drawing/TransformStack.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using Eto.Drawing;
-
 namespace Eto.Wpf.Drawing
 {
 	/// <summary>
diff --git a/src/Eto.Wpf/Eto.Wpf.csproj b/src/Eto.Wpf/Eto.Wpf.csproj
index ac3ff731b6..aa6de71a5e 100755
--- a/src/Eto.Wpf/Eto.Wpf.csproj
+++ b/src/Eto.Wpf/Eto.Wpf.csproj
@@ -53,6 +53,22 @@ You do not need to use any of the classes of this assembly (unless customizing t
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
   </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="System.Windows" Alias="sw" />
+    <Using Include="System.Windows.Controls" Alias="swc" />
+    <Using Include="System.Windows.Controls.Primitives" Alias="swcp" />
+    <Using Include="System.Windows.Documents" Alias="swdoc" />
+    <Using Include="System.Windows.Input" Alias="swi" />
+    <Using Include="System.Windows.Interop" Alias="swin" />
+    <Using Include="System.Windows.Threading" Alias="swt" />
+    <Using Include="System.Windows.Markup" Alias="swk" />
+    <Using Include="System.Windows.Media" Alias="swm" />
+    <Using Include="System.Windows.Media.Imaging" Alias="swmi" />
+    <Using Include="System.Drawing" Alias="sd" />
+    <Using Include="System.Windows.Forms" Alias="swf" />
+    <Using Include="Xceed.Wpf.Toolkit" Alias="xwt" />
+  </ItemGroup>
   
   <ItemGroup Condition="$(TargetFramework.StartsWith('net4')) == 'true'">
     <Reference Include="System" Pack="False" />
diff --git a/src/Eto.Wpf/EtoEnvironmentHandler.cs b/src/Eto.Wpf/EtoEnvironmentHandler.cs
index 2244aed523..63cb4ebbf1 100644
--- a/src/Eto.Wpf/EtoEnvironmentHandler.cs
+++ b/src/Eto.Wpf/EtoEnvironmentHandler.cs
@@ -1,8 +1,4 @@
-using System;
 using Eto;
-using System.Reflection;
-using System.IO;
-
 namespace Eto.Wpf
 {
 	public class EtoEnvironmentHandler : WidgetHandler<Widget>, EtoEnvironment.IHandler
diff --git a/src/Eto.Wpf/Forms/ApplicationHandler.cs b/src/Eto.Wpf/Forms/ApplicationHandler.cs
index 2df89f0ae0..8fdcbec11e 100755
--- a/src/Eto.Wpf/Forms/ApplicationHandler.cs
+++ b/src/Eto.Wpf/Forms/ApplicationHandler.cs
@@ -1,14 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Eto.Forms;
-using System.Diagnostics;
-using System.Reflection;
-using sw = System.Windows;
-using swm = System.Windows.Media;
-using System.Threading;
 using System.Windows.Threading;
-using Eto.Drawing;
-
 namespace Eto.Wpf.Forms
 {
 	public class ApplicationHandler : WidgetHandler<sw.Application, Application, Application.ICallback>, Application.IHandler
diff --git a/src/Eto.Wpf/Forms/Cells/CellHandler.cs b/src/Eto.Wpf/Forms/Cells/CellHandler.cs
index 07e2da14f0..2ecb2cb46f 100755
--- a/src/Eto.Wpf/Forms/Cells/CellHandler.cs
+++ b/src/Eto.Wpf/Forms/Cells/CellHandler.cs
@@ -1,7 +1,3 @@
-using sw = System.Windows;
-using swc = System.Windows.Controls;
-using Eto.Forms;
-
 namespace Eto.Wpf.Forms.Cells
 {
 	public interface ICellContainerHandler
diff --git a/src/Eto.Wpf/Forms/Cells/CheckBoxCellHandler.cs b/src/Eto.Wpf/Forms/Cells/CheckBoxCellHandler.cs
index f5198afc15..f3b81b7b28 100755
--- a/src/Eto.Wpf/Forms/Cells/CheckBoxCellHandler.cs
+++ b/src/Eto.Wpf/Forms/Cells/CheckBoxCellHandler.cs
@@ -1,12 +1,5 @@
-using System;
-using Eto.Forms;
-using swc = System.Windows.Controls;
-using swd = System.Windows.Data;
-using sw = System.Windows;
 using System.Windows;
 using System.Windows.Controls;
-using System.Linq;
-
 namespace Eto.Wpf.Forms.Cells
 {
 	public class CheckBoxCellHandler : CellHandler<swc.DataGridCheckBoxColumn, CheckBoxCell, CheckBoxCell.ICallback>, CheckBoxCell.IHandler
diff --git a/src/Eto.Wpf/Forms/Cells/ComboBoxCellHandler.cs b/src/Eto.Wpf/Forms/Cells/ComboBoxCellHandler.cs
index 3e32eeb7e3..bfb6621c36 100755
--- a/src/Eto.Wpf/Forms/Cells/ComboBoxCellHandler.cs
+++ b/src/Eto.Wpf/Forms/Cells/ComboBoxCellHandler.cs
@@ -1,12 +1,3 @@
-using System;
-using Eto.Forms;
-using swc = System.Windows.Controls;
-using swd = System.Windows.Data;
-using sw = System.Windows;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-
 namespace Eto.Wpf.Forms.Cells
 {
 	public class ComboBoxCellHandler : CellHandler<swc.DataGridComboBoxColumn, ComboBoxCell, ComboBoxCell.ICallback>, ComboBoxCell.IHandler
diff --git a/src/Eto.Wpf/Forms/Cells/CustomCellHandler.cs b/src/Eto.Wpf/Forms/Cells/CustomCellHandler.cs
index 30659e2b51..1f9d60ba94 100755
--- a/src/Eto.Wpf/Forms/Cells/CustomCellHandler.cs
+++ b/src/Eto.Wpf/Forms/Cells/CustomCellHandler.cs
@@ -1,15 +1,5 @@
-using Eto.Forms;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using swd = System.Windows.Data;
-using swm = System.Windows.Media;
-using swi = System.Windows.Input;
 using Eto.Wpf.Drawing;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System;
 using System.Windows;
-using System.Windows.Input;
 using Eto.Wpf.Forms.Controls;
 
 namespace Eto.Wpf.Forms.Cells
@@ -129,7 +119,7 @@ EtoBorder Create(swc.DataGridCell cell)
 				return control;
 			}
 
-			static void HandlePreviewMouseDown(object sender, MouseButtonEventArgs e)
+			static void HandlePreviewMouseDown(object sender, swi.MouseButtonEventArgs e)
 			{
 				var ctl = sender as sw.FrameworkElement;
 				var cell = ctl?.GetVisualParent<swc.DataGridCell>();
diff --git a/src/Eto.Wpf/Forms/Cells/DrawableCellHandler.cs b/src/Eto.Wpf/Forms/Cells/DrawableCellHandler.cs
index f5cff565f3..da659c85ed 100755
--- a/src/Eto.Wpf/Forms/Cells/DrawableCellHandler.cs
+++ b/src/Eto.Wpf/Forms/Cells/DrawableCellHandler.cs
@@ -1,11 +1,4 @@
-using Eto.Forms;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using swd = System.Windows.Data;
-using swm = System.Windows.Media;
 using Eto.Wpf.Drawing;
-using Eto.Drawing;
-
 namespace Eto.Wpf.Forms.Cells
 {
 	public class DrawableCellHandler : CellHandler<swc.DataGridColumn, DrawableCell, DrawableCell.ICallback>, DrawableCell.IHandler
diff --git a/src/Eto.Wpf/Forms/Cells/ImageTextCellHandler.cs b/src/Eto.Wpf/Forms/Cells/ImageTextCellHandler.cs
index e17425017a..1b62796a23 100755
--- a/src/Eto.Wpf/Forms/Cells/ImageTextCellHandler.cs
+++ b/src/Eto.Wpf/Forms/Cells/ImageTextCellHandler.cs
@@ -1,14 +1,5 @@
-using System;
-using Eto.Forms;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
 using swd = System.Windows.Data;
-using swm = System.Windows.Media;
 using Eto.Wpf.Drawing;
-using Eto.Drawing;
-using System.ComponentModel;
-using System.Linq;
-
 namespace Eto.Wpf.Forms.Cells
 {
 	public class ImageTextCellHandler : CellHandler<ImageTextCellHandler.Column, ImageTextCell, ImageTextCell.ICallback>, ImageTextCell.IHandler
diff --git a/src/Eto.Wpf/Forms/Cells/ImageViewCellHandler.cs b/src/Eto.Wpf/Forms/Cells/ImageViewCellHandler.cs
index 535969afdb..a3ba7093ef 100755
--- a/src/Eto.Wpf/Forms/Cells/ImageViewCellHandler.cs
+++ b/src/Eto.Wpf/Forms/Cells/ImageViewCellHandler.cs
@@ -1,11 +1,4 @@
-using Eto.Forms;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using swd = System.Windows.Data;
-using swm = System.Windows.Media;
 using Eto.Wpf.Drawing;
-using Eto.Drawing;
-
 namespace Eto.Wpf.Forms.Cells
 {
 	public class ImageViewCellHandler : CellHandler<ImageViewCellHandler.Column, ImageViewCell, ImageViewCell.ICallback>, ImageViewCell.IHandler
diff --git a/src/Eto.Wpf/Forms/Cells/ProgressCellHandler.cs b/src/Eto.Wpf/Forms/Cells/ProgressCellHandler.cs
index 2308314fc2..c27aa728fd 100755
--- a/src/Eto.Wpf/Forms/Cells/ProgressCellHandler.cs
+++ b/src/Eto.Wpf/Forms/Cells/ProgressCellHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using Eto.Forms;
-using swc = System.Windows.Controls;
-using swd = System.Windows.Data;
-using sw = System.Windows;
-
 namespace Eto.Wpf.Forms.Cells
 {
 	public class ProgressCellHandler : CellHandler<ProgressCellHandler.DataGridProgressBarColumn, ProgressCell, ProgressCell.ICallback>, ProgressCell.IHandler
diff --git a/src/Eto.Wpf/Forms/Cells/TextBoxCellHandler.cs b/src/Eto.Wpf/Forms/Cells/TextBoxCellHandler.cs
index dbf0885ebc..643f577166 100755
--- a/src/Eto.Wpf/Forms/Cells/TextBoxCellHandler.cs
+++ b/src/Eto.Wpf/Forms/Cells/TextBoxCellHandler.cs
@@ -1,11 +1,4 @@
-using System;
-using Eto.Forms;
-using swc = System.Windows.Controls;
 using swd = System.Windows.Data;
-using sw = System.Windows;
-using swm = System.Windows.Media;
-using System.ComponentModel;
-
 namespace Eto.Wpf.Forms.Cells
 {
 	public class TextBoxCellHandler : CellHandler<TextBoxCellHandler.Column, TextBoxCell, TextBoxCell.ICallback>, TextBoxCell.IHandler
diff --git a/src/Eto.Wpf/Forms/ClipboardHandler.cs b/src/Eto.Wpf/Forms/ClipboardHandler.cs
index 43f3c0fe67..7e05507086 100755
--- a/src/Eto.Wpf/Forms/ClipboardHandler.cs
+++ b/src/Eto.Wpf/Forms/ClipboardHandler.cs
@@ -1,18 +1,4 @@
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.Wpf.Drawing;
-using System;
-using sc = System.ComponentModel;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Linq;
-using System.Threading;
-using sw = System.Windows;
-using swm = System.Windows.Media;
-using swmi = System.Windows.Media.Imaging;
-using System.Collections.Specialized;
-
 namespace Eto.Wpf.Forms
 {
 	public class ClipboardHandler : DataObjectHandler<Clipboard, Clipboard.ICallback>, Clipboard.IHandler
diff --git a/src/Eto.Wpf/Forms/ColorDialogHandler.cs b/src/Eto.Wpf/Forms/ColorDialogHandler.cs
index d80563b96d..e9dc0f6fab 100644
--- a/src/Eto.Wpf/Forms/ColorDialogHandler.cs
+++ b/src/Eto.Wpf/Forms/ColorDialogHandler.cs
@@ -1,11 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using sw = System.Windows;
-using swm = System.Windows.Media;
-using swc = System.Windows.Controls;
-using xwt = Xceed.Wpf.Toolkit;
-
 namespace Eto.Wpf.Forms
 {
 	public class XceedColorDialog : sw.Window
diff --git a/src/Eto.Wpf/Forms/Controls/ButtonHandler.cs b/src/Eto.Wpf/Forms/Controls/ButtonHandler.cs
index ebfb30ffdf..9a1b95a53d 100644
--- a/src/Eto.Wpf/Forms/Controls/ButtonHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/ButtonHandler.cs
@@ -1,19 +1,10 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using sw = System.Windows;
-using swc = System.Windows.Controls;
-using wf = System.Windows;
-
-using WpfLabel = System.Windows.Controls.Label;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	public class EtoButton : swc.Button, IEtoWpfControl
 	{
 		public IWpfFrameworkElement Handler { get; set; }
 
-		protected override wf.Size MeasureOverride(wf.Size constraint)
+		protected override sw.Size MeasureOverride(sw.Size constraint)
 		{
 			return Handler?.MeasureOverride(constraint, base.MeasureOverride) ?? base.MeasureOverride(constraint);
 		}
@@ -43,7 +34,7 @@ public class ButtonHandler<TControl, TWidget, TCallback> : WpfControl<TControl,
 	{
 		public swc.Image ImagePart { get; private set; }
 
-		public WpfLabel LabelPart { get; private set; }
+		public swc.Label LabelPart { get; private set; }
 
 		/// <summary>
 		/// Gets or sets the spacing between the image and the label when both are present
@@ -60,14 +51,14 @@ public int ImageLabelSpacing
 			}
 		}
 
-		protected override wf.Size DefaultSize => MinimumSize.ToWpf();
+		protected override sw.Size DefaultSize => MinimumSize.ToWpf();
 
 		protected virtual Size GetDefaultMinimumSize() => Size.Empty;
 
 		protected override void Initialize()
 		{
 			Control.Click += (sender, e) => Callback.OnClick(Widget, EventArgs.Empty);
-			LabelPart = new WpfLabel
+			LabelPart = new swc.Label
 			{
 				IsHitTestVisible = false,
 				VerticalAlignment = sw.VerticalAlignment.Center,
diff --git a/src/Eto.Wpf/Forms/Controls/CalendarHandler.cs b/src/Eto.Wpf/Forms/Controls/CalendarHandler.cs
index 5a3ba73a89..e941f8b407 100644
--- a/src/Eto.Wpf/Forms/Controls/CalendarHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/CalendarHandler.cs
@@ -1,10 +1,4 @@
-using Eto.Forms;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using swc = System.Windows.Controls;
-using System.Windows;
+using System.Windows;
 
 namespace Eto.Wpf.Forms.Controls
 {
@@ -12,7 +6,7 @@ public class EtoCalendar : swc.Calendar, IEtoWpfControl
 	{
 		public IWpfFrameworkElement Handler { get; set; }
 
-		protected override Size MeasureOverride(Size constraint)
+		protected override sw.Size MeasureOverride(sw.Size constraint)
 		{
 			return Handler?.MeasureOverride(constraint, base.MeasureOverride) ?? base.MeasureOverride(constraint);
 		}
diff --git a/src/Eto.Wpf/Forms/Controls/CheckBoxHandler.cs b/src/Eto.Wpf/Forms/Controls/CheckBoxHandler.cs
index aabbbdef50..bf8d1f0096 100644
--- a/src/Eto.Wpf/Forms/Controls/CheckBoxHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/CheckBoxHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using sw = System.Windows;
-using swc = System.Windows.Controls;
-using Eto.Forms;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	public class CheckBoxHandler : WpfControl<swc.CheckBox, CheckBox, CheckBox.ICallback>, CheckBox.IHandler
diff --git a/src/Eto.Wpf/Forms/Controls/ColorPickerHandler.cs b/src/Eto.Wpf/Forms/Controls/ColorPickerHandler.cs
index 018ae63852..f762f19104 100644
--- a/src/Eto.Wpf/Forms/Controls/ColorPickerHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/ColorPickerHandler.cs
@@ -1,15 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-using xwt = Xceed.Wpf.Toolkit;
-using sw = System.Windows;
-using swc = System.Windows.Controls;
-using swm = System.Windows.Media;
-using Eto.Forms;
-using System.ComponentModel;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	public class EtoColorPicker : xwt.ColorPicker, IEtoWpfControl
diff --git a/src/Eto.Wpf/Forms/Controls/ComboBoxHandler.cs b/src/Eto.Wpf/Forms/Controls/ComboBoxHandler.cs
index d2695959b3..9707407796 100644
--- a/src/Eto.Wpf/Forms/Controls/ComboBoxHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/ComboBoxHandler.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Linq;
-using Eto.Drawing;
-using Eto.Forms;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-
-namespace Eto.Wpf.Forms.Controls
+namespace Eto.Wpf.Forms.Controls
 {
 	public class ComboBoxHandler : DropDownHandler<EtoComboBox, ComboBox, ComboBox.ICallback>, ComboBox.IHandler
 	{
diff --git a/src/Eto.Wpf/Forms/Controls/DateTimePickerHandler.cs b/src/Eto.Wpf/Forms/Controls/DateTimePickerHandler.cs
index 85e11eac21..cfe8e3e156 100644
--- a/src/Eto.Wpf/Forms/Controls/DateTimePickerHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/DateTimePickerHandler.cs
@@ -1,18 +1,11 @@
-using System;
-using Eto.Forms;
-using mwc = Xceed.Wpf.Toolkit;
-using sw = System.Windows;
-using swc = System.Windows.Controls;
-using System.Globalization;
-using Eto.Drawing;
 using Eto.Wpf.Drawing;
 
 namespace Eto.Wpf.Forms.Controls
 {
 	public class DateTimePickerHandler : WpfFrameworkElement<swc.Border, DateTimePicker, DateTimePicker.ICallback>, DateTimePicker.IHandler
 	{
-		mwc.DateTimePicker dtp;
-		mwc.DateTimeUpDown dtud;
+		xwt.DateTimePicker dtp;
+		xwt.DateTimeUpDown dtud;
 		DateTime? last;
 
 		DateTimePickerMode mode;
@@ -27,7 +20,7 @@ public DateTimePickerHandler()
 			Mode = DateTimePickerMode.Date;
 		}
 
-		static sw.Thickness DefaultBorderThickness = new mwc.DateTimePicker().BorderThickness;
+		static sw.Thickness DefaultBorderThickness = new xwt.DateTimePicker().BorderThickness;
 
 		public bool ShowBorder
 		{
@@ -39,7 +32,7 @@ void CreateDateTimeUpDown()
 		{
 			if (dtud == null)
 			{
-				dtud = new mwc.DateTimeUpDown
+				dtud = new xwt.DateTimeUpDown
 				{
 					Focusable = true,
 					IsTabStop = true,
@@ -61,7 +54,7 @@ void CreateDateTimePicker()
 		{
 			if (dtp == null)
 			{
-				dtp = new mwc.DateTimePicker
+				dtp = new xwt.DateTimePicker
 				{
 					ShowButtonSpinner = false,
 					AutoCloseCalendar = true,
@@ -80,7 +73,7 @@ void CreateDateTimePicker()
 			Control.Child = dtp;
 		}
 
-		void CopyValues(mwc.Primitives.UpDownBase<DateTime?> source, mwc.Primitives.UpDownBase<DateTime?> dest)
+		void CopyValues(xwt.Primitives.UpDownBase<DateTime?> source, xwt.Primitives.UpDownBase<DateTime?> dest)
 		{
 			dest.Minimum = source.Minimum;
 			dest.Maximum = source.Maximum;
@@ -122,7 +115,7 @@ public DateTime? Value
 			set { UpDown.Value = value; }
 		}
 
-		mwc.Primitives.UpDownBase<DateTime?> UpDown
+		xwt.Primitives.UpDownBase<DateTime?> UpDown
 		{
 			get
 			{
@@ -153,18 +146,18 @@ public DateTimePickerMode Mode
 					case DateTimePickerMode.Date:
 						CreateDateTimePicker();
 						dtp.TimePickerVisibility = sw.Visibility.Collapsed;
-						dtp.Format = mwc.DateTimeFormat.ShortDate;
+						dtp.Format = xwt.DateTimeFormat.ShortDate;
 						break;
 					case DateTimePickerMode.DateTime:
 						CreateDateTimePicker();
 						dtp.TimePickerVisibility = sw.Visibility.Visible;
 						var format = CultureInfo.CurrentUICulture.DateTimeFormat;
-						dtp.Format = mwc.DateTimeFormat.Custom;
+						dtp.Format = xwt.DateTimeFormat.Custom;
 						dtp.FormatString = format.ShortDatePattern + " " + format.LongTimePattern;
 						break;
 					case DateTimePickerMode.Time:
 						CreateDateTimeUpDown();
-						dtud.Format = mwc.DateTimeFormat.LongTime;
+						dtud.Format = xwt.DateTimeFormat.LongTime;
 						break;
 					default:
 						throw new NotSupportedException();
diff --git a/src/Eto.Wpf/Forms/Controls/DrawableHandler.cs b/src/Eto.Wpf/Forms/Controls/DrawableHandler.cs
index f5e5b4a5c5..c1f47e640a 100644
--- a/src/Eto.Wpf/Forms/Controls/DrawableHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/DrawableHandler.cs
@@ -1,12 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using swm = System.Windows.Media;
-using Eto.Forms;
-using Eto.Drawing;
-using swi = System.Windows.Input;
 using Eto.Wpf.Drawing;
 
 namespace Eto.Wpf.Forms.Controls
diff --git a/src/Eto.Wpf/Forms/Controls/DropDownHandler.cs b/src/Eto.Wpf/Forms/Controls/DropDownHandler.cs
index 0e880513d4..542536fe5f 100755
--- a/src/Eto.Wpf/Forms/Controls/DropDownHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/DropDownHandler.cs
@@ -1,18 +1,5 @@
-using System;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
 using swd = System.Windows.Data;
-using swa = System.Windows.Automation;
-using swm = System.Windows.Media;
-using Eto.Forms;
-using System.Collections;
-using System.Collections.Generic;
-using Eto.Drawing;
-using System.Globalization;
 using Eto.Wpf.Drawing;
-using System.Linq;
-using System.Collections.Specialized;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	
diff --git a/src/Eto.Wpf/Forms/Controls/ExpanderHandler.cs b/src/Eto.Wpf/Forms/Controls/ExpanderHandler.cs
index 5551c1d2d3..0e0e75d147 100644
--- a/src/Eto.Wpf/Forms/Controls/ExpanderHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/ExpanderHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using sw = System.Windows;
-using swc = System.Windows.Controls;
-using System.ComponentModel;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	public class EtoExpander : swc.Expander, IEtoWpfControl
diff --git a/src/Eto.Wpf/Forms/Controls/GridColumnHandler.cs b/src/Eto.Wpf/Forms/Controls/GridColumnHandler.cs
index 3b29eb0114..6deb9493eb 100755
--- a/src/Eto.Wpf/Forms/Controls/GridColumnHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/GridColumnHandler.cs
@@ -1,11 +1,4 @@
 using Eto.Wpf.Forms.Cells;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using swd = System.Windows.Data;
-using Eto.Forms;
-using System.Globalization;
-using System;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	public interface IGridHandler
diff --git a/src/Eto.Wpf/Forms/Controls/GridHandler.cs b/src/Eto.Wpf/Forms/Controls/GridHandler.cs
index 728bf6f586..ac5d52d632 100755
--- a/src/Eto.Wpf/Forms/Controls/GridHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/GridHandler.cs
@@ -1,21 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using Eto.Wpf.Forms.Cells;
-using sw = System.Windows;
-using swc = System.Windows.Controls;
-using swm = System.Windows.Media;
-using swi = System.Windows.Input;
-using Eto.Forms;
-using System.Collections;
-using System.ComponentModel;
 using Eto.Wpf.Forms.Menu;
-using Eto.Drawing;
 using Eto.Wpf.Drawing;
 using Eto.Wpf.CustomControls.TreeGridView;
 using System.Windows;
-using System.Windows.Input;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	public class EtoDataGrid : swc.DataGrid
@@ -519,7 +506,7 @@ hitTestResult is swc.ScrollViewer // below rows
 			}
 		}
 		
-		private void HandleOutsideMouseDown(object sender, MouseButtonEventArgs e)
+		private void HandleOutsideMouseDown(object sender, swi.MouseButtonEventArgs e)
 		{
 			if (!e.Handled)
 			{
diff --git a/src/Eto.Wpf/Forms/Controls/GridViewHandler.cs b/src/Eto.Wpf/Forms/Controls/GridViewHandler.cs
index bc5d0be0a5..7356afbaad 100644
--- a/src/Eto.Wpf/Forms/Controls/GridViewHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/GridViewHandler.cs
@@ -1,15 +1,3 @@
-using swc = System.Windows.Controls;
-using Eto.Forms;
-using System.Collections.ObjectModel;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using Eto.Drawing;
-using System;
-using swm = System.Windows.Media;
-using System.Collections;
-using sw = System.Windows;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	public class GridViewHandler : GridHandler<GridView, GridView.ICallback>, GridView.IHandler
diff --git a/src/Eto.Wpf/Forms/Controls/GroupBoxHandler.cs b/src/Eto.Wpf/Forms/Controls/GroupBoxHandler.cs
index 9279099a90..999c1884db 100644
--- a/src/Eto.Wpf/Forms/Controls/GroupBoxHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/GroupBoxHandler.cs
@@ -1,10 +1,4 @@
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using swd = System.Windows.Data;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Wpf.Drawing;
-using System;
 using System.Windows;
 
 namespace Eto.Wpf.Forms.Controls
diff --git a/src/Eto.Wpf/Forms/Controls/ImageViewHandler.cs b/src/Eto.Wpf/Forms/Controls/ImageViewHandler.cs
index a329dc912a..bbd0f7afbd 100755
--- a/src/Eto.Wpf/Forms/Controls/ImageViewHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/ImageViewHandler.cs
@@ -1,11 +1,4 @@
-using swc = System.Windows.Controls;
-using swm = System.Windows.Media;
-using sw = System.Windows;
-using Eto.Forms;
-using Eto.Drawing;
 using System.Windows;
-using System;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	public class ImageViewHandler : WpfFrameworkElement<CustomControls.MultiSizeImage, ImageView, ImageView.ICallback>, ImageView.IHandler
diff --git a/src/Eto.Wpf/Forms/Controls/LabelHandler.cs b/src/Eto.Wpf/Forms/Controls/LabelHandler.cs
index f9ece6c8bf..a345e34dd8 100644
--- a/src/Eto.Wpf/Forms/Controls/LabelHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/LabelHandler.cs
@@ -1,11 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using swc = System.Windows.Controls;
-using swm = System.Windows.Media;
-using swi = System.Windows.Input;
-using sw = System.Windows;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	public class EtoLabel : swc.Label
diff --git a/src/Eto.Wpf/Forms/Controls/LinkButtonHandler.cs b/src/Eto.Wpf/Forms/Controls/LinkButtonHandler.cs
index 60bf958964..df95b467e3 100644
--- a/src/Eto.Wpf/Forms/Controls/LinkButtonHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/LinkButtonHandler.cs
@@ -1,14 +1,5 @@
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.Wpf.Drawing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using sw = System.Windows;
-using swc = System.Windows.Controls;
 using swd = System.Windows.Documents;
-using swm = System.Windows.Media;
 
 namespace Eto.Wpf.Forms.Controls
 {
diff --git a/src/Eto.Wpf/Forms/Controls/ListBoxHandler.cs b/src/Eto.Wpf/Forms/Controls/ListBoxHandler.cs
index b2c228a2b9..c1a3d12639 100644
--- a/src/Eto.Wpf/Forms/Controls/ListBoxHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/ListBoxHandler.cs
@@ -1,14 +1,3 @@
-using System;
-using System.Linq;
-using Eto.Forms;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using swd = System.Windows.Data;
-using System.Collections.ObjectModel;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using Eto.Drawing;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	public class EtoListBox : swc.ListBox, IEtoWpfControl
diff --git a/src/Eto.Wpf/Forms/Controls/NativeControlHandler.cs b/src/Eto.Wpf/Forms/Controls/NativeControlHandler.cs
index b05fd10eb7..97e4bf8fe4 100644
--- a/src/Eto.Wpf/Forms/Controls/NativeControlHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/NativeControlHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Globalization;
-using Eto.Forms;
-using sw = System.Windows;
-
-namespace Eto.Wpf.Forms.Controls
+namespace Eto.Wpf.Forms.Controls
 {
 	public class NativeControlHandler : WpfFrameworkElement<sw.FrameworkElement, Control, Control.ICallback>
 	{
diff --git a/src/Eto.Wpf/Forms/Controls/NumericStepperHandler.cs b/src/Eto.Wpf/Forms/Controls/NumericStepperHandler.cs
index 0ce21d6911..2c57341381 100755
--- a/src/Eto.Wpf/Forms/Controls/NumericStepperHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/NumericStepperHandler.cs
@@ -1,20 +1,11 @@
-using System;
-using Eto.Drawing;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using Eto.Forms;
-using mwc = Xceed.Wpf.Toolkit;
-using System.Text;
-using System.Globalization;
-using System.Text.RegularExpressions;
 using System.Windows;
 
 namespace Eto.Wpf.Forms.Controls
 {
-	public class EtoDoubleUpDown : mwc.DoubleUpDown, IEtoWpfControl
+	public class EtoDoubleUpDown : xwt.DoubleUpDown, IEtoWpfControl
 	{
 		public new swc.TextBox TextBox { get { return base.TextBox; } }
-		public new mwc.Spinner Spinner { get { return base.Spinner; } }
+		public new xwt.Spinner Spinner { get { return base.Spinner; } }
 
 		public IWpfFrameworkElement Handler { get; set; }
 
diff --git a/src/Eto.Wpf/Forms/Controls/PanelHandler.cs b/src/Eto.Wpf/Forms/Controls/PanelHandler.cs
index a61f073dfd..12311481b8 100644
--- a/src/Eto.Wpf/Forms/Controls/PanelHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/PanelHandler.cs
@@ -1,9 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-using sw = System.Windows;
-using swc = System.Windows.Controls;
-using swm = System.Windows.Media;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	public class PanelHandler : WpfPanel<swc.Border, Panel, Panel.ICallback>, Panel.IHandler
diff --git a/src/Eto.Wpf/Forms/Controls/PasswordBoxHandler.cs b/src/Eto.Wpf/Forms/Controls/PasswordBoxHandler.cs
index 63ab0684dc..ff48b47682 100644
--- a/src/Eto.Wpf/Forms/Controls/PasswordBoxHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/PasswordBoxHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	public class PasswordBoxHandler : WpfControl<swc.PasswordBox, PasswordBox, PasswordBox.ICallback>, PasswordBox.IHandler
diff --git a/src/Eto.Wpf/Forms/Controls/ProgressBarHandler.cs b/src/Eto.Wpf/Forms/Controls/ProgressBarHandler.cs
index 939c485fa9..6655e1ccaf 100644
--- a/src/Eto.Wpf/Forms/Controls/ProgressBarHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/ProgressBarHandler.cs
@@ -1,9 +1,3 @@
-using sw = System.Windows;
-using swc = System.Windows.Controls;
-using Eto.Forms;
-using Eto.Drawing;
-using System;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	public class EtoProgressBar : swc.ProgressBar, IEtoWpfControl
diff --git a/src/Eto.Wpf/Forms/Controls/RadioButtonHandler.cs b/src/Eto.Wpf/Forms/Controls/RadioButtonHandler.cs
index 9337c74479..245c14a416 100644
--- a/src/Eto.Wpf/Forms/Controls/RadioButtonHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/RadioButtonHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	public class RadioButtonHandler : WpfControl<swc.RadioButton, RadioButton, RadioButton.ICallback>, RadioButton.IHandler
diff --git a/src/Eto.Wpf/Forms/Controls/RichTextAreaHandler.cs b/src/Eto.Wpf/Forms/Controls/RichTextAreaHandler.cs
index 43a88146e5..0e98519115 100755
--- a/src/Eto.Wpf/Forms/Controls/RichTextAreaHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/RichTextAreaHandler.cs
@@ -1,21 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
 using swd = System.Windows.Documents;
-using swm = System.Windows.Media;
-using swi = System.Windows.Input;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Wpf.Drawing;
-using System.Globalization;
-using System.Collections;
-using System.IO;
 using Eto.Wpf.CustomControls.FontDialog;
-using System.Text.RegularExpressions;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	public class EtoRichTextBox : swc.RichTextBox, IEtoWpfControl
diff --git a/src/Eto.Wpf/Forms/Controls/ScrollableHandler.cs b/src/Eto.Wpf/Forms/Controls/ScrollableHandler.cs
index f77a700688..4cfb2323bf 100644
--- a/src/Eto.Wpf/Forms/Controls/ScrollableHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/ScrollableHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using swm = System.Windows.Media;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	public class ScrollableHandler : WpfPanel<swc.Border, Scrollable, Scrollable.ICallback>, Scrollable.IHandler
diff --git a/src/Eto.Wpf/Forms/Controls/SearchBoxHandler.cs b/src/Eto.Wpf/Forms/Controls/SearchBoxHandler.cs
index a6a307a24d..deb06debd1 100755
--- a/src/Eto.Wpf/Forms/Controls/SearchBoxHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/SearchBoxHandler.cs
@@ -1,12 +1,5 @@
-using Eto.Forms;
 using Xceed.Wpf.Toolkit;
 using static Eto.Win32;
-using mwc = Xceed.Wpf.Toolkit;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using System.Windows.Input;
-using System;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	public class EtoSearchTextBox : EtoWatermarkTextBox
@@ -40,7 +33,7 @@ public ICommand ClearCommand
 
 	}
 
-	public class SearchBoxHandler : TextBoxHandler<mwc.WatermarkTextBox, TextBox, TextBox.ICallback>, SearchBox.IHandler
+	public class SearchBoxHandler : TextBoxHandler<xwt.WatermarkTextBox, TextBox, TextBox.ICallback>, SearchBox.IHandler
 	{
 		internal static object CurrentText_Key = new object();
 		internal static object CurrentSelection_Key = new object();
diff --git a/src/Eto.Wpf/Forms/Controls/SliderHandler.cs b/src/Eto.Wpf/Forms/Controls/SliderHandler.cs
index 2842ba4263..1300e909a8 100644
--- a/src/Eto.Wpf/Forms/Controls/SliderHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/SliderHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using Eto.Forms;
-
-namespace Eto.Wpf.Forms.Controls
+namespace Eto.Wpf.Forms.Controls
 {
 	public class EtoSlider : swc.Slider, IEtoWpfControl
 	{
diff --git a/src/Eto.Wpf/Forms/Controls/SplitterHandler.cs b/src/Eto.Wpf/Forms/Controls/SplitterHandler.cs
index 3ad507670d..6a4b7bb18e 100755
--- a/src/Eto.Wpf/Forms/Controls/SplitterHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/SplitterHandler.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Linq;
-using Eto.Forms;
-using swm = System.Windows.Media;
-using sw = System.Windows;
-using swc = System.Windows.Controls;
-using Eto.Drawing;
-using System.ComponentModel;
 using System.Windows.Controls.Primitives;
 
 namespace Eto.Wpf.Forms.Controls
diff --git a/src/Eto.Wpf/Forms/Controls/StepperHandler.cs b/src/Eto.Wpf/Forms/Controls/StepperHandler.cs
index 1f02ff570f..541dcfcdd9 100644
--- a/src/Eto.Wpf/Forms/Controls/StepperHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/StepperHandler.cs
@@ -1,23 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using sw = System.Windows;
-using swc = System.Windows.Controls;
-using mwc = Xceed.Wpf.Toolkit;
-using Eto.Forms;
-
-namespace Eto.Wpf.Forms.Controls
+namespace Eto.Wpf.Forms.Controls
 {
-	public class StepperHandler : WpfControl<mwc.ButtonSpinner, Stepper, Stepper.ICallback>, Stepper.IHandler
+	public class StepperHandler : WpfControl<xwt.ButtonSpinner, Stepper, Stepper.ICallback>, Stepper.IHandler
 	{
 		double originalWidth;
 		swc.Grid gridContent;
 
 		public StepperHandler()
 		{
-			Control = new mwc.ButtonSpinner();
+			Control = new xwt.ButtonSpinner();
 			Control.BorderThickness = new sw.Thickness(0);
 			Control.Padding = new sw.Thickness(0);
 			Control.Loaded += Control_Loaded;
diff --git a/src/Eto.Wpf/Forms/Controls/SwfWebViewHandler.cs b/src/Eto.Wpf/Forms/Controls/SwfWebViewHandler.cs
index a4eb4f40a5..f0ae727e4b 100644
--- a/src/Eto.Wpf/Forms/Controls/SwfWebViewHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/SwfWebViewHandler.cs
@@ -1,18 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using swc = System.Windows.Controls;
-using swn = System.Windows.Navigation;
-using sw = System.Windows;
-using swf = System.Windows.Forms;
-using swi = System.Windows.Input;
-using Eto.Forms;
-using System.Runtime.InteropServices;
 using Eto.CustomControls;
-using Eto.Drawing;
-using System.Threading.Tasks;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	public class SwfWebViewHandler : WpfFrameworkElement<swf.Integration.WindowsFormsHost, WebView, WebView.ICallback>, WebView.IHandler
diff --git a/src/Eto.Wpf/Forms/Controls/TabControlHandler.cs b/src/Eto.Wpf/Forms/Controls/TabControlHandler.cs
index 69d6ba5a32..6ce2da42a6 100644
--- a/src/Eto.Wpf/Forms/Controls/TabControlHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/TabControlHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Linq;
-using swc = System.Windows.Controls;
-using swm = System.Windows.Media;
-using sw = System.Windows;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Wpf.CustomControls;
 
 namespace Eto.Wpf.Forms.Controls
diff --git a/src/Eto.Wpf/Forms/Controls/TabPageHandler.cs b/src/Eto.Wpf/Forms/Controls/TabPageHandler.cs
index 8dd448f4ab..f6fdcfbe5d 100644
--- a/src/Eto.Wpf/Forms/Controls/TabPageHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/TabPageHandler.cs
@@ -1,9 +1,4 @@
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using swm = System.Windows.Media;
-using Eto.Forms;
-using Eto.Drawing;
-using Eto.Wpf.Drawing;
+using Eto.Wpf.Drawing;
 using Eto.Wpf.CustomControls;
 
 namespace Eto.Wpf.Forms.Controls
diff --git a/src/Eto.Wpf/Forms/Controls/TextAreaHandler.cs b/src/Eto.Wpf/Forms/Controls/TextAreaHandler.cs
index 737baa9b1b..e9b8a9d159 100644
--- a/src/Eto.Wpf/Forms/Controls/TextAreaHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/TextAreaHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	public class EtoTextBox : swc.TextBox, IEtoWpfControl
diff --git a/src/Eto.Wpf/Forms/Controls/TextBoxHandler.cs b/src/Eto.Wpf/Forms/Controls/TextBoxHandler.cs
index f35e6b167f..8a0ebc1d44 100755
--- a/src/Eto.Wpf/Forms/Controls/TextBoxHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/TextBoxHandler.cs
@@ -1,15 +1,7 @@
-using System;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using mwc = Xceed.Wpf.Toolkit;
-using swi = System.Windows.Input;
 using swd = System.Windows.Documents;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Wpf.Forms.Controls
 {
-	public class EtoWatermarkTextBox : mwc.WatermarkTextBox, IEtoWpfControl
+	public class EtoWatermarkTextBox : xwt.WatermarkTextBox, IEtoWpfControl
 	{
 		public IWpfFrameworkElement Handler { get; set; }
 
@@ -19,7 +11,7 @@ protected override sw.Size MeasureOverride(sw.Size constraint)
 		}
 	}
 
-	public class TextBoxHandler : TextBoxHandler<mwc.WatermarkTextBox, TextBox, TextBox.ICallback>, TextBox.IHandler
+	public class TextBoxHandler : TextBoxHandler<xwt.WatermarkTextBox, TextBox, TextBox.ICallback>, TextBox.IHandler
 	{
 		internal static object CurrentText_Key = new object();
 		internal static object CurrentSelection_Key = new object();
diff --git a/src/Eto.Wpf/Forms/Controls/TextStepperHandler.cs b/src/Eto.Wpf/Forms/Controls/TextStepperHandler.cs
index 2d97cec696..a4a695c115 100644
--- a/src/Eto.Wpf/Forms/Controls/TextStepperHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/TextStepperHandler.cs
@@ -1,17 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using sw = System.Windows;
-using swc = System.Windows.Controls;
-using mwc = Xceed.Wpf.Toolkit;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Wpf.Forms.Controls
 {
-	public class EtoButtonSpinner : mwc.ButtonSpinner, IEtoWpfControl
+	public class EtoButtonSpinner : xwt.ButtonSpinner, IEtoWpfControl
 	{
 		swc.TextBox TextBox => Content as swc.TextBox;
 
@@ -25,24 +14,24 @@ protected override sw.Size MeasureOverride(sw.Size constraint)
 		/// <summary>
 		/// Identifies the MouseWheelActiveTrigger dependency property
 		/// </summary>
-		public static readonly sw.DependencyProperty MouseWheelActiveTriggerProperty = sw.DependencyProperty.Register("MouseWheelActiveTrigger", typeof(mwc.Primitives.MouseWheelActiveTrigger), typeof(EtoButtonSpinner), new sw.UIPropertyMetadata(mwc.Primitives.MouseWheelActiveTrigger.FocusedMouseOver));
+		public static readonly sw.DependencyProperty MouseWheelActiveTriggerProperty = sw.DependencyProperty.Register("MouseWheelActiveTrigger", typeof(xwt.Primitives.MouseWheelActiveTrigger), typeof(EtoButtonSpinner), new sw.UIPropertyMetadata(xwt.Primitives.MouseWheelActiveTrigger.FocusedMouseOver));
 
 		/// <summary>
 		/// Get or set when the mouse wheel event should affect the value.
 		/// </summary>
-		public mwc.Primitives.MouseWheelActiveTrigger MouseWheelActiveTrigger
+		public xwt.Primitives.MouseWheelActiveTrigger MouseWheelActiveTrigger
 		{
-			get => (mwc.Primitives.MouseWheelActiveTrigger)GetValue(MouseWheelActiveTriggerProperty);
+			get => (xwt.Primitives.MouseWheelActiveTrigger)GetValue(MouseWheelActiveTriggerProperty);
 			set => SetValue(MouseWheelActiveTriggerProperty, value);
 		}
 
-		protected override void OnSpin(mwc.SpinEventArgs e)
+		protected override void OnSpin(xwt.SpinEventArgs e)
 		{
 			var activeTrigger = this.MouseWheelActiveTrigger;
 			bool spin = !e.UsingMouseWheel;
-			spin |= (activeTrigger == mwc.Primitives.MouseWheelActiveTrigger.MouseOver);
-			spin |= ((TextBox != null) && TextBox.IsFocused && (activeTrigger == mwc.Primitives.MouseWheelActiveTrigger.FocusedMouseOver));
-			spin |= ((TextBox != null) && TextBox.IsFocused && (activeTrigger == mwc.Primitives.MouseWheelActiveTrigger.Focused) && (sw.Input.Mouse.Captured is Spinner));
+			spin |= (activeTrigger == xwt.Primitives.MouseWheelActiveTrigger.MouseOver);
+			spin |= ((TextBox != null) && TextBox.IsFocused && (activeTrigger == xwt.Primitives.MouseWheelActiveTrigger.FocusedMouseOver));
+			spin |= ((TextBox != null) && TextBox.IsFocused && (activeTrigger == xwt.Primitives.MouseWheelActiveTrigger.Focused) && (sw.Input.Mouse.Captured is Spinner));
 
 			if (spin)
 			{
@@ -51,7 +40,7 @@ protected override void OnSpin(mwc.SpinEventArgs e)
 		}
 	}
 
-	public class TextStepperHandler : TextBoxHandler<mwc.ButtonSpinner, TextStepper, TextStepper.ICallback>, TextStepper.IHandler
+	public class TextStepperHandler : TextBoxHandler<xwt.ButtonSpinner, TextStepper, TextStepper.ICallback>, TextStepper.IHandler
 	{
 		public TextStepperHandler()
 		{
@@ -61,7 +50,7 @@ public TextStepperHandler()
 				IsTabStop = false,
 				Focusable = false,
 
-				Content = new mwc.WatermarkTextBox
+				Content = new xwt.WatermarkTextBox
 				{
 					KeepWatermarkOnGotFocus = true,
 					BorderThickness = new sw.Thickness(0),
@@ -98,7 +87,7 @@ public override Color TextColor
 			set { TextBox.Foreground = value.ToWpfBrush(TextBox.Foreground); }
 		}
 
-		mwc.WatermarkTextBox WatermarkTextBox => (mwc.WatermarkTextBox)Control.Content;
+		xwt.WatermarkTextBox WatermarkTextBox => (xwt.WatermarkTextBox)Control.Content;
 
 		protected override swc.TextBox TextBox => (swc.TextBox)Control.Content;
 
diff --git a/src/Eto.Wpf/Forms/Controls/ToggleButtonHandler.cs b/src/Eto.Wpf/Forms/Controls/ToggleButtonHandler.cs
index aec59f5419..cb46a79c93 100644
--- a/src/Eto.Wpf/Forms/Controls/ToggleButtonHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/ToggleButtonHandler.cs
@@ -1,14 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using sw = System.Windows;
-using swc = System.Windows.Controls;
-using swcp = System.Windows.Controls.Primitives;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	public class EtoToggleButton : swcp.ToggleButton, IEtoWpfControl
diff --git a/src/Eto.Wpf/Forms/Controls/TreeGridViewHandler.cs b/src/Eto.Wpf/Forms/Controls/TreeGridViewHandler.cs
index 9f79566745..4ef7fd1246 100755
--- a/src/Eto.Wpf/Forms/Controls/TreeGridViewHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/TreeGridViewHandler.cs
@@ -1,16 +1,5 @@
-using System;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using swd = System.Windows.Data;
-using swm = System.Windows.Media;
-using swi = System.Windows.Input;
-using Eto.Forms;
 using Eto.CustomControls;
 using Eto.Wpf.CustomControls.TreeGridView;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	public class TreeGridViewHandler : GridHandler<TreeGridView, TreeGridView.ICallback>, TreeGridView.IHandler, ITreeHandler
diff --git a/src/Eto.Wpf/Forms/Controls/TreeViewHandler.cs b/src/Eto.Wpf/Forms/Controls/TreeViewHandler.cs
index 5503fa61ad..ae9d652448 100644
--- a/src/Eto.Wpf/Forms/Controls/TreeViewHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/TreeViewHandler.cs
@@ -1,18 +1,6 @@
-using System;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
 using swd = System.Windows.Data;
-using swm = System.Windows.Media;
-using swk = System.Windows.Markup;
-using swi = System.Windows.Input;
-using Eto.Forms;
-using System.Collections;
 using Eto.Wpf.Forms.Menu;
-using Eto.Drawing;
-using System.ComponentModel;
 using Eto.Wpf.CustomControls;
-using System.Threading.Tasks;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	[Obsolete("Since 2.4. TreeView is deprecated, please use TreeGridView instead.")]
diff --git a/src/Eto.Wpf/Forms/Controls/WebView2Handler.cs b/src/Eto.Wpf/Forms/Controls/WebView2Handler.cs
index 68ca7eccd4..4b90975508 100755
--- a/src/Eto.Wpf/Forms/Controls/WebView2Handler.cs
+++ b/src/Eto.Wpf/Forms/Controls/WebView2Handler.cs
@@ -1,23 +1,10 @@
 
 // #define TEST_INSTALL // test installation without actually installing it.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using Eto.Forms;
 using Eto.CustomControls;
-using Eto.Drawing;
-using System.Threading.Tasks;
 using Microsoft.Web.WebView2.Core;
-using System.Diagnostics;
 using Microsoft.Win32;
 using System.Net;
-using System.IO;
-using System.Runtime.Serialization;
-
-
 #if WINFORMS
 using WebView2Control = Microsoft.Web.WebView2.WinForms.WebView2;
 using BaseHandler = Eto.WinForms.Forms.WindowsControl<Microsoft.Web.WebView2.WinForms.WebView2, Eto.Forms.WebView, Eto.Forms.WebView.ICallback>;
diff --git a/src/Eto.Wpf/Forms/Controls/WpfListItemHelper.cs b/src/Eto.Wpf/Forms/Controls/WpfListItemHelper.cs
index c0cda94b49..b24c87e0ed 100755
--- a/src/Eto.Wpf/Forms/Controls/WpfListItemHelper.cs
+++ b/src/Eto.Wpf/Forms/Controls/WpfListItemHelper.cs
@@ -1,12 +1,5 @@
-using System;
-using sw = System.Windows;
-using swc = System.Windows.Controls;
 using swd = System.Windows.Data;
-using Eto.Forms;
 using Eto.Wpf.CustomControls;
-using Eto.Drawing;
-using System.Globalization;
-
 namespace Eto.Wpf.Forms.Controls
 {
 
diff --git a/src/Eto.Wpf/Forms/Controls/WpfTreeItemHelper.cs b/src/Eto.Wpf/Forms/Controls/WpfTreeItemHelper.cs
index c6441d0405..67369f0c0c 100644
--- a/src/Eto.Wpf/Forms/Controls/WpfTreeItemHelper.cs
+++ b/src/Eto.Wpf/Forms/Controls/WpfTreeItemHelper.cs
@@ -1,10 +1,4 @@
-using System;
-using sw = System.Windows;
-using swc = System.Windows.Controls;
 using swd = System.Windows.Data;
-using Eto.Forms;
-using System.Collections;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	public static class WpfTreeItemHelper
diff --git a/src/Eto.Wpf/Forms/Controls/WpfWebViewHandler.cs b/src/Eto.Wpf/Forms/Controls/WpfWebViewHandler.cs
index b3f800dfaa..8ec352ddab 100644
--- a/src/Eto.Wpf/Forms/Controls/WpfWebViewHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/WpfWebViewHandler.cs
@@ -1,12 +1,4 @@
-using System;
-using System.Collections.Generic;
-using swc = System.Windows.Controls;
-using swn = System.Windows.Navigation;
-using Eto.Forms;
-using System.Runtime.InteropServices;
 using Eto.CustomControls;
-using System.Threading.Tasks;
-
 namespace Eto.Wpf.Forms.Controls
 {
 	public class WpfWebViewHandler : WpfFrameworkElement<swc.WebBrowser, WebView, WebView.ICallback>, WebView.IHandler
diff --git a/src/Eto.Wpf/Forms/CursorHandler.cs b/src/Eto.Wpf/Forms/CursorHandler.cs
index 575536a4fe..9679b42e2d 100755
--- a/src/Eto.Wpf/Forms/CursorHandler.cs
+++ b/src/Eto.Wpf/Forms/CursorHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using System.IO;
-using Eto.Drawing;
-using Eto.Forms;
-using sw = System.Windows;
-using swi = System.Windows.Input;
-
 namespace Eto.Wpf.Forms
 {
 	public class CursorHandler : WidgetHandler<swi.Cursor, Cursor>, Cursor.IHandler
diff --git a/src/Eto.Wpf/Forms/DataObjectHandler.cs b/src/Eto.Wpf/Forms/DataObjectHandler.cs
index 6e740616b1..cc4cdf6876 100755
--- a/src/Eto.Wpf/Forms/DataObjectHandler.cs
+++ b/src/Eto.Wpf/Forms/DataObjectHandler.cs
@@ -1,15 +1,5 @@
-using Eto.Forms;
-using System;
-using sc = System.ComponentModel;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Drawing;
-using System.Collections.Specialized;
-using System.IO;
 #if WPF
 using static System.Windows.WpfDataObjectExtensions;
-using sw = System.Windows;
 using BitmapSource = System.Windows.Media.Imaging.BitmapSource;
 
 namespace Eto.Wpf.Forms
diff --git a/src/Eto.Wpf/Forms/DialogHandler.cs b/src/Eto.Wpf/Forms/DialogHandler.cs
index d03e8a748d..87187adc64 100644
--- a/src/Eto.Wpf/Forms/DialogHandler.cs
+++ b/src/Eto.Wpf/Forms/DialogHandler.cs
@@ -1,11 +1,4 @@
-using System;
-using Eto.Forms;
-using sw = System.Windows;
-using swc = System.Windows.Controls;
 using Eto.Wpf.Forms.Controls;
-using System.Threading.Tasks;
-using Eto.Drawing;
-
 namespace Eto.Wpf.Forms
 {
 	public class DialogHandler : WpfWindow<sw.Window, Dialog, Dialog.ICallback>, Dialog.IHandler
diff --git a/src/Eto.Wpf/Forms/EnableThemingInScope.cs b/src/Eto.Wpf/Forms/EnableThemingInScope.cs
index d534611f0b..d4042f22c4 100644
--- a/src/Eto.Wpf/Forms/EnableThemingInScope.cs
+++ b/src/Eto.Wpf/Forms/EnableThemingInScope.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Security;
+using System.Security;
 using System.Security.Permissions;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Eto.Wpf.Forms
diff --git a/src/Eto.Wpf/Forms/EtoBorder.cs b/src/Eto.Wpf/Forms/EtoBorder.cs
index 4a26648ec0..603e174b02 100644
--- a/src/Eto.Wpf/Forms/EtoBorder.cs
+++ b/src/Eto.Wpf/Forms/EtoBorder.cs
@@ -1,13 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using sw = System.Windows;
-using swc = System.Windows.Controls;
-using swm = System.Windows.Media;
-
-namespace Eto.Wpf.Forms
+namespace Eto.Wpf.Forms
 {
 	/// <summary>
 	/// Shared class to use as a container that properly handles measurement for Eto sizing rules
diff --git a/src/Eto.Wpf/Forms/FloatingFormHandler.cs b/src/Eto.Wpf/Forms/FloatingFormHandler.cs
index 17adb69063..d580393249 100755
--- a/src/Eto.Wpf/Forms/FloatingFormHandler.cs
+++ b/src/Eto.Wpf/Forms/FloatingFormHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.Wpf.Forms
 {
 	public class FloatingFormHandler : FormHandler, FloatingForm.IHandler
diff --git a/src/Eto.Wpf/Forms/FontDialogHandler.cs b/src/Eto.Wpf/Forms/FontDialogHandler.cs
index 19603a16cb..1f32b8b32e 100755
--- a/src/Eto.Wpf/Forms/FontDialogHandler.cs
+++ b/src/Eto.Wpf/Forms/FontDialogHandler.cs
@@ -1,10 +1,5 @@
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.Wpf.CustomControls.FontDialog;
 using Eto.Wpf.Drawing;
-using System;
-
-using sw = System.Windows;
 namespace Eto.Wpf.Forms
 {
 	public class FontDialogHandler : WidgetHandler<FontChooser, FontDialog, FontDialog.ICallback>, FontDialog.IHandler
diff --git a/src/Eto.Wpf/Forms/FormHandler.cs b/src/Eto.Wpf/Forms/FormHandler.cs
index 514de25c3c..27458aa716 100644
--- a/src/Eto.Wpf/Forms/FormHandler.cs
+++ b/src/Eto.Wpf/Forms/FormHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Windows.Input;
-using Eto.Forms;
-using sw = System.Windows;
-using swc = System.Windows.Controls;
-
 namespace Eto.Wpf.Forms
 {
 	public class FormHandler : WpfWindow<sw.Window, Form, Form.ICallback>, Form.IHandler
@@ -23,7 +17,7 @@ protected override void OnActivated(EventArgs e)
 				base.OnActivated(e);
 			}
 
-			protected override void OnPreviewGotKeyboardFocus(KeyboardFocusChangedEventArgs e)
+			protected override void OnPreviewGotKeyboardFocus(swi.KeyboardFocusChangedEventArgs e)
 			{
 				if (!Focusable)
 				{
diff --git a/src/Eto.Wpf/Forms/KeyboardHandler.cs b/src/Eto.Wpf/Forms/KeyboardHandler.cs
index ce6c1b04d6..a5df653852 100644
--- a/src/Eto.Wpf/Forms/KeyboardHandler.cs
+++ b/src/Eto.Wpf/Forms/KeyboardHandler.cs
@@ -1,12 +1,4 @@
-using Eto.Forms;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using swi = System.Windows.Input;
-
-namespace Eto.Wpf.Forms
+namespace Eto.Wpf.Forms
 {
 	public class KeyboardHandler : Keyboard.IHandler
 	{
diff --git a/src/Eto.Wpf/Forms/Menu/ButtonMenuItemHandler.cs b/src/Eto.Wpf/Forms/Menu/ButtonMenuItemHandler.cs
index c2317329b5..5d9455205b 100644
--- a/src/Eto.Wpf/Forms/Menu/ButtonMenuItemHandler.cs
+++ b/src/Eto.Wpf/Forms/Menu/ButtonMenuItemHandler.cs
@@ -1,8 +1,3 @@
-using Eto.Forms;
-using swc = System.Windows.Controls;
-using swm = System.Windows.Media;
-using swi = System.Windows.Input;
-
 namespace Eto.Wpf.Forms.Menu
 {
 	public class ButtonMenuItemHandler : MenuItemHandler<swc.MenuItem, ButtonMenuItem, ButtonMenuItem.ICallback>, ButtonMenuItem.IHandler
diff --git a/src/Eto.Wpf/Forms/Menu/CheckMenuItemHandler.cs b/src/Eto.Wpf/Forms/Menu/CheckMenuItemHandler.cs
index a7b65c0ab7..b046b401c5 100644
--- a/src/Eto.Wpf/Forms/Menu/CheckMenuItemHandler.cs
+++ b/src/Eto.Wpf/Forms/Menu/CheckMenuItemHandler.cs
@@ -1,11 +1,3 @@
-using System;
-using Eto.Forms;
-using System.ComponentModel;
-using sw = System.Windows;
-using swc = System.Windows.Controls;
-using swm = System.Windows.Media;
-using swi = System.Windows.Input;
-
 namespace Eto.Wpf.Forms.Menu
 {
 	public class CheckMenuItemHandler : MenuItemHandler<swc.MenuItem, CheckMenuItem, CheckMenuItem.ICallback>, CheckMenuItem.IHandler
diff --git a/src/Eto.Wpf/Forms/Menu/ContextMenuHandler.cs b/src/Eto.Wpf/Forms/Menu/ContextMenuHandler.cs
index 2aba141f69..ebf48266b2 100644
--- a/src/Eto.Wpf/Forms/Menu/ContextMenuHandler.cs
+++ b/src/Eto.Wpf/Forms/Menu/ContextMenuHandler.cs
@@ -1,11 +1,3 @@
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using swi = System.Windows.Input;
-using Eto.Forms;
-using System;
-using System.Linq;
-using System.ComponentModel;
-using Eto.Drawing;
 using System.Windows.Controls.Primitives;
 
 namespace Eto.Wpf.Forms.Menu
diff --git a/src/Eto.Wpf/Forms/Menu/MenuBarHandler.cs b/src/Eto.Wpf/Forms/Menu/MenuBarHandler.cs
index fdb4a09fd1..1dbb28b496 100644
--- a/src/Eto.Wpf/Forms/Menu/MenuBarHandler.cs
+++ b/src/Eto.Wpf/Forms/Menu/MenuBarHandler.cs
@@ -1,9 +1,3 @@
-using Eto.Forms;
-using System.Collections.Generic;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using System.Linq;
-
 namespace Eto.Wpf.Forms.Menu
 {
 	public class MenuBarHandler : MenuHandler<swc.Menu, MenuBar, MenuBar.ICallback>, MenuBar.IHandler
diff --git a/src/Eto.Wpf/Forms/Menu/MenuHandler.cs b/src/Eto.Wpf/Forms/Menu/MenuHandler.cs
index 50edcb3ea6..d79585668e 100644
--- a/src/Eto.Wpf/Forms/Menu/MenuHandler.cs
+++ b/src/Eto.Wpf/Forms/Menu/MenuHandler.cs
@@ -1,9 +1,3 @@
-using Eto.Forms;
-using System.Collections.Generic;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using System.Linq;
-
 namespace Eto.Wpf.Forms.Menu
 {
 	public abstract class MenuHandler<TControl, TWidget, TCallback> : WidgetHandler<TControl, TWidget, TCallback>
diff --git a/src/Eto.Wpf/Forms/Menu/MenuItemHandler.cs b/src/Eto.Wpf/Forms/Menu/MenuItemHandler.cs
index d696712e92..b3eb0c04c9 100644
--- a/src/Eto.Wpf/Forms/Menu/MenuItemHandler.cs
+++ b/src/Eto.Wpf/Forms/Menu/MenuItemHandler.cs
@@ -1,12 +1,3 @@
-using System;
-using System.Linq;
-using Eto.Forms;
-using sw = System.Windows;
-using swc = System.Windows.Controls;
-using swm = System.Windows.Media;
-using swi = System.Windows.Input;
-using Eto.Drawing;
-
 namespace Eto.Wpf.Forms.Menu
 {
 	interface IMenuItemHandler
diff --git a/src/Eto.Wpf/Forms/Menu/RadioMenuItemHandler.cs b/src/Eto.Wpf/Forms/Menu/RadioMenuItemHandler.cs
index c30a5fc81e..276a691ad7 100644
--- a/src/Eto.Wpf/Forms/Menu/RadioMenuItemHandler.cs
+++ b/src/Eto.Wpf/Forms/Menu/RadioMenuItemHandler.cs
@@ -1,13 +1,3 @@
-using System;
-using System.Collections.Generic;
-using Eto.Forms;
-using swc = System.Windows.Controls;
-using swm = System.Windows.Media;
-using swi = System.Windows.Input;
-using sw = System.Windows;
-using System.Linq;
-using System.ComponentModel;
-
 namespace Eto.Wpf.Forms.Menu
 {
 	public class RadioMenuItemHandler : MenuItemHandler<swc.MenuItem, RadioMenuItem, RadioMenuItem.ICallback>, RadioMenuItem.IHandler
diff --git a/src/Eto.Wpf/Forms/Menu/SeparatorMenuItemHandler.cs b/src/Eto.Wpf/Forms/Menu/SeparatorMenuItemHandler.cs
index 516b2fcd41..23d70404bc 100644
--- a/src/Eto.Wpf/Forms/Menu/SeparatorMenuItemHandler.cs
+++ b/src/Eto.Wpf/Forms/Menu/SeparatorMenuItemHandler.cs
@@ -1,8 +1,3 @@
-using sw = System.Windows;
-using swc = System.Windows.Controls;
-using Eto.Forms;
-using System;
-
 namespace Eto.Wpf.Forms.Menu
 {
 	public class SeparatorMenuItemHandler : WidgetHandler<swc.Separator, SeparatorMenuItem>, SeparatorMenuItem.IHandler
diff --git a/src/Eto.Wpf/Forms/Menu/SubMenuItemHandler.cs b/src/Eto.Wpf/Forms/Menu/SubMenuItemHandler.cs
index 1aa73badf3..915f2472a2 100755
--- a/src/Eto.Wpf/Forms/Menu/SubMenuItemHandler.cs
+++ b/src/Eto.Wpf/Forms/Menu/SubMenuItemHandler.cs
@@ -1,10 +1,4 @@
-using Eto.Forms;
-using swc = System.Windows.Controls;
-using swm = System.Windows.Media;
-using swi = System.Windows.Input;
 using System.Windows;
-using System;
-
 namespace Eto.Wpf.Forms.Menu
 {
 	public class SubMenuItemHandler : MenuItemHandler<swc.MenuItem, SubMenuItem, SubMenuItem.ICallback>, SubMenuItem.IHandler
diff --git a/src/Eto.Wpf/Forms/MessageBoxHandler.cs b/src/Eto.Wpf/Forms/MessageBoxHandler.cs
index bb849d1ef6..4ca0be428f 100644
--- a/src/Eto.Wpf/Forms/MessageBoxHandler.cs
+++ b/src/Eto.Wpf/Forms/MessageBoxHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using sw = System.Windows;
 //using WpfMessageBox = Xceed.Wpf.Toolkit.MessageBox;
 using WpfMessageBox = System.Windows.MessageBox;
 
diff --git a/src/Eto.Wpf/Forms/MouseHandler.cs b/src/Eto.Wpf/Forms/MouseHandler.cs
index dacdb3c1f6..09b125029c 100755
--- a/src/Eto.Wpf/Forms/MouseHandler.cs
+++ b/src/Eto.Wpf/Forms/MouseHandler.cs
@@ -1,8 +1,3 @@
-using swi = System.Windows.Input;
-using swf = System.Windows.Forms;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Wpf.Forms
 {
 	public class MouseHandler : Mouse.IHandler
diff --git a/src/Eto.Wpf/Forms/NativeFormHandler.cs b/src/Eto.Wpf/Forms/NativeFormHandler.cs
index 8636020b8a..a1389b1b2e 100644
--- a/src/Eto.Wpf/Forms/NativeFormHandler.cs
+++ b/src/Eto.Wpf/Forms/NativeFormHandler.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using sw = System.Windows;
-using Eto.Forms;
-
 namespace Eto.Wpf.Forms
 {
 	public class NativeFormHandler : WpfWindow<sw.Window, Form, Form.ICallback>, Form.IHandler
diff --git a/src/Eto.Wpf/Forms/NotificationHandler.cs b/src/Eto.Wpf/Forms/NotificationHandler.cs
index 820a075eeb..f63dc6fff9 100644
--- a/src/Eto.Wpf/Forms/NotificationHandler.cs
+++ b/src/Eto.Wpf/Forms/NotificationHandler.cs
@@ -1,8 +1,4 @@
-using Eto.Drawing;
-using Eto.Forms;
 using System;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
 
 #if WPF
 namespace Eto.Wpf.Forms
diff --git a/src/Eto.Wpf/Forms/OpenFileDialogHandler.cs b/src/Eto.Wpf/Forms/OpenFileDialogHandler.cs
index 352ca1e9b1..49868d65fb 100644
--- a/src/Eto.Wpf/Forms/OpenFileDialogHandler.cs
+++ b/src/Eto.Wpf/Forms/OpenFileDialogHandler.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using Eto.Forms;
 using mw = Microsoft.Win32;
-using sw = System.Windows;
 
 namespace Eto.Wpf.Forms
 {
diff --git a/src/Eto.Wpf/Forms/OpenWithDialogHandler.cs b/src/Eto.Wpf/Forms/OpenWithDialogHandler.cs
index caf3c1a7ae..c39baef95c 100644
--- a/src/Eto.Wpf/Forms/OpenWithDialogHandler.cs
+++ b/src/Eto.Wpf/Forms/OpenWithDialogHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using Eto.Drawing;
-using Eto.Forms;
-using Eto.Wpf.Drawing;
+using Eto.Wpf.Drawing;
 
 namespace Eto.Wpf.Forms
 {
diff --git a/src/Eto.Wpf/Forms/PerMonitorDpiHelper.cs b/src/Eto.Wpf/Forms/PerMonitorDpiHelper.cs
index 27c73e7a77..8dfceb43f7 100644
--- a/src/Eto.Wpf/Forms/PerMonitorDpiHelper.cs
+++ b/src/Eto.Wpf/Forms/PerMonitorDpiHelper.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Interop;
 using System.Windows.Media;
@@ -14,7 +6,7 @@ namespace Eto.Wpf.Forms
 {
 	public class PerMonitorDpiHelper
 	{
-		Window window;
+		sw.Window window;
 		IntPtr hwnd;
 		HwndSource hwndSource;
 
@@ -34,7 +26,7 @@ protected virtual void OnScaleChanged(EventArgs e)
 				return false;
 			if (awareness != Win32.PROCESS_DPI_AWARENESS.PER_MONITOR_DPI_AWARE)
 				return false;
-			if (typeof(Window).GetEvent("DpiChanged") == null) // .NET 4.6.2
+			if (typeof(sw.Window).GetEvent("DpiChanged") == null) // .NET 4.6.2
 				return false;
 
 			// now check if it was disabled specifically (more .NET 4.6 apis)
@@ -103,7 +95,7 @@ void SetScale(uint dpi)
 
 		static bool? dpiEventEnabled;
 
-		public PerMonitorDpiHelper(Window window)
+		public PerMonitorDpiHelper(sw.Window window)
 		{
 			this.window = window;
 			if (!Win32.PerMonitorDpiSupported)
diff --git a/src/Eto.Wpf/Forms/PixelLayoutHandler.cs b/src/Eto.Wpf/Forms/PixelLayoutHandler.cs
index 8184dde668..e4ccbc4173 100755
--- a/src/Eto.Wpf/Forms/PixelLayoutHandler.cs
+++ b/src/Eto.Wpf/Forms/PixelLayoutHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Wpf.Forms
 {
 	public class PixelLayoutHandler : WpfLayout<swc.Canvas, PixelLayout, PixelLayout.ICallback>, PixelLayout.IHandler
diff --git a/src/Eto.Wpf/Forms/Printing/PrintDialogHandler.cs b/src/Eto.Wpf/Forms/Printing/PrintDialogHandler.cs
index 490e81c3f8..ac0069f7dc 100644
--- a/src/Eto.Wpf/Forms/Printing/PrintDialogHandler.cs
+++ b/src/Eto.Wpf/Forms/Printing/PrintDialogHandler.cs
@@ -1,7 +1,3 @@
-using Eto.Forms;
-using sw = System.Windows;
-using swc = System.Windows.Controls;
-
 namespace Eto.Wpf.Forms.Printing
 {
 	public class PrintDialogHandler : WidgetHandler<swc.PrintDialog, PrintDialog>, PrintDialog.IHandler
diff --git a/src/Eto.Wpf/Forms/Printing/PrintDocumentHandler.cs b/src/Eto.Wpf/Forms/Printing/PrintDocumentHandler.cs
index 196fbe463e..d24fcb8961 100644
--- a/src/Eto.Wpf/Forms/Printing/PrintDocumentHandler.cs
+++ b/src/Eto.Wpf/Forms/Printing/PrintDocumentHandler.cs
@@ -1,13 +1,5 @@
-using sw = System.Windows;
 using swd = System.Windows.Documents;
-using swc = System.Windows.Controls;
-using swm = System.Windows.Media;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Wpf.Drawing;
-using System;
-using System.Collections;
-
 namespace Eto.Wpf.Forms.Printing
 {
 	public class PrintDocumentHandler : WidgetHandler<PrintDocumentHandler.Paginator, PrintDocument, PrintDocument.ICallback>, PrintDocument.IHandler
diff --git a/src/Eto.Wpf/Forms/Printing/PrintPreviewDialogHandler.cs b/src/Eto.Wpf/Forms/Printing/PrintPreviewDialogHandler.cs
index 5cdf952403..727aa1db72 100755
--- a/src/Eto.Wpf/Forms/Printing/PrintPreviewDialogHandler.cs
+++ b/src/Eto.Wpf/Forms/Printing/PrintPreviewDialogHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.IO;
-using Eto.Forms;
-using sw = System.Windows;
-using swc = System.Windows.Controls;
-
 namespace Eto.Wpf.Forms.Printing
 {
 	public class EtoPrintPreviewDialog : sw.Window
diff --git a/src/Eto.Wpf/Forms/Printing/PrintSettingsHandler.cs b/src/Eto.Wpf/Forms/Printing/PrintSettingsHandler.cs
index eee4c3d48a..9e01386fd6 100644
--- a/src/Eto.Wpf/Forms/Printing/PrintSettingsHandler.cs
+++ b/src/Eto.Wpf/Forms/Printing/PrintSettingsHandler.cs
@@ -1,8 +1,4 @@
-using swd = System.Windows.Documents;
-using swc = System.Windows.Controls;
 using sp = System.Printing;
-using Eto.Forms;
-
 namespace Eto.Wpf.Forms.Printing
 {
 	public static class PrintSettingsExtensions
diff --git a/src/Eto.Wpf/Forms/SaveFileDialogHandler.cs b/src/Eto.Wpf/Forms/SaveFileDialogHandler.cs
index 934df4263f..aec03326e5 100644
--- a/src/Eto.Wpf/Forms/SaveFileDialogHandler.cs
+++ b/src/Eto.Wpf/Forms/SaveFileDialogHandler.cs
@@ -1,6 +1,4 @@
-using Eto.Forms;
 using mw = Microsoft.Win32;
-using sw = System.Windows;
 
 namespace Eto.Wpf.Forms
 {
diff --git a/src/Eto.Wpf/Forms/ScreenHandler.cs b/src/Eto.Wpf/Forms/ScreenHandler.cs
index 8b02614732..b6453869f1 100755
--- a/src/Eto.Wpf/Forms/ScreenHandler.cs
+++ b/src/Eto.Wpf/Forms/ScreenHandler.cs
@@ -1,11 +1,3 @@
-using System;
-using Eto.Forms;
-using sw = System.Windows;
-using sd = System.Drawing;
-using swm = System.Windows.Media;
-using swf = System.Windows.Forms;
-using Eto.Drawing;
-using System.Linq;
 using Eto.Wpf.Drawing;
 
 namespace Eto.Wpf.Forms
diff --git a/src/Eto.Wpf/Forms/ScreensHandler.cs b/src/Eto.Wpf/Forms/ScreensHandler.cs
index 1111387f4c..34a41281af 100644
--- a/src/Eto.Wpf/Forms/ScreensHandler.cs
+++ b/src/Eto.Wpf/Forms/ScreensHandler.cs
@@ -1,7 +1,3 @@
-using Eto.Forms;
-using System.Collections.Generic;
-using swf = System.Windows.Forms;
-
 namespace Eto.Wpf.Forms
 {
 	public class ScreensHandler : Screen.IScreensHandler
diff --git a/src/Eto.Wpf/Forms/SelectFolderDialogHandler.cs b/src/Eto.Wpf/Forms/SelectFolderDialogHandler.cs
index 2ffe1a60f2..792f4b87ee 100644
--- a/src/Eto.Wpf/Forms/SelectFolderDialogHandler.cs
+++ b/src/Eto.Wpf/Forms/SelectFolderDialogHandler.cs
@@ -1,7 +1,3 @@
-using Eto.Forms;
-using sw = System.Windows;
-using swf = System.Windows.Forms;
-
 namespace Eto.Wpf.Forms
 {
 	public class SelectFolderDialogHandler : WidgetHandler<swf.FolderBrowserDialog, SelectFolderDialog>, SelectFolderDialog.IHandler
diff --git a/src/Eto.Wpf/Forms/TableLayoutHandler.cs b/src/Eto.Wpf/Forms/TableLayoutHandler.cs
index 9495f6630d..ad86eb2fb1 100755
--- a/src/Eto.Wpf/Forms/TableLayoutHandler.cs
+++ b/src/Eto.Wpf/Forms/TableLayoutHandler.cs
@@ -1,12 +1,3 @@
-using System;
-using System.Linq;
-using Eto.Forms;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using swd = System.Windows.Data;
-using swm = System.Windows.Media;
-using Eto.Drawing;
-
 namespace Eto.Wpf.Forms
 {
 	public class EtoGrid : swc.Grid
diff --git a/src/Eto.Wpf/Forms/TaskbarHandler.cs b/src/Eto.Wpf/Forms/TaskbarHandler.cs
index dacd64dfcb..000f2d5380 100644
--- a/src/Eto.Wpf/Forms/TaskbarHandler.cs
+++ b/src/Eto.Wpf/Forms/TaskbarHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using Eto.Forms;
-
-#if WPF
+#if WPF
 namespace Eto.Wpf.Forms
 #elif WINFORMS
 namespace Eto.WinForms.Forms
diff --git a/src/Eto.Wpf/Forms/ToolBar/ButtonToolItemHandler.cs b/src/Eto.Wpf/Forms/ToolBar/ButtonToolItemHandler.cs
index fae09131ff..6afc4225d4 100755
--- a/src/Eto.Wpf/Forms/ToolBar/ButtonToolItemHandler.cs
+++ b/src/Eto.Wpf/Forms/ToolBar/ButtonToolItemHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-using swc = System.Windows.Controls;
-using swm = System.Windows.Media;
-using sw = System.Windows;
-
 namespace Eto.Wpf.Forms.ToolBar
 {
 	public class ButtonToolItemHandler : ToolItemHandler<swc.Button, ButtonToolItem>, ButtonToolItem.IHandler
diff --git a/src/Eto.Wpf/Forms/ToolBar/CheckToolItemHandler.cs b/src/Eto.Wpf/Forms/ToolBar/CheckToolItemHandler.cs
index 3f66ff0fb4..da4ad7daa1 100755
--- a/src/Eto.Wpf/Forms/ToolBar/CheckToolItemHandler.cs
+++ b/src/Eto.Wpf/Forms/ToolBar/CheckToolItemHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using swc = System.Windows.Controls;
-using swm = System.Windows.Media;
-using sw = System.Windows;
-using Eto.Forms;
-using Eto.Drawing;
 using System.Windows;
 
 namespace Eto.Wpf.Forms.ToolBar
diff --git a/src/Eto.Wpf/Forms/ToolBar/DropDownToolItemHandler.cs b/src/Eto.Wpf/Forms/ToolBar/DropDownToolItemHandler.cs
index aec265c764..d59b5e4f52 100755
--- a/src/Eto.Wpf/Forms/ToolBar/DropDownToolItemHandler.cs
+++ b/src/Eto.Wpf/Forms/ToolBar/DropDownToolItemHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-using swc = System.Windows.Controls;
-using swm = System.Windows.Media;
-using sw = System.Windows;
 using System.Windows;
 
 namespace Eto.Wpf.Forms.ToolBar
diff --git a/src/Eto.Wpf/Forms/ToolBar/RadioToolItemHandler.cs b/src/Eto.Wpf/Forms/ToolBar/RadioToolItemHandler.cs
index 8e619375f3..de66c5f3d3 100755
--- a/src/Eto.Wpf/Forms/ToolBar/RadioToolItemHandler.cs
+++ b/src/Eto.Wpf/Forms/ToolBar/RadioToolItemHandler.cs
@@ -1,13 +1,4 @@
-using System;
-using System.Linq;
-using swc = System.Windows.Controls;
-using swm = System.Windows.Media;
-using sw = System.Windows;
-using Eto.Forms;
-using Eto.Drawing;
 using System.Windows;
-using System.Windows.Input;
-
 namespace Eto.Wpf.Forms.ToolBar
 {
 	public class RadioToolItemHandler : ToolItemHandler<swc.Primitives.ToggleButton, RadioToolItem>, RadioToolItem.IHandler
@@ -35,7 +26,7 @@ private void Control_Click(object sender, RoutedEventArgs e)
 			Widget.OnClick(EventArgs.Empty);
 		}
 
-		private void Control_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+		private void Control_PreviewMouseDown(object sender, swi.MouseButtonEventArgs e)
 		{
 			if (Checked)
 			{
diff --git a/src/Eto.Wpf/Forms/ToolBar/SeparatorToolItemHandler.cs b/src/Eto.Wpf/Forms/ToolBar/SeparatorToolItemHandler.cs
index 85501b1d6f..fc3dfa3e2c 100644
--- a/src/Eto.Wpf/Forms/ToolBar/SeparatorToolItemHandler.cs
+++ b/src/Eto.Wpf/Forms/ToolBar/SeparatorToolItemHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using Eto.Forms;
-using sw = System.Windows;
-using swc = System.Windows.Controls;
-using swm = System.Windows.Media;
-using Eto.Drawing;
-
 namespace Eto.Wpf.Forms.ToolBar
 {
 	public class SeparatorToolItemHandler : ToolItemHandler<swc.ContentControl, SeparatorToolItem>, SeparatorToolItem.IHandler
diff --git a/src/Eto.Wpf/Forms/ToolBar/ToolBarHandler.cs b/src/Eto.Wpf/Forms/ToolBar/ToolBarHandler.cs
index 412285120b..fd7091048f 100644
--- a/src/Eto.Wpf/Forms/ToolBar/ToolBarHandler.cs
+++ b/src/Eto.Wpf/Forms/ToolBar/ToolBarHandler.cs
@@ -1,7 +1,3 @@
-using swc = System.Windows.Controls;
-using swi = System.Windows.Input;
-using Eto.Forms;
-
 namespace Eto.Wpf.Forms.ToolBar
 {
 	public class ToolBarHandler : WidgetHandler<swc.ToolBar, Eto.Forms.ToolBar>, Eto.Forms.ToolBar.IHandler
diff --git a/src/Eto.Wpf/Forms/ToolBar/ToolItemHandler.cs b/src/Eto.Wpf/Forms/ToolBar/ToolItemHandler.cs
index e0e1c9558e..2d7afc1890 100755
--- a/src/Eto.Wpf/Forms/ToolBar/ToolItemHandler.cs
+++ b/src/Eto.Wpf/Forms/ToolBar/ToolItemHandler.cs
@@ -1,9 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-using System;
-using sw = System.Windows;
-using swc = System.Windows.Controls;
-
 namespace Eto.Wpf.Forms.ToolBar
 {
 	public static class ToolItemHandler
diff --git a/src/Eto.Wpf/Forms/TrayIndicatorHandler.cs b/src/Eto.Wpf/Forms/TrayIndicatorHandler.cs
index b831de0c17..e51bdd0a08 100644
--- a/src/Eto.Wpf/Forms/TrayIndicatorHandler.cs
+++ b/src/Eto.Wpf/Forms/TrayIndicatorHandler.cs
@@ -1,18 +1,9 @@
-using swf = System.Windows.Forms;
-using swc = System.Windows.Controls;
+using System.Windows;
+using Eto.Wpf.Forms.Menu;
+using Point = System.Windows.Point;
 
 namespace Eto.Wpf.Forms
 {
-	using System;
-	using System.ComponentModel;
-	using System.Diagnostics;
-	using System.Reflection;
-	using System.Runtime.InteropServices;
-	using System.Windows;
-	using Eto.Drawing;
-	using Eto.Forms;
-	using Menu;
-	using Point = System.Windows.Point;
 
 	public class TrayIndicatorHandler : WidgetHandler<swf.NotifyIcon, TrayIndicator, TrayIndicator.ICallback>,
 		TrayIndicator.IHandler
diff --git a/src/Eto.Wpf/Forms/UITimerHandler.cs b/src/Eto.Wpf/Forms/UITimerHandler.cs
index 4ed85e4939..6052389451 100644
--- a/src/Eto.Wpf/Forms/UITimerHandler.cs
+++ b/src/Eto.Wpf/Forms/UITimerHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.Wpf.Forms
 {
 
diff --git a/src/Eto.Wpf/Forms/VistaSelectFolderDialogHandler.cs b/src/Eto.Wpf/Forms/VistaSelectFolderDialogHandler.cs
index d65bc0ced9..43d3b2681a 100644
--- a/src/Eto.Wpf/Forms/VistaSelectFolderDialogHandler.cs
+++ b/src/Eto.Wpf/Forms/VistaSelectFolderDialogHandler.cs
@@ -1,5 +1,3 @@
-using Eto.Forms;
-using System;
 using cp = Microsoft.WindowsAPICodePack.Dialogs;
 
 #if WINFORMS
diff --git a/src/Eto.Wpf/Forms/WindowHandler.cs b/src/Eto.Wpf/Forms/WindowHandler.cs
index 08c5e926df..0712c19dc6 100755
--- a/src/Eto.Wpf/Forms/WindowHandler.cs
+++ b/src/Eto.Wpf/Forms/WindowHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Wpf.Forms
 {
 	
diff --git a/src/Eto.Wpf/Forms/WindowsFormsHostHandler.cs b/src/Eto.Wpf/Forms/WindowsFormsHostHandler.cs
index 5cda966f45..fb7b44383f 100644
--- a/src/Eto.Wpf/Forms/WindowsFormsHostHandler.cs
+++ b/src/Eto.Wpf/Forms/WindowsFormsHostHandler.cs
@@ -1,13 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms.Integration;
-using swf = System.Windows.Forms;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Wpf.Forms
 {
 	public class WindowsFormsHostHandler<TControl, TWidget, TCallback> : WpfFrameworkElement<WindowsFormsHost, TWidget, TCallback>
diff --git a/src/Eto.Wpf/Forms/WpfCommonDialog.cs b/src/Eto.Wpf/Forms/WpfCommonDialog.cs
index f95996c29c..bc33a0a6ba 100644
--- a/src/Eto.Wpf/Forms/WpfCommonDialog.cs
+++ b/src/Eto.Wpf/Forms/WpfCommonDialog.cs
@@ -1,6 +1,4 @@
-using Eto.Forms;
 using mw = Microsoft.Win32;
-using sw = System.Windows;
 
 namespace Eto.Wpf.Forms
 {
diff --git a/src/Eto.Wpf/Forms/WpfContainer.cs b/src/Eto.Wpf/Forms/WpfContainer.cs
index 919b8f0ad9..2fdd91f4fc 100755
--- a/src/Eto.Wpf/Forms/WpfContainer.cs
+++ b/src/Eto.Wpf/Forms/WpfContainer.cs
@@ -1,11 +1,3 @@
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using swi = System.Windows.Input;
-using Eto.Forms;
-using Eto.Drawing;
-using System;
-using System.Collections.Generic;
-
 namespace Eto.Wpf.Forms
 {
 	public interface IWpfContainer
diff --git a/src/Eto.Wpf/Forms/WpfControl.cs b/src/Eto.Wpf/Forms/WpfControl.cs
index 81b06b31b8..f2f07ee948 100644
--- a/src/Eto.Wpf/Forms/WpfControl.cs
+++ b/src/Eto.Wpf/Forms/WpfControl.cs
@@ -1,8 +1,4 @@
-using Eto.Forms;
-using Eto.Drawing;
-using Eto.Wpf.Drawing;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
+using Eto.Wpf.Drawing;
 
 namespace Eto.Wpf.Forms
 {
diff --git a/src/Eto.Wpf/Forms/WpfDragEventArgs.cs b/src/Eto.Wpf/Forms/WpfDragEventArgs.cs
index 97d01695f5..5efd66c17e 100644
--- a/src/Eto.Wpf/Forms/WpfDragEventArgs.cs
+++ b/src/Eto.Wpf/Forms/WpfDragEventArgs.cs
@@ -1,8 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-using sw = System.Windows;
-using swi = System.Windows.Input;
-
 namespace Eto.Wpf.Forms
 {
 
diff --git a/src/Eto.Wpf/Forms/WpfFileDialog.cs b/src/Eto.Wpf/Forms/WpfFileDialog.cs
index 57894ac0fb..60f075c099 100644
--- a/src/Eto.Wpf/Forms/WpfFileDialog.cs
+++ b/src/Eto.Wpf/Forms/WpfFileDialog.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Eto.Forms;
 using mw = Microsoft.Win32;
-using sw = System.Windows;
 
 namespace Eto.Wpf.Forms
 {
diff --git a/src/Eto.Wpf/Forms/WpfFrameworkElement.cs b/src/Eto.Wpf/Forms/WpfFrameworkElement.cs
index 379bb6c24b..cd6841ef50 100755
--- a/src/Eto.Wpf/Forms/WpfFrameworkElement.cs
+++ b/src/Eto.Wpf/Forms/WpfFrameworkElement.cs
@@ -1,15 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using sw = System.Windows;
-using swi = System.Windows.Input;
-using swc = System.Windows.Controls;
-using swm = System.Windows.Media;
-using swf = System.Windows.Forms;
-using System.Linq;
-using System.Collections.Generic;
 using System.Windows.Interop;
-using System.Runtime.InteropServices;
 using static System.Windows.WpfDataObjectExtensions;
 
 namespace Eto.Wpf.Forms
diff --git a/src/Eto.Wpf/Forms/WpfLayout.cs b/src/Eto.Wpf/Forms/WpfLayout.cs
index 7f8a8208bb..30ddea9183 100644
--- a/src/Eto.Wpf/Forms/WpfLayout.cs
+++ b/src/Eto.Wpf/Forms/WpfLayout.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using sw = System.Windows;
-
 namespace Eto.Wpf.Forms
 {
 	public abstract class WpfLayout<TControl, TWidget, TCallback> : WpfContainer<TControl, TWidget, TCallback>, Layout.IHandler
diff --git a/src/Eto.Wpf/Forms/WpfPanel.cs b/src/Eto.Wpf/Forms/WpfPanel.cs
index 7eec695616..6256be0441 100755
--- a/src/Eto.Wpf/Forms/WpfPanel.cs
+++ b/src/Eto.Wpf/Forms/WpfPanel.cs
@@ -1,9 +1,3 @@
-using System;
-using swc = System.Windows.Controls;
-using sw = System.Windows;
-using swm = System.Windows.Media;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Wpf.Forms.Menu;
 
 namespace Eto.Wpf.Forms
diff --git a/src/Eto.Wpf/Forms/WpfShellDropBehavior.cs b/src/Eto.Wpf/Forms/WpfShellDropBehavior.cs
index f06907a8af..423dac8a21 100644
--- a/src/Eto.Wpf/Forms/WpfShellDropBehavior.cs
+++ b/src/Eto.Wpf/Forms/WpfShellDropBehavior.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Windows;
-using sw = System.Windows;
 
 namespace Eto.Wpf.Forms
 {
diff --git a/src/Eto.Wpf/Forms/WpfWindow.cs b/src/Eto.Wpf/Forms/WpfWindow.cs
index ae743c0cd9..fd38d235bf 100755
--- a/src/Eto.Wpf/Forms/WpfWindow.cs
+++ b/src/Eto.Wpf/Forms/WpfWindow.cs
@@ -1,16 +1,5 @@
-using System;
-using System.Linq;
-using Eto.Forms;
-using Eto.Drawing;
-using sw = System.Windows;
-using swm = System.Windows.Media;
-using swc = System.Windows.Controls;
-using swi = System.Windows.Input;
 using Eto.Wpf.CustomControls;
 using Eto.Wpf.Forms.Menu;
-using System.ComponentModel;
-using System.Reflection;
-using System.Collections.Generic;
 using Eto.Wpf.Drawing;
 
 namespace Eto.Wpf.Forms
diff --git a/src/Eto.Wpf/IO/SystemIcons.cs b/src/Eto.Wpf/IO/SystemIcons.cs
index 527a38d898..e0c4e6198b 100644
--- a/src/Eto.Wpf/IO/SystemIcons.cs
+++ b/src/Eto.Wpf/IO/SystemIcons.cs
@@ -1,12 +1,5 @@
-using System;
-using sd = System.Drawing;
-using Eto.Drawing;
 using Eto.IO;
 using Eto.Wpf.Drawing;
-using sw = System.Windows;
-using swm = System.Windows.Media;
-using swmi = System.Windows.Media.Imaging;
-using swi = System.Windows.Interop;
 
 namespace Eto.Wpf.IO
 {
diff --git a/src/Eto.Wpf/KeyMap.cs b/src/Eto.Wpf/KeyMap.cs
index d3ce4937ec..1ff10ba462 100644
--- a/src/Eto.Wpf/KeyMap.cs
+++ b/src/Eto.Wpf/KeyMap.cs
@@ -1,8 +1,3 @@
-using Eto.Forms;
-using System.Collections.Generic;
-using System.Diagnostics;
-using swi = System.Windows.Input;
-
 namespace Eto.Wpf
 {
 	public static class KeyMap
diff --git a/src/Eto.Wpf/LogicalScreenHelper.cs b/src/Eto.Wpf/LogicalScreenHelper.cs
index 39377985ed..9f865a092b 100644
--- a/src/Eto.Wpf/LogicalScreenHelper.cs
+++ b/src/Eto.Wpf/LogicalScreenHelper.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using sd = System.Drawing;
 #if WPF
 #elif WINFORMS
 using Eto.WinForms.Forms;
diff --git a/src/Eto.Wpf/NameDictionaryExtensions.cs b/src/Eto.Wpf/NameDictionaryExtensions.cs
index 6520a409a7..096d0cd2fb 100644
--- a/src/Eto.Wpf/NameDictionaryExtensions.cs
+++ b/src/Eto.Wpf/NameDictionaryExtensions.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
 using System.Windows.Media;
 using System.Windows.Markup;
 
diff --git a/src/Eto.Wpf/Platform.cs b/src/Eto.Wpf/Platform.cs
index 8e50ac0a11..e24a615c48 100755
--- a/src/Eto.Wpf/Platform.cs
+++ b/src/Eto.Wpf/Platform.cs
@@ -1,10 +1,5 @@
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.Wpf.Forms.Cells;
 using Eto.Wpf.Forms.ToolBar;
-using swi = System.Windows.Input;
-using swm = System.Windows.Media;
-using sw = System.Windows;
 using Eto.Wpf.Drawing;
 using Eto.Wpf.Forms.Menu;
 using Eto.Wpf.Forms.Controls;
@@ -14,8 +9,6 @@
 using Eto.Wpf.IO;
 using Eto.Forms.ThemedControls;
 using Eto.Shared.Forms;
-using System.Linq;
-using System.Diagnostics;
 namespace Eto.Wpf
 {
 	public class Platform : Eto.Platform
diff --git a/src/Eto.Wpf/Properties/AssemblyInfo.cs b/src/Eto.Wpf/Properties/AssemblyInfo.cs
index 2ff896d0ba..e6c227ecc3 100644
--- a/src/Eto.Wpf/Properties/AssemblyInfo.cs
+++ b/src/Eto.Wpf/Properties/AssemblyInfo.cs
@@ -1,4 +1,3 @@
-using System.Reflection;
 using System.Windows;
 
 [assembly: ThemeInfo (
diff --git a/src/Eto.Wpf/PropertyChangeNotifier.cs b/src/Eto.Wpf/PropertyChangeNotifier.cs
index ae1815efeb..d96052c50e 100755
--- a/src/Eto.Wpf/PropertyChangeNotifier.cs
+++ b/src/Eto.Wpf/PropertyChangeNotifier.cs
@@ -1,5 +1,3 @@
-using System;
-using sw = System.Windows;
 using swd = System.Windows.Data;
 
 namespace Eto.Wpf
diff --git a/src/Eto.Wpf/PropertyPathHelper.cs b/src/Eto.Wpf/PropertyPathHelper.cs
index e56728aa5b..e443085d6e 100644
--- a/src/Eto.Wpf/PropertyPathHelper.cs
+++ b/src/Eto.Wpf/PropertyPathHelper.cs
@@ -1,9 +1,3 @@
-using System;
-using swk = System.Windows.Markup;
-using sw = System.Windows;
-using System.Reflection;
-using System.ComponentModel;
-
 namespace Eto.Wpf
 {
     public static class PropertyPathHelper
diff --git a/src/Eto.Wpf/Win32.dib.cs b/src/Eto.Wpf/Win32.dib.cs
index f15a611b8e..1fdce2f8a4 100644
--- a/src/Eto.Wpf/Win32.dib.cs
+++ b/src/Eto.Wpf/Win32.dib.cs
@@ -1,7 +1,3 @@
-using System;
-using System.IO;
-using Eto.Drawing;
-
 namespace Eto
 {
 	partial class Win32
diff --git a/src/Eto.Wpf/WinFormsHelpers.cs b/src/Eto.Wpf/WinFormsHelpers.cs
index 3c95a52e38..8710d43944 100644
--- a/src/Eto.Wpf/WinFormsHelpers.cs
+++ b/src/Eto.Wpf/WinFormsHelpers.cs
@@ -1,12 +1,4 @@
-using Eto.Forms;
 using Eto.Wpf.Forms;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using swf = System.Windows.Forms;
-
 namespace Eto.Wpf
 {
 	public static class WinFormsHelpers
diff --git a/src/Eto.Wpf/WpfConversions.cs b/src/Eto.Wpf/WpfConversions.cs
index 9a1c950bbc..87bc72dd4c 100755
--- a/src/Eto.Wpf/WpfConversions.cs
+++ b/src/Eto.Wpf/WpfConversions.cs
@@ -1,19 +1,7 @@
-using System;
-using System.Linq;
-using Eto.Drawing;
-using Eto.Forms;
-using swi = System.Windows.Input;
-using swm = System.Windows.Media;
-using sw = System.Windows;
 using sp = System.Printing;
-using swc = System.Windows.Controls;
-using swmi = System.Windows.Media.Imaging;
 using swd = System.Windows.Documents;
-using xwt = Xceed.Wpf.Toolkit;
 using Eto.Wpf.Drawing;
 using System.Windows.Interop;
-using System.IO;
-
 namespace Eto.Wpf
 {
 	public static class WpfConversions
diff --git a/src/Eto.Wpf/WpfExtensions.cs b/src/Eto.Wpf/WpfExtensions.cs
index 8606fc34a3..aa2d6c91d7 100755
--- a/src/Eto.Wpf/WpfExtensions.cs
+++ b/src/Eto.Wpf/WpfExtensions.cs
@@ -1,16 +1,4 @@
-using System;
-using sw = System.Windows;
-using swm = System.Windows.Media;
-using swi = System.Windows.Input;
-using swc = System.Windows.Controls;
-using swf = System.Windows.Forms;
-using sd = System.Drawing;
 using Eto.Wpf.Forms;
-using Eto.Forms;
-using System.Linq;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-
 namespace Eto.Wpf
 {
 	static class WpfExtensions
diff --git a/src/Eto.Wpf/WpfHelpers.cs b/src/Eto.Wpf/WpfHelpers.cs
index 32b7542fc0..0c2ddbbe48 100644
--- a/src/Eto.Wpf/WpfHelpers.cs
+++ b/src/Eto.Wpf/WpfHelpers.cs
@@ -1,7 +1,4 @@
-using System;
-using Eto.Forms;
 using Eto.Wpf.Forms;
-using sw = System.Windows;
 using Eto.Wpf.Forms.Controls;
 
 namespace Eto.Forms
diff --git a/src/Eto.Wpf/WpfProperties.cs b/src/Eto.Wpf/WpfProperties.cs
index b94a5a7e49..aec1fefbfa 100755
--- a/src/Eto.Wpf/WpfProperties.cs
+++ b/src/Eto.Wpf/WpfProperties.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using sw = System.Windows;
-
 namespace Eto.Wpf
 {
 	public static class WpfProperties
diff --git a/src/Eto.iOS/Conversions.cs b/src/Eto.iOS/Conversions.cs
index c15e938169..2147a049e7 100644
--- a/src/Eto.iOS/Conversions.cs
+++ b/src/Eto.iOS/Conversions.cs
@@ -1,10 +1,6 @@
-using System;
 using UIKit;
-using Eto.Drawing;
 using Eto.iOS.Drawing;
-using Eto.Forms;
 using Foundation;
-using System.Linq;
 using CoreGraphics;
 using ImageIO;
 
diff --git a/src/Eto.iOS/Drawing/BitmapHandler.cs b/src/Eto.iOS/Drawing/BitmapHandler.cs
index e8868e08b0..f22b2b8bec 100644
--- a/src/Eto.iOS/Drawing/BitmapHandler.cs
+++ b/src/Eto.iOS/Drawing/BitmapHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using System.IO;
-using System.Linq;
-using Eto.Drawing;
 using SD = System.Drawing;
 using UIKit;
 using Foundation;
diff --git a/src/Eto.iOS/Drawing/FontFamilyHandler.cs b/src/Eto.iOS/Drawing/FontFamilyHandler.cs
index fbbb307c60..03c74cf061 100644
--- a/src/Eto.iOS/Drawing/FontFamilyHandler.cs
+++ b/src/Eto.iOS/Drawing/FontFamilyHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using Eto.Drawing;
-using System.Collections.Generic;
 using UIKit;
-using System.Linq;
-
 namespace Eto.iOS.Drawing
 {
 	public class FontFamilyHandler : WidgetHandler<object, FontFamily>, FontFamily.IHandler
diff --git a/src/Eto.iOS/Drawing/FontTypefaceHandler.cs b/src/Eto.iOS/Drawing/FontTypefaceHandler.cs
index 01e44e17a6..042e658193 100644
--- a/src/Eto.iOS/Drawing/FontTypefaceHandler.cs
+++ b/src/Eto.iOS/Drawing/FontTypefaceHandler.cs
@@ -1,5 +1,3 @@
-using System;
-using Eto.Drawing;
 using UIKit;
 
 namespace Eto.iOS.Drawing
diff --git a/src/Eto.iOS/Drawing/IconHandler.cs b/src/Eto.iOS/Drawing/IconHandler.cs
index a6d9613de0..ad36dfee02 100644
--- a/src/Eto.iOS/Drawing/IconHandler.cs
+++ b/src/Eto.iOS/Drawing/IconHandler.cs
@@ -1,13 +1,7 @@
-using System;
-using System.IO;
-using Eto.Drawing;
 using UIKit;
 using Foundation;
 using SD = System.Drawing;
 using CoreGraphics;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.iOS.Drawing
 {
 	public class IconFrameHandler : IconFrame.IHandler
diff --git a/src/Eto.iOS/Drawing/ImageHandler.cs b/src/Eto.iOS/Drawing/ImageHandler.cs
index dc878e60b5..46502bf254 100644
--- a/src/Eto.iOS/Drawing/ImageHandler.cs
+++ b/src/Eto.iOS/Drawing/ImageHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using System.IO;
-using Eto.Drawing;
 using UIKit;
 
 namespace Eto.iOS.Drawing
diff --git a/src/Eto.iOS/Drawing/IndexedBitmapHandler.cs b/src/Eto.iOS/Drawing/IndexedBitmapHandler.cs
index 33fdb2f2af..f0073f33f7 100644
--- a/src/Eto.iOS/Drawing/IndexedBitmapHandler.cs
+++ b/src/Eto.iOS/Drawing/IndexedBitmapHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Runtime.InteropServices;
-using System.Linq;
-using Eto.Drawing;
 using UIKit;
 using Eto.Shared.Drawing;
 
diff --git a/src/Eto.iOS/EtoAppDelegate.cs b/src/Eto.iOS/EtoAppDelegate.cs
index 981b412b14..dd6be2220a 100644
--- a/src/Eto.iOS/EtoAppDelegate.cs
+++ b/src/Eto.iOS/EtoAppDelegate.cs
@@ -1,9 +1,6 @@
-using System;
 using Foundation;
 using UIKit;
 using Eto.iOS.Forms;
-using Eto.Forms;
-
 namespace Eto.iOS
 {
 	[Foundation.Register("EtoAppDelegate")]
diff --git a/src/Eto.iOS/EtoEnvironmentHandler.cs b/src/Eto.iOS/EtoEnvironmentHandler.cs
index 98ff210155..90c1df1fc0 100644
--- a/src/Eto.iOS/EtoEnvironmentHandler.cs
+++ b/src/Eto.iOS/EtoEnvironmentHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Runtime.InteropServices;
-using System.Linq;
 using Foundation;
 
 namespace Eto.iOS
diff --git a/src/Eto.iOS/Extensions.cs b/src/Eto.iOS/Extensions.cs
index e1a52b6040..1aa522792c 100644
--- a/src/Eto.iOS/Extensions.cs
+++ b/src/Eto.iOS/Extensions.cs
@@ -1,7 +1,5 @@
-using System;
 using UIKit;
 using CoreGraphics;
-using Eto.Forms;
 using Eto.iOS.Forms;
 using Foundation;
 using ObjCRuntime;
diff --git a/src/Eto.iOS/Forms/ApplicationHandler.cs b/src/Eto.iOS/Forms/ApplicationHandler.cs
index 69b30df6e3..cfff00a4dd 100644
--- a/src/Eto.iOS/Forms/ApplicationHandler.cs
+++ b/src/Eto.iOS/Forms/ApplicationHandler.cs
@@ -1,11 +1,6 @@
-using System;
-using Eto.Forms;
 using UIKit;
 using Foundation;
 using SD = System.Drawing;
-using System.Diagnostics;
-using System.Collections.Generic;
-
 namespace Eto.iOS.Forms
 {
 	public class ApplicationHandler : WidgetHandler<UIApplication, Application, Application.ICallback>, Application.IHandler
diff --git a/src/Eto.iOS/Forms/Cells/CellHandler.cs b/src/Eto.iOS/Forms/Cells/CellHandler.cs
index e66e599e5e..3e01f7d798 100644
--- a/src/Eto.iOS/Forms/Cells/CellHandler.cs
+++ b/src/Eto.iOS/Forms/Cells/CellHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using UIKit;
 using NSCell = UIKit.UITableViewCell;
 
diff --git a/src/Eto.iOS/Forms/Cells/CheckBoxCellHandler.cs b/src/Eto.iOS/Forms/Cells/CheckBoxCellHandler.cs
index 872604c915..486c259271 100644
--- a/src/Eto.iOS/Forms/Cells/CheckBoxCellHandler.cs
+++ b/src/Eto.iOS/Forms/Cells/CheckBoxCellHandler.cs
@@ -1,5 +1,3 @@
-using System;
-using Eto.Forms;
 using UIKit;
 using NSCell = UIKit.UITableViewCell;
 
diff --git a/src/Eto.iOS/Forms/Cells/ComboBoxCellHandler.cs b/src/Eto.iOS/Forms/Cells/ComboBoxCellHandler.cs
index 9e982eb9f7..546932f349 100644
--- a/src/Eto.iOS/Forms/Cells/ComboBoxCellHandler.cs
+++ b/src/Eto.iOS/Forms/Cells/ComboBoxCellHandler.cs
@@ -1,9 +1,5 @@
-using System;
-using Eto.Forms;
 using UIKit;
 using NSCell = UIKit.UITableViewCell;
-using System.Collections.Generic;
-
 namespace Eto.iOS.Forms.Cells
 {
 	public class ComboBoxCellHandler : CellHandler<NSCell, ComboBoxCell>, ComboBoxCell.IHandler
diff --git a/src/Eto.iOS/Forms/Cells/ImageTextCellHandler.cs b/src/Eto.iOS/Forms/Cells/ImageTextCellHandler.cs
index 7072a3b4d2..ee2b4a0a6d 100644
--- a/src/Eto.iOS/Forms/Cells/ImageTextCellHandler.cs
+++ b/src/Eto.iOS/Forms/Cells/ImageTextCellHandler.cs
@@ -1,9 +1,5 @@
-using System;
-using Eto.Forms;
 using UIKit;
 using NSCell = UIKit.UITableViewCell;
-using Eto.Drawing;
-
 namespace Eto.iOS.Forms.Cells
 {
 	public class ImageTextCellHandler : CellHandler<NSCell, ImageTextCell>, ImageTextCell.IHandler
diff --git a/src/Eto.iOS/Forms/Cells/ImageViewCellHandler.cs b/src/Eto.iOS/Forms/Cells/ImageViewCellHandler.cs
index de01de2132..060b76f712 100644
--- a/src/Eto.iOS/Forms/Cells/ImageViewCellHandler.cs
+++ b/src/Eto.iOS/Forms/Cells/ImageViewCellHandler.cs
@@ -1,9 +1,5 @@
-using System;
-using Eto.Forms;
 using UIKit;
 using NSCell = UIKit.UITableViewCell;
-using Eto.Drawing;
-
 namespace Eto.iOS.Forms.Cells
 {
 	public class ImageViewCellHandler : CellHandler<NSCell, ImageViewCell>, ImageViewCell.IHandler
diff --git a/src/Eto.iOS/Forms/Cells/TextBoxCellHandler.cs b/src/Eto.iOS/Forms/Cells/TextBoxCellHandler.cs
index 8a8d82bf7c..03a96a88fd 100644
--- a/src/Eto.iOS/Forms/Cells/TextBoxCellHandler.cs
+++ b/src/Eto.iOS/Forms/Cells/TextBoxCellHandler.cs
@@ -1,5 +1,3 @@
-using System;
-using Eto.Forms;
 using UIKit;
 using NSCell = UIKit.UITableViewCell;
 
diff --git a/src/Eto.iOS/Forms/ClipboardHandler.cs b/src/Eto.iOS/Forms/ClipboardHandler.cs
index 432041c6b9..d088d77815 100644
--- a/src/Eto.iOS/Forms/ClipboardHandler.cs
+++ b/src/Eto.iOS/Forms/ClipboardHandler.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Forms;
-using System.IO;
-using Eto.Drawing;
-using UIKit;
+using UIKit;
 using Foundation;
 using MobileCoreServices;
 using Eto.iOS.Drawing;
diff --git a/src/Eto.iOS/Forms/Controls/BasePickerHandler.cs b/src/Eto.iOS/Forms/Controls/BasePickerHandler.cs
index 4efa2b6a79..547257682b 100644
--- a/src/Eto.iOS/Forms/Controls/BasePickerHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/BasePickerHandler.cs
@@ -1,12 +1,6 @@
-using System;
-using System.Reflection;
 using SD = System.Drawing;
-using Eto.Forms;
 using UIKit;
-using Eto.Drawing;
 using Foundation;
-using System.Collections.Generic;
-using System.Linq;
 using ObjCRuntime;
 
 namespace Eto.iOS.Forms.Controls
diff --git a/src/Eto.iOS/Forms/Controls/ButtonHandler.cs b/src/Eto.iOS/Forms/Controls/ButtonHandler.cs
index f12da4c36f..b343676140 100644
--- a/src/Eto.iOS/Forms/Controls/ButtonHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/ButtonHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Reflection;
-using Eto.Drawing;
-using Eto.Forms;
 using UIKit;
 
 namespace Eto.iOS.Forms.Controls
diff --git a/src/Eto.iOS/Forms/Controls/CheckBoxHandler.cs b/src/Eto.iOS/Forms/Controls/CheckBoxHandler.cs
index da528e685d..67235d8749 100644
--- a/src/Eto.iOS/Forms/Controls/CheckBoxHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/CheckBoxHandler.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Reflection;
-using Eto.Forms;
 using UIKit;
-using Eto.Drawing;
 using sd = System.Drawing;
 
 namespace Eto.iOS.Forms.Controls
diff --git a/src/Eto.iOS/Forms/Controls/ComboBoxHandler.cs b/src/Eto.iOS/Forms/Controls/ComboBoxHandler.cs
index 58d2ea58f0..3d3ae0ad1a 100644
--- a/src/Eto.iOS/Forms/Controls/ComboBoxHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/ComboBoxHandler.cs
@@ -1,13 +1,6 @@
-using System;
-using System.Reflection;
 using SD = System.Drawing;
-using Eto.Forms;
 using UIKit;
-using Eto.Drawing;
 using Foundation;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.iOS.Forms.Controls
 {
 	public class ComboBoxHandler : DropDownHandler<ComboBox, ComboBox.ICallback, UIPickerView>, ComboBox.IHandler
diff --git a/src/Eto.iOS/Forms/Controls/DateTimePickerHandler.cs b/src/Eto.iOS/Forms/Controls/DateTimePickerHandler.cs
index 081ca008ba..b7f5b9e536 100644
--- a/src/Eto.iOS/Forms/Controls/DateTimePickerHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/DateTimePickerHandler.cs
@@ -1,13 +1,6 @@
-using System;
-using System.Reflection;
 using SD = System.Drawing;
-using Eto.Forms;
 using UIKit;
-using Eto.Drawing;
 using Foundation;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.iOS.Forms.Controls
 {
 
diff --git a/src/Eto.iOS/Forms/Controls/DrawableHandler.cs b/src/Eto.iOS/Forms/Controls/DrawableHandler.cs
index 83a9aed7c7..10b6ea40c6 100644
--- a/src/Eto.iOS/Forms/Controls/DrawableHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/DrawableHandler.cs
@@ -1,7 +1,4 @@
-using System;
 using SD = System.Drawing;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.iOS.Drawing;
 using UIKit;
 using CoreAnimation;
diff --git a/src/Eto.iOS/Forms/Controls/DropDownHandler.cs b/src/Eto.iOS/Forms/Controls/DropDownHandler.cs
index 3cfa8afd1a..de324d4b07 100644
--- a/src/Eto.iOS/Forms/Controls/DropDownHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/DropDownHandler.cs
@@ -1,13 +1,6 @@
-using System;
-using System.Reflection;
 using SD = System.Drawing;
-using Eto.Forms;
 using UIKit;
-using Eto.Drawing;
 using Foundation;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.iOS.Forms.Controls
 {
 	public class DropDownHandler : DropDownHandler<DropDown, DropDown.ICallback, UIPickerView>
diff --git a/src/Eto.iOS/Forms/Controls/GridColumnHandler.cs b/src/Eto.iOS/Forms/Controls/GridColumnHandler.cs
index 77439017de..45ef010400 100644
--- a/src/Eto.iOS/Forms/Controls/GridColumnHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/GridColumnHandler.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.iOS.Forms.Controls
 {
 	public class GridColumnHandler : WidgetHandler<object, GridColumn>, GridColumn.IHandler
diff --git a/src/Eto.iOS/Forms/Controls/GridHandler.cs b/src/Eto.iOS/Forms/Controls/GridHandler.cs
index 542be6dddf..0412bc39b2 100644
--- a/src/Eto.iOS/Forms/Controls/GridHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/GridHandler.cs
@@ -1,8 +1,5 @@
-using System;
 using MonoTouch;
 using UIKit;
-using Eto.Forms;
-using System.Collections.Generic;
 using Foundation;
 
 namespace Eto.iOS.Forms.Controls
diff --git a/src/Eto.iOS/Forms/Controls/GridViewHandler.cs b/src/Eto.iOS/Forms/Controls/GridViewHandler.cs
index e9cd097dfa..c9237db194 100644
--- a/src/Eto.iOS/Forms/Controls/GridViewHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/GridViewHandler.cs
@@ -1,14 +1,8 @@
-using System;
 using UIKit;
-using Eto.Forms;
-using System.Linq;
 using Eto.iOS.Forms.Cells;
 using Foundation;
-using Eto.Drawing;
 using Eto.iOS.Drawing;
 using NSCell = UIKit.UITableViewCell;
-using System.Collections.Generic;
-
 namespace Eto.iOS.Forms.Controls
 {
 	public class GridViewHandler : GridHandler<UITableView, GridView, GridView.ICallback>, GridView.IHandler
diff --git a/src/Eto.iOS/Forms/Controls/GroupBoxHandler.cs b/src/Eto.iOS/Forms/Controls/GroupBoxHandler.cs
index b4bd682eb3..8d22ab283a 100644
--- a/src/Eto.iOS/Forms/Controls/GroupBoxHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/GroupBoxHandler.cs
@@ -1,8 +1,5 @@
-using System;
 using UIKit;
-using Eto.Forms;
 using Eto.Mac.Forms;
-using Eto.Drawing;
 using CoreGraphics;
 
 namespace Eto.iOS.Forms.Controls
diff --git a/src/Eto.iOS/Forms/Controls/ImageViewHandler.cs b/src/Eto.iOS/Forms/Controls/ImageViewHandler.cs
index acee45e1cd..467168539d 100644
--- a/src/Eto.iOS/Forms/Controls/ImageViewHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/ImageViewHandler.cs
@@ -1,7 +1,4 @@
-using System;
 using UIKit;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.iOS.Drawing;
 
 namespace Eto.iOS.Forms.Controls
diff --git a/src/Eto.iOS/Forms/Controls/IosButton.cs b/src/Eto.iOS/Forms/Controls/IosButton.cs
index 7d67c45bbf..0fb000eebe 100644
--- a/src/Eto.iOS/Forms/Controls/IosButton.cs
+++ b/src/Eto.iOS/Forms/Controls/IosButton.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using UIKit;
 using Eto.iOS.Drawing;
 
diff --git a/src/Eto.iOS/Forms/Controls/IosControl.cs b/src/Eto.iOS/Forms/Controls/IosControl.cs
index 3ff3092b11..875fd64fc2 100644
--- a/src/Eto.iOS/Forms/Controls/IosControl.cs
+++ b/src/Eto.iOS/Forms/Controls/IosControl.cs
@@ -1,8 +1,5 @@
-using System;
-using Eto.Forms;
 using UIKit;
 using Eto.iOS.Drawing;
-using Eto.Drawing;
 using Foundation;
 
 namespace Eto.iOS.Forms.Controls
diff --git a/src/Eto.iOS/Forms/Controls/LabelHandler.cs b/src/Eto.iOS/Forms/Controls/LabelHandler.cs
index 85f7361315..4b2a8b58fc 100644
--- a/src/Eto.iOS/Forms/Controls/LabelHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/LabelHandler.cs
@@ -1,9 +1,5 @@
-using System;
 using UIKit;
-using Eto.Forms;
 using Eto.iOS.Drawing;
-using Eto.Drawing;
-
 namespace Eto.iOS.Forms.Controls
 {
 	public class LabelHandler : IosView<UILabel, Label, Label.ICallback>, Label.IHandler
diff --git a/src/Eto.iOS/Forms/Controls/ListBoxHandler.cs b/src/Eto.iOS/Forms/Controls/ListBoxHandler.cs
index 931e6a239d..3d7a64a1a5 100644
--- a/src/Eto.iOS/Forms/Controls/ListBoxHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/ListBoxHandler.cs
@@ -1,13 +1,6 @@
-using System;
-using System.Reflection;
-using Eto.Forms;
-using System.Collections.Generic;
 using UIKit;
 using Foundation;
-using System.Linq;
 using Eto.iOS.Drawing;
-using Eto.Drawing;
-
 namespace Eto.iOS.Forms.Controls
 {
 	public class ListBoxHandler : IosView<UITableView, ListBox, ListBox.ICallback>, ListBox.IHandler
diff --git a/src/Eto.iOS/Forms/Controls/NavigationHandler.cs b/src/Eto.iOS/Forms/Controls/NavigationHandler.cs
index d2e69de4d5..1e9f470ad2 100644
--- a/src/Eto.iOS/Forms/Controls/NavigationHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/NavigationHandler.cs
@@ -1,11 +1,5 @@
-using System;
 using UIKit;
-using Eto.Forms;
 using ObjCRuntime;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.iOS.Forms.Controls
 {
 	internal class RotatableNavigationController : UINavigationController
diff --git a/src/Eto.iOS/Forms/Controls/NumericStepperHandler.cs b/src/Eto.iOS/Forms/Controls/NumericStepperHandler.cs
index 2420c9e367..825f191be3 100644
--- a/src/Eto.iOS/Forms/Controls/NumericStepperHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/NumericStepperHandler.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Reflection;
 using SD = System.Drawing;
-using Eto.Forms;
 using UIKit;
-using Eto.Drawing;
-
 namespace Eto.iOS.Forms.Controls
 {
 	public class NumericStepperHandler : IosControl<UITextField, NumericStepper, NumericStepper.ICallback>, NumericStepper.IHandler
diff --git a/src/Eto.iOS/Forms/Controls/PanelHandler.cs b/src/Eto.iOS/Forms/Controls/PanelHandler.cs
index e24e446f1b..8cd976fb05 100644
--- a/src/Eto.iOS/Forms/Controls/PanelHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/PanelHandler.cs
@@ -1,6 +1,4 @@
-using System;
 using UIKit;
-using Eto.Forms;
 using Eto.Mac.Forms;
 
 namespace Eto.iOS.Forms.Controls
diff --git a/src/Eto.iOS/Forms/Controls/PasswordBoxHandler.cs b/src/Eto.iOS/Forms/Controls/PasswordBoxHandler.cs
index fa984b55ea..fb0c41f876 100644
--- a/src/Eto.iOS/Forms/Controls/PasswordBoxHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/PasswordBoxHandler.cs
@@ -1,8 +1,4 @@
-using System;
 using UIKit;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.iOS.Forms.Controls
 {
 	public class PasswordBoxHandler : IosControl<UITextField, PasswordBox, PasswordBox.ICallback>, PasswordBox.IHandler
diff --git a/src/Eto.iOS/Forms/Controls/ProgressBarHandler.cs b/src/Eto.iOS/Forms/Controls/ProgressBarHandler.cs
index 4ffd6fda3e..1033ccaa63 100644
--- a/src/Eto.iOS/Forms/Controls/ProgressBarHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/ProgressBarHandler.cs
@@ -1,7 +1,4 @@
-using System;
 using UIKit;
-using Eto.Forms;
-
 namespace Eto.iOS.Forms.Controls
 {
 	public class ProgressBarHandler : IosView<UIProgressView, ProgressBar, ProgressBar.ICallback>, ProgressBar.IHandler
diff --git a/src/Eto.iOS/Forms/Controls/RadioButtonHandler.cs b/src/Eto.iOS/Forms/Controls/RadioButtonHandler.cs
index 6046357cb4..3ea94015c8 100644
--- a/src/Eto.iOS/Forms/Controls/RadioButtonHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/RadioButtonHandler.cs
@@ -1,9 +1,4 @@
-using System;
 using UIKit;
-using Eto.Forms;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.iOS.Forms.Controls
 {
 	// TODO: use UISwitch instead with custom state images, better accessibility
diff --git a/src/Eto.iOS/Forms/Controls/ScrollableHandler.cs b/src/Eto.iOS/Forms/Controls/ScrollableHandler.cs
index c30bd86e06..36ced0d167 100644
--- a/src/Eto.iOS/Forms/Controls/ScrollableHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/ScrollableHandler.cs
@@ -1,11 +1,6 @@
-using System;
-using Eto.Forms;
 using UIKit;
 using sd = System.Drawing;
-using Eto.Drawing;
 using Eto.Mac.Forms;
-using System.ComponentModel;
-
 namespace Eto.iOS.Forms.Controls
 {
 	public class ScrollableHandler : MacPanel<UIScrollView, Scrollable, Scrollable.ICallback>, Scrollable.IHandler
diff --git a/src/Eto.iOS/Forms/Controls/SearchBoxHandler.cs b/src/Eto.iOS/Forms/Controls/SearchBoxHandler.cs
index ceca5f10fa..7d913a136b 100644
--- a/src/Eto.iOS/Forms/Controls/SearchBoxHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/SearchBoxHandler.cs
@@ -1,8 +1,4 @@
-using System;
 using UIKit;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.iOS.Forms.Controls
 {
 	public class SearchBoxHandler : IosView<UISearchBar, SearchBox, SearchBox.ICallback>, SearchBox.IHandler
diff --git a/src/Eto.iOS/Forms/Controls/SliderHandler.cs b/src/Eto.iOS/Forms/Controls/SliderHandler.cs
index 019a1866a5..9224c1d7a1 100644
--- a/src/Eto.iOS/Forms/Controls/SliderHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/SliderHandler.cs
@@ -1,6 +1,4 @@
-using System;
 using UIKit;
-using Eto.Forms;
 using CoreGraphics;
 
 namespace Eto.iOS.Forms.Controls
diff --git a/src/Eto.iOS/Forms/Controls/SpinnerHandler.cs b/src/Eto.iOS/Forms/Controls/SpinnerHandler.cs
index 45410e7ef4..92c61128cc 100644
--- a/src/Eto.iOS/Forms/Controls/SpinnerHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/SpinnerHandler.cs
@@ -1,8 +1,4 @@
-using System;
 using UIKit;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.iOS.Forms.Controls
 {
 	public class SpinnerHandler : IosView<UIActivityIndicatorView, Spinner, Spinner.ICallback>, Spinner.IHandler
diff --git a/src/Eto.iOS/Forms/Controls/SplitterHandler.cs b/src/Eto.iOS/Forms/Controls/SplitterHandler.cs
index 1352d4b7c4..acc80b8222 100644
--- a/src/Eto.iOS/Forms/Controls/SplitterHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/SplitterHandler.cs
@@ -1,9 +1,5 @@
-using System;
-using Eto.Forms;
 using UIKit;
-using System.Linq;
 using Foundation;
-using System.Diagnostics;
 using Eto.Mac.Forms;
 
 namespace Eto.iOS.Forms.Controls
diff --git a/src/Eto.iOS/Forms/Controls/TabControlHandler.cs b/src/Eto.iOS/Forms/Controls/TabControlHandler.cs
index a1e3895960..393287e07d 100644
--- a/src/Eto.iOS/Forms/Controls/TabControlHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/TabControlHandler.cs
@@ -1,14 +1,6 @@
-using System;
-using System.Reflection;
-using Eto.Drawing;
-using Eto.Forms;
 using UIKit;
-using System.Linq;
 using Eto.Mac.Forms;
-using System.Collections.Generic;
 using sd = System.Drawing;
-using System.Diagnostics;
-
 namespace Eto.iOS.Forms.Controls
 {
 	public class TabControlHandler : MacContainer<UITabBarController, TabControl, TabControl.ICallback>, TabControl.IHandler
diff --git a/src/Eto.iOS/Forms/Controls/TabPageHandler.cs b/src/Eto.iOS/Forms/Controls/TabPageHandler.cs
index 9e72a092f0..21a45fcadc 100644
--- a/src/Eto.iOS/Forms/Controls/TabPageHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/TabPageHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Reflection;
-using Eto.Drawing;
-using Eto.Forms;
 using UIKit;
-using System.Linq;
 using Eto.Mac.Forms;
 
 namespace Eto.iOS.Forms.Controls
diff --git a/src/Eto.iOS/Forms/Controls/TextAreaHandler.cs b/src/Eto.iOS/Forms/Controls/TextAreaHandler.cs
index 14aed46fb9..dd52bba8b5 100644
--- a/src/Eto.iOS/Forms/Controls/TextAreaHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/TextAreaHandler.cs
@@ -1,10 +1,6 @@
-using System;
 using UIKit;
-using Eto.Forms;
 using Foundation;
 using Eto.iOS.Drawing;
-using Eto.Drawing;
-
 namespace Eto.iOS.Forms.Controls
 {
 	public class TextAreaHandler : IosView<UITextView, TextArea, TextArea.ICallback>, TextArea.IHandler
diff --git a/src/Eto.iOS/Forms/Controls/TextBoxHandler.cs b/src/Eto.iOS/Forms/Controls/TextBoxHandler.cs
index b586fd5214..5232fddd2c 100644
--- a/src/Eto.iOS/Forms/Controls/TextBoxHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/TextBoxHandler.cs
@@ -1,8 +1,4 @@
-using System;
 using UIKit;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.iOS.Forms.Controls
 {
 	public class TextBoxHandler : IosControl<UITextField, TextBox, TextBox.ICallback>, TextBox.IHandler
diff --git a/src/Eto.iOS/Forms/Controls/TreeGridViewHandler.cs b/src/Eto.iOS/Forms/Controls/TreeGridViewHandler.cs
index 771051ab0c..ee561536ac 100644
--- a/src/Eto.iOS/Forms/Controls/TreeGridViewHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/TreeGridViewHandler.cs
@@ -1,12 +1,6 @@
-using System;
 using UIKit;
-using Eto.Forms;
-using System.Linq;
 using Eto.iOS.Forms.Cells;
 using Foundation;
-using Eto.Drawing;
-using System.Collections.Generic;
-
 namespace Eto.iOS.Forms.Controls
 {
 	public class TreeGridViewHandler : GridHandler<UITableView, TreeGridView, TreeGridView.ICallback>, TreeGridView.IHandler
diff --git a/src/Eto.iOS/Forms/Controls/WebViewHandler.cs b/src/Eto.iOS/Forms/Controls/WebViewHandler.cs
index 6a9d95deba..ee46237b80 100644
--- a/src/Eto.iOS/Forms/Controls/WebViewHandler.cs
+++ b/src/Eto.iOS/Forms/Controls/WebViewHandler.cs
@@ -1,7 +1,4 @@
-using System;
 using UIKit;
-using Eto.Forms;
-
 namespace Eto.iOS.Forms.Controls
 {
 	public class WebViewHandler : IosView<UIWebView, WebView, WebView.ICallback>, WebView.IHandler
diff --git a/src/Eto.iOS/Forms/DialogHandler.cs b/src/Eto.iOS/Forms/DialogHandler.cs
index d3815a297b..10b43e53cb 100644
--- a/src/Eto.iOS/Forms/DialogHandler.cs
+++ b/src/Eto.iOS/Forms/DialogHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Linq;
 using UIKit;
-using Eto.Forms;
-using System.Threading.Tasks;
-
 namespace Eto.iOS.Forms
 {
 	public class DialogHandler<TWidget, TCallback> : IosWindow<UIView, TWidget, TCallback>, Dialog.IHandler, Form.IHandler
diff --git a/src/Eto.iOS/Forms/FormHandler.cs b/src/Eto.iOS/Forms/FormHandler.cs
index d9bc95a24f..40c462dccf 100644
--- a/src/Eto.iOS/Forms/FormHandler.cs
+++ b/src/Eto.iOS/Forms/FormHandler.cs
@@ -1,7 +1,4 @@
-using System;
 using UIKit;
-using Eto.Forms;
-using System.Linq;
 using Eto.iOS.Forms.Controls;
 using sd = System.Drawing;
 using Eto.iOS.Forms.Toolbar;
diff --git a/src/Eto.iOS/Forms/IosLayout.cs b/src/Eto.iOS/Forms/IosLayout.cs
index 85f157e563..0693ec1088 100644
--- a/src/Eto.iOS/Forms/IosLayout.cs
+++ b/src/Eto.iOS/Forms/IosLayout.cs
@@ -1,9 +1,6 @@
-using System;
-using Eto.Forms;
 using SD = System.Drawing;
 using Foundation;
 using UIKit;
-using Eto.Drawing;
 using Eto.Mac.Forms;
 
 namespace Eto.iOS.Forms
diff --git a/src/Eto.iOS/Forms/IosView.cs b/src/Eto.iOS/Forms/IosView.cs
index 84ad450e2e..ae43d2f68f 100644
--- a/src/Eto.iOS/Forms/IosView.cs
+++ b/src/Eto.iOS/Forms/IosView.cs
@@ -1,14 +1,8 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.iOS.Drawing;
 using SD = System.Drawing;
 using Foundation;
 using UIKit;
 using Eto.Mac.Forms;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.iOS.Forms
 {
 	public interface IIosViewControllerSource 
diff --git a/src/Eto.iOS/Forms/IosViewExtensions.cs b/src/Eto.iOS/Forms/IosViewExtensions.cs
index 27564862fd..1a83f4e8b5 100644
--- a/src/Eto.iOS/Forms/IosViewExtensions.cs
+++ b/src/Eto.iOS/Forms/IosViewExtensions.cs
@@ -1,7 +1,4 @@
-using System;
 using UIKit;
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Mac.Forms;
 using sd = System.Drawing;
 
diff --git a/src/Eto.iOS/Forms/IosWindow.cs b/src/Eto.iOS/Forms/IosWindow.cs
index 650adb2365..087001a555 100644
--- a/src/Eto.iOS/Forms/IosWindow.cs
+++ b/src/Eto.iOS/Forms/IosWindow.cs
@@ -1,8 +1,5 @@
-using System;
 using UIKit;
-using Eto.Forms;
 using Eto.iOS.Forms.Controls;
-using Eto.Drawing;
 using Eto.Mac.Forms;
 using sd = System.Drawing;
 using Eto.iOS.Forms.Toolbar;
diff --git a/src/Eto.iOS/Forms/MacCompatibility.cs b/src/Eto.iOS/Forms/MacCompatibility.cs
index b1d47068f9..67c360e122 100644
--- a/src/Eto.iOS/Forms/MacCompatibility.cs
+++ b/src/Eto.iOS/Forms/MacCompatibility.cs
@@ -1,4 +1,3 @@
-using System;
 using UIKit;
 using sd = System.Drawing;
 
diff --git a/src/Eto.iOS/Forms/MessageBoxHandler.cs b/src/Eto.iOS/Forms/MessageBoxHandler.cs
index 5af43492eb..db71aa127e 100644
--- a/src/Eto.iOS/Forms/MessageBoxHandler.cs
+++ b/src/Eto.iOS/Forms/MessageBoxHandler.cs
@@ -1,7 +1,4 @@
-using System;
 using UIKit;
-using Eto.Forms;
-
 namespace Eto.iOS.Forms
 {
 	public class MessageBoxHandler : WidgetHandler<Widget>, MessageBox.IHandler
diff --git a/src/Eto.iOS/Forms/PixelLayoutHandler.cs b/src/Eto.iOS/Forms/PixelLayoutHandler.cs
index c416632367..a768cf3876 100644
--- a/src/Eto.iOS/Forms/PixelLayoutHandler.cs
+++ b/src/Eto.iOS/Forms/PixelLayoutHandler.cs
@@ -1,10 +1,5 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
 using UIKit;
-using System.Collections.Generic;
 using sd = System.Drawing;
-using System.Linq;
 using Eto.Mac.Forms;
 
 namespace Eto.iOS.Forms
diff --git a/src/Eto.iOS/Forms/RotatableViewController.cs b/src/Eto.iOS/Forms/RotatableViewController.cs
index 150671dc62..6e8a12ca5d 100644
--- a/src/Eto.iOS/Forms/RotatableViewController.cs
+++ b/src/Eto.iOS/Forms/RotatableViewController.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Linq;
 using UIKit;
-using Eto.Forms;
-using System.Threading.Tasks;
 using ObjCRuntime;
 
 namespace Eto.iOS.Forms
diff --git a/src/Eto.iOS/Forms/ScreenHandler.cs b/src/Eto.iOS/Forms/ScreenHandler.cs
index 54ddea8065..e643722645 100644
--- a/src/Eto.iOS/Forms/ScreenHandler.cs
+++ b/src/Eto.iOS/Forms/ScreenHandler.cs
@@ -1,7 +1,4 @@
-using System;
 using UIKit;
-using Eto.Forms;
-
 namespace Eto.iOS.Forms
 {
 	public class ScreenHandler : WidgetHandler<UIScreen, Screen, Screen.ICallback>, Screen.IHandler
diff --git a/src/Eto.iOS/Forms/ScreensHandler.cs b/src/Eto.iOS/Forms/ScreensHandler.cs
index 4e2e0f25cd..2742782d49 100644
--- a/src/Eto.iOS/Forms/ScreensHandler.cs
+++ b/src/Eto.iOS/Forms/ScreensHandler.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Forms;
 using UIKit;
-using System.Linq;
-
 namespace Eto.iOS.Forms
 {
 	public class ScreensHandler : Screen.IScreensHandler
diff --git a/src/Eto.iOS/Forms/Toolbar/ButtonToolItemHandler.cs b/src/Eto.iOS/Forms/Toolbar/ButtonToolItemHandler.cs
index d37b30ab0c..4cd5c59575 100644
--- a/src/Eto.iOS/Forms/Toolbar/ButtonToolItemHandler.cs
+++ b/src/Eto.iOS/Forms/Toolbar/ButtonToolItemHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Eto.Drawing;
-using Eto.Forms;
 using ObjCRuntime;
 using UIKit;
 using sd = System.Drawing;
diff --git a/src/Eto.iOS/Forms/Toolbar/CheckToolItemHandler.cs b/src/Eto.iOS/Forms/Toolbar/CheckToolItemHandler.cs
index da90bf2f91..c610f54ac5 100644
--- a/src/Eto.iOS/Forms/Toolbar/CheckToolItemHandler.cs
+++ b/src/Eto.iOS/Forms/Toolbar/CheckToolItemHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Eto.Drawing;
-using Eto.Forms;
 using ObjCRuntime;
 using UIKit;
 using sd = System.Drawing;
diff --git a/src/Eto.iOS/Forms/Toolbar/RadioToolItemHandler.cs b/src/Eto.iOS/Forms/Toolbar/RadioToolItemHandler.cs
index b1d235d29b..b1c5085848 100644
--- a/src/Eto.iOS/Forms/Toolbar/RadioToolItemHandler.cs
+++ b/src/Eto.iOS/Forms/Toolbar/RadioToolItemHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Eto.Drawing;
-using Eto.Forms;
 using ObjCRuntime;
 using UIKit;
 using sd = System.Drawing;
diff --git a/src/Eto.iOS/Forms/Toolbar/SeparatorToolItemHandler.cs b/src/Eto.iOS/Forms/Toolbar/SeparatorToolItemHandler.cs
index 5e36109568..e88f1a35fe 100644
--- a/src/Eto.iOS/Forms/Toolbar/SeparatorToolItemHandler.cs
+++ b/src/Eto.iOS/Forms/Toolbar/SeparatorToolItemHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Eto.Drawing;
-using Eto.Forms;
 using ObjCRuntime;
 using UIKit;
 using sd = System.Drawing;
diff --git a/src/Eto.iOS/Forms/Toolbar/ToolItemHandler.cs b/src/Eto.iOS/Forms/Toolbar/ToolItemHandler.cs
index b762610b5a..476387859c 100644
--- a/src/Eto.iOS/Forms/Toolbar/ToolItemHandler.cs
+++ b/src/Eto.iOS/Forms/Toolbar/ToolItemHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Eto.Drawing;
-using Eto.Forms;
 using ObjCRuntime;
 using UIKit;
 using sd = System.Drawing;
diff --git a/src/Eto.iOS/Forms/Toolbar/ToolbarHandler.cs b/src/Eto.iOS/Forms/Toolbar/ToolbarHandler.cs
index d0552d2782..5a5631c0e8 100644
--- a/src/Eto.iOS/Forms/Toolbar/ToolbarHandler.cs
+++ b/src/Eto.iOS/Forms/Toolbar/ToolbarHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Eto.Drawing;
-using Eto.Forms;
 using ObjCRuntime;
 using UIKit;
 using sd = System.Drawing;
diff --git a/src/Eto.iOS/InvokeHelper.cs b/src/Eto.iOS/InvokeHelper.cs
index e93509a44f..259d5813a5 100644
--- a/src/Eto.iOS/InvokeHelper.cs
+++ b/src/Eto.iOS/InvokeHelper.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.iOS
 {
 		class InvokeHelper
diff --git a/src/Eto.iOS/Platform.cs b/src/Eto.iOS/Platform.cs
index a9c871f97d..cc9775d6c1 100644
--- a/src/Eto.iOS/Platform.cs
+++ b/src/Eto.iOS/Platform.cs
@@ -1,10 +1,6 @@
-using System;
 using UIKit;
 using Foundation;
-using System.Linq;
-using Eto.Drawing;
 using CoreGraphics;
-using Eto.Forms;
 using Eto.iOS.Drawing;
 using Eto.iOS.Forms.Cells;
 using Eto.iOS.Forms.Controls;
@@ -13,8 +9,6 @@
 using Eto.Threading;
 using Eto.iOS.Threading;
 using Eto.iOS.Forms.Toolbar;
-using System.Reflection;
-
 namespace Eto.iOS
 {
 	[Preserve]
diff --git a/src/Eto.iOS/Properties/AssemblyInfo.cs b/src/Eto.iOS/Properties/AssemblyInfo.cs
index e1385acf8f..26921bfd5e 100644
--- a/src/Eto.iOS/Properties/AssemblyInfo.cs
+++ b/src/Eto.iOS/Properties/AssemblyInfo.cs
@@ -1,4 +1,3 @@
-using System.Reflection;
 using System.Runtime.CompilerServices;
 
 [assembly: AssemblyTitle("Eto.Forms - iOS Platform")]
diff --git a/src/Eto.iOS/Threading/ThreadHandler.cs b/src/Eto.iOS/Threading/ThreadHandler.cs
index 3248fc9cb4..31f7c8d706 100644
--- a/src/Eto.iOS/Threading/ThreadHandler.cs
+++ b/src/Eto.iOS/Threading/ThreadHandler.cs
@@ -1,4 +1,3 @@
-using System;
 using Foundation;
 using Eto.Threading;
 using ObjCRuntime;
diff --git a/src/Eto/AutoInitializeAttribute.cs b/src/Eto/AutoInitializeAttribute.cs
index ef01faa646..64e8048087 100644
--- a/src/Eto/AutoInitializeAttribute.cs
+++ b/src/Eto/AutoInitializeAttribute.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Threading;
-
 namespace Eto;
 
 /// <summary>
diff --git a/src/Eto/CollectionChangedHandler.cs b/src/Eto/CollectionChangedHandler.cs
index 8324bdb1e6..4fce7d78f6 100644
--- a/src/Eto/CollectionChangedHandler.cs
+++ b/src/Eto/CollectionChangedHandler.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Specialized;
-using Eto.Forms;
-using System.Collections.Generic;
-using System.Linq;
-using System.Collections;
-
 namespace Eto;
 
 /// <summary>
diff --git a/src/Eto/ContentProperty.cs b/src/Eto/ContentProperty.cs
index 9d332e9f38..48083d9b43 100644
--- a/src/Eto/ContentProperty.cs
+++ b/src/Eto/ContentProperty.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace Eto;
 
 /// <summary>
diff --git a/src/Eto/DefaultStyleProvider.cs b/src/Eto/DefaultStyleProvider.cs
index 7e38775298..c26f85e9e2 100644
--- a/src/Eto/DefaultStyleProvider.cs
+++ b/src/Eto/DefaultStyleProvider.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-
 namespace Eto;
 
 /// <summary>
diff --git a/src/Eto/DisplayAttributeExtensions.cs b/src/Eto/DisplayAttributeExtensions.cs
index 64ec6368a8..8f13584e78 100644
--- a/src/Eto/DisplayAttributeExtensions.cs
+++ b/src/Eto/DisplayAttributeExtensions.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Reflection;
-using System.Linq;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Eto;
 
diff --git a/src/Eto/Drawing/Bitmap.cs b/src/Eto/Drawing/Bitmap.cs
index 877573066b..c54a5db20d 100644
--- a/src/Eto/Drawing/Bitmap.cs
+++ b/src/Eto/Drawing/Bitmap.cs
@@ -1,12 +1,3 @@
-using System;
-using System.Globalization;
-using System.IO;
-using System.Reflection;
-using System.Collections.ObjectModel;
-using System.Collections.Generic;
-using System.Linq;
-using System.Diagnostics;
-using sc = System.ComponentModel;
 using System.Runtime.CompilerServices;
 
 namespace Eto.Drawing;
diff --git a/src/Eto/Drawing/BitmapData.cs b/src/Eto/Drawing/BitmapData.cs
index b629a19bf0..d8a6e624bc 100644
--- a/src/Eto/Drawing/BitmapData.cs
+++ b/src/Eto/Drawing/BitmapData.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Linq;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/Brush.cs b/src/Eto/Drawing/Brush.cs
index fa0dc3cf89..dbcecdf94f 100644
--- a/src/Eto/Drawing/Brush.cs
+++ b/src/Eto/Drawing/Brush.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/Brushes.cs b/src/Eto/Drawing/Brushes.cs
index e9e0123ac1..6ecd5d9c1e 100644
--- a/src/Eto/Drawing/Brushes.cs
+++ b/src/Eto/Drawing/Brushes.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using BrushKey = System.Tuple<System.Int32>;
 
 namespace Eto.Drawing;
diff --git a/src/Eto/Drawing/Color.cs b/src/Eto/Drawing/Color.cs
index 6f19ebef41..ea8e421d80 100644
--- a/src/Eto/Drawing/Color.cs
+++ b/src/Eto/Drawing/Color.cs
@@ -1,10 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.Globalization;
-using System.Linq;
-using System.Collections.Generic;
-using System.Reflection;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/ColorCMYK.cs b/src/Eto/Drawing/ColorCMYK.cs
index 22969952bf..93dd45fd5d 100644
--- a/src/Eto/Drawing/ColorCMYK.cs
+++ b/src/Eto/Drawing/ColorCMYK.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/ColorConverter.cs b/src/Eto/Drawing/ColorConverter.cs
index 8ddf38b2f4..398713deb7 100644
--- a/src/Eto/Drawing/ColorConverter.cs
+++ b/src/Eto/Drawing/ColorConverter.cs
@@ -1,8 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using Eto.Drawing;
-using System.Globalization;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/ColorHSB.cs b/src/Eto/Drawing/ColorHSB.cs
index ff19c1823a..d629449478 100644
--- a/src/Eto/Drawing/ColorHSB.cs
+++ b/src/Eto/Drawing/ColorHSB.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/ColorHSL.cs b/src/Eto/Drawing/ColorHSL.cs
index 169a2d5b84..3ba98241b8 100644
--- a/src/Eto/Drawing/ColorHSL.cs
+++ b/src/Eto/Drawing/ColorHSL.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/DashStyle.cs b/src/Eto/Drawing/DashStyle.cs
index 57fe6fbed1..b0a3236e9e 100644
--- a/src/Eto/Drawing/DashStyle.cs
+++ b/src/Eto/Drawing/DashStyle.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Linq;
-using System.Globalization;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/Font.cs b/src/Eto/Drawing/Font.cs
index 88667b9ace..315d9c07a8 100644
--- a/src/Eto/Drawing/Font.cs
+++ b/src/Eto/Drawing/Font.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Globalization;
-using System.IO;
-using sc = System.ComponentModel;
 
 namespace Eto.Drawing;
 
diff --git a/src/Eto/Drawing/FontConverter.cs b/src/Eto/Drawing/FontConverter.cs
index 8563b16c73..2271522e05 100644
--- a/src/Eto/Drawing/FontConverter.cs
+++ b/src/Eto/Drawing/FontConverter.cs
@@ -1,8 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.IO;
-using System.Linq;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/FontFamily.cs b/src/Eto/Drawing/FontFamily.cs
index 133a18b9fe..28dcb9539e 100755
--- a/src/Eto/Drawing/FontFamily.cs
+++ b/src/Eto/Drawing/FontFamily.cs
@@ -1,8 +1,3 @@
-using Eto.Forms;
-using System;
-using System.Collections.Generic;
-using System.IO;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/FontTypeface.cs b/src/Eto/Drawing/FontTypeface.cs
index 1e05f9a5bc..8e93b34f6d 100755
--- a/src/Eto/Drawing/FontTypeface.cs
+++ b/src/Eto/Drawing/FontTypeface.cs
@@ -1,9 +1,4 @@
 
-using Eto.Forms;
-using System;
-using System.Collections.Generic;
-using System.IO;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/Fonts.cs b/src/Eto/Drawing/Fonts.cs
index bf834e61e4..1b2d5e40bb 100644
--- a/src/Eto/Drawing/Fonts.cs
+++ b/src/Eto/Drawing/Fonts.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using FontCacheKey = System.Tuple<Eto.Drawing.FontFamily, float, Eto.Drawing.FontStyle, Eto.Drawing.FontDecoration>;
 
 namespace Eto.Drawing;
diff --git a/src/Eto/Drawing/FormattedText.cs b/src/Eto/Drawing/FormattedText.cs
index de7e978de6..177ef21cfb 100644
--- a/src/Eto/Drawing/FormattedText.cs
+++ b/src/Eto/Drawing/FormattedText.cs
@@ -1,5 +1,3 @@
-using System.ComponentModel;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/Graphics.cs b/src/Eto/Drawing/Graphics.cs
index 2897cb9953..1374fe47a3 100644
--- a/src/Eto/Drawing/Graphics.cs
+++ b/src/Eto/Drawing/Graphics.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/GraphicsPath.cs b/src/Eto/Drawing/GraphicsPath.cs
index 6a26e2da54..0192373efa 100644
--- a/src/Eto/Drawing/GraphicsPath.cs
+++ b/src/Eto/Drawing/GraphicsPath.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/Icon.cs b/src/Eto/Drawing/Icon.cs
index 68c03da2bd..8099912d05 100644
--- a/src/Eto/Drawing/Icon.cs
+++ b/src/Eto/Drawing/Icon.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Globalization;
-using System.Reflection;
-using System.IO;
-using System.Diagnostics;
-using System.Collections.Generic;
-using System.Linq;
-using sc = System.ComponentModel;
 using System.Runtime.CompilerServices;
 
 namespace Eto.Drawing;
diff --git a/src/Eto/Drawing/IconFrame.cs b/src/Eto/Drawing/IconFrame.cs
index f9a49a38eb..c495a57210 100644
--- a/src/Eto/Drawing/IconFrame.cs
+++ b/src/Eto/Drawing/IconFrame.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Globalization;
-using System.Reflection;
-using System.IO;
-using System.Diagnostics;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
 
 namespace Eto.Drawing;
diff --git a/src/Eto/Drawing/Image.cs b/src/Eto/Drawing/Image.cs
index 19afcd0b7e..905df6be1f 100644
--- a/src/Eto/Drawing/Image.cs
+++ b/src/Eto/Drawing/Image.cs
@@ -1,6 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/ImageConverter.cs b/src/Eto/Drawing/ImageConverter.cs
index 90e4054eb5..f65459b76d 100644
--- a/src/Eto/Drawing/ImageConverter.cs
+++ b/src/Eto/Drawing/ImageConverter.cs
@@ -1,7 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.IO;
-
 namespace Eto.Drawing;
 
 class IconConverter : ImageConverterInternal
diff --git a/src/Eto/Drawing/IndexedBitmap.cs b/src/Eto/Drawing/IndexedBitmap.cs
index d7f1c4776c..f89b01ff53 100644
--- a/src/Eto/Drawing/IndexedBitmap.cs
+++ b/src/Eto/Drawing/IndexedBitmap.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/LinearGradientBrush.cs b/src/Eto/Drawing/LinearGradientBrush.cs
index 4ae36e0566..bd46405ec9 100644
--- a/src/Eto/Drawing/LinearGradientBrush.cs
+++ b/src/Eto/Drawing/LinearGradientBrush.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/Matrix.cs b/src/Eto/Drawing/Matrix.cs
index e439ec45bc..f643980dac 100644
--- a/src/Eto/Drawing/Matrix.cs
+++ b/src/Eto/Drawing/Matrix.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Globalization;
-using System.Linq;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/Padding.cs b/src/Eto/Drawing/Padding.cs
index 64b407d1a7..99adee2320 100644
--- a/src/Eto/Drawing/Padding.cs
+++ b/src/Eto/Drawing/Padding.cs
@@ -1,7 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.Globalization;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/PaddingConverter.cs b/src/Eto/Drawing/PaddingConverter.cs
index 7b4a6829a0..e8500ee1d1 100644
--- a/src/Eto/Drawing/PaddingConverter.cs
+++ b/src/Eto/Drawing/PaddingConverter.cs
@@ -1,7 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.Globalization;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/PaddingF.cs b/src/Eto/Drawing/PaddingF.cs
index 8e9f9b08af..7c80860df6 100644
--- a/src/Eto/Drawing/PaddingF.cs
+++ b/src/Eto/Drawing/PaddingF.cs
@@ -1,7 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.Globalization;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/PaddingFConverter.cs b/src/Eto/Drawing/PaddingFConverter.cs
index bd06a32208..e0a9e2b48e 100644
--- a/src/Eto/Drawing/PaddingFConverter.cs
+++ b/src/Eto/Drawing/PaddingFConverter.cs
@@ -1,7 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.Globalization;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/Palette.cs b/src/Eto/Drawing/Palette.cs
index 8eaf930b19..5b8126053d 100644
--- a/src/Eto/Drawing/Palette.cs
+++ b/src/Eto/Drawing/Palette.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Globalization;
-using System.IO;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/Pen.cs b/src/Eto/Drawing/Pen.cs
index 97475e58e4..70c1bbed59 100644
--- a/src/Eto/Drawing/Pen.cs
+++ b/src/Eto/Drawing/Pen.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/Pens.cs b/src/Eto/Drawing/Pens.cs
index 211d67aeb0..506c393aaa 100644
--- a/src/Eto/Drawing/Pens.cs
+++ b/src/Eto/Drawing/Pens.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using PenKey = System.Tuple<System.Int32, float, Eto.Drawing.DashStyle>;
 
 namespace Eto.Drawing;
diff --git a/src/Eto/Drawing/Point.cs b/src/Eto/Drawing/Point.cs
index aee83cdd0a..3343fbf754 100644
--- a/src/Eto/Drawing/Point.cs
+++ b/src/Eto/Drawing/Point.cs
@@ -1,7 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.Globalization;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/PointConverter.cs b/src/Eto/Drawing/PointConverter.cs
index 2174449794..5df94da96b 100644
--- a/src/Eto/Drawing/PointConverter.cs
+++ b/src/Eto/Drawing/PointConverter.cs
@@ -1,7 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.Globalization;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/PointF.cs b/src/Eto/Drawing/PointF.cs
index 4b9b6d0daa..6e877dad43 100644
--- a/src/Eto/Drawing/PointF.cs
+++ b/src/Eto/Drawing/PointF.cs
@@ -1,7 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.Globalization;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/PointFConverter.cs b/src/Eto/Drawing/PointFConverter.cs
index 6d069886e2..683f6ceb68 100644
--- a/src/Eto/Drawing/PointFConverter.cs
+++ b/src/Eto/Drawing/PointFConverter.cs
@@ -1,7 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.Globalization;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/RadialGradientBrush.cs b/src/Eto/Drawing/RadialGradientBrush.cs
index 3ab490c2fe..a4c5b7e440 100644
--- a/src/Eto/Drawing/RadialGradientBrush.cs
+++ b/src/Eto/Drawing/RadialGradientBrush.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/Rectangle.cs b/src/Eto/Drawing/Rectangle.cs
index c42c86b254..edc106f9f6 100644
--- a/src/Eto/Drawing/Rectangle.cs
+++ b/src/Eto/Drawing/Rectangle.cs
@@ -1,7 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.Globalization;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/RectangleConverter.cs b/src/Eto/Drawing/RectangleConverter.cs
index 897543b312..154e458c99 100644
--- a/src/Eto/Drawing/RectangleConverter.cs
+++ b/src/Eto/Drawing/RectangleConverter.cs
@@ -1,7 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.Globalization;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/RectangleF.cs b/src/Eto/Drawing/RectangleF.cs
index ed44cc8f22..29e994d70d 100644
--- a/src/Eto/Drawing/RectangleF.cs
+++ b/src/Eto/Drawing/RectangleF.cs
@@ -1,7 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.Globalization;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/RectangleFConverter.cs b/src/Eto/Drawing/RectangleFConverter.cs
index a1e6622aeb..e32009ff7e 100644
--- a/src/Eto/Drawing/RectangleFConverter.cs
+++ b/src/Eto/Drawing/RectangleFConverter.cs
@@ -1,7 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.Globalization;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/Region.cs b/src/Eto/Drawing/Region.cs
index bbb7def97c..1f73f5e585 100644
--- a/src/Eto/Drawing/Region.cs
+++ b/src/Eto/Drawing/Region.cs
@@ -1,6 +1,3 @@
-using System;
-
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/Size.cs b/src/Eto/Drawing/Size.cs
index 0f07e97d79..8a8325f08f 100644
--- a/src/Eto/Drawing/Size.cs
+++ b/src/Eto/Drawing/Size.cs
@@ -1,7 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.Globalization;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/SizeConverter.cs b/src/Eto/Drawing/SizeConverter.cs
index 6bc1c2c290..c7bb9de45e 100644
--- a/src/Eto/Drawing/SizeConverter.cs
+++ b/src/Eto/Drawing/SizeConverter.cs
@@ -1,7 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.Globalization;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/SizeF.cs b/src/Eto/Drawing/SizeF.cs
index fa548dffea..fa63380911 100644
--- a/src/Eto/Drawing/SizeF.cs
+++ b/src/Eto/Drawing/SizeF.cs
@@ -1,7 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.Globalization;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/SizeFConverter.cs b/src/Eto/Drawing/SizeFConverter.cs
index 0b3b07d065..fb72b9e098 100644
--- a/src/Eto/Drawing/SizeFConverter.cs
+++ b/src/Eto/Drawing/SizeFConverter.cs
@@ -1,7 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.Globalization;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/SolidBrush.cs b/src/Eto/Drawing/SolidBrush.cs
index db6d65c929..c3b77138e7 100644
--- a/src/Eto/Drawing/SolidBrush.cs
+++ b/src/Eto/Drawing/SolidBrush.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Drawing/SystemFonts.cs b/src/Eto/Drawing/SystemFonts.cs
index c9569a841b..493f2e68ee 100644
--- a/src/Eto/Drawing/SystemFonts.cs
+++ b/src/Eto/Drawing/SystemFonts.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using FontCacheKey = System.Tuple<Eto.Drawing.SystemFont, float?, Eto.Drawing.FontDecoration>;
 
 namespace Eto.Drawing;
diff --git a/src/Eto/Drawing/TextureBrush.cs b/src/Eto/Drawing/TextureBrush.cs
index b169dc36fd..c106f41c03 100644
--- a/src/Eto/Drawing/TextureBrush.cs
+++ b/src/Eto/Drawing/TextureBrush.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Drawing;
 
 /// <summary>
diff --git a/src/Eto/Eto.csproj b/src/Eto/Eto.csproj
index 071b308770..76b2c4aa93 100644
--- a/src/Eto/Eto.csproj
+++ b/src/Eto/Eto.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
-    <LangVersion>10</LangVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <TreatWarningsAsErrors Condition="$(Configuration) == 'Release'">true</TreatWarningsAsErrors>
   </PropertyGroup>
diff --git a/src/Eto/EtoEnvironment.cs b/src/Eto/EtoEnvironment.cs
index dfbf4089ca..4ac901578b 100644
--- a/src/Eto/EtoEnvironment.cs
+++ b/src/Eto/EtoEnvironment.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto;
 
 /// <summary>
diff --git a/src/Eto/EtoMemberIdentifier.cs b/src/Eto/EtoMemberIdentifier.cs
index 1513965b67..ba4a0f3079 100644
--- a/src/Eto/EtoMemberIdentifier.cs
+++ b/src/Eto/EtoMemberIdentifier.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto;
 
 /// <summary>
diff --git a/src/Eto/EventLookup.cs b/src/Eto/EventLookup.cs
index 1a05de4f76..78eca9b5e7 100644
--- a/src/Eto/EventLookup.cs
+++ b/src/Eto/EventLookup.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Linq;
-using System.Linq.Expressions;
-
 namespace Eto;
 
 static class EventLookup
diff --git a/src/Eto/ExportHandlerAttribute.cs b/src/Eto/ExportHandlerAttribute.cs
index 85df6b4476..a33d80c7d8 100644
--- a/src/Eto/ExportHandlerAttribute.cs
+++ b/src/Eto/ExportHandlerAttribute.cs
@@ -1,4 +1,3 @@
-using System;
 namespace Eto;
 
 /// <summary>
diff --git a/src/Eto/ExtendedObservableCollection.cs b/src/Eto/ExtendedObservableCollection.cs
index 4f984f3489..a809e841c4 100644
--- a/src/Eto/ExtendedObservableCollection.cs
+++ b/src/Eto/ExtendedObservableCollection.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Collections;
-
 namespace Eto;
 
 /// <summary>
diff --git a/src/Eto/FileAction.cs b/src/Eto/FileAction.cs
index 2dfc721f3e..57be7d22be 100644
--- a/src/Eto/FileAction.cs
+++ b/src/Eto/FileAction.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Eto;
+namespace Eto;
 
 /// <summary>
 /// File action.
diff --git a/src/Eto/Forms/AboutDialog.cs b/src/Eto/Forms/AboutDialog.cs
index fbaf14a0a4..99795ff598 100644
--- a/src/Eto/Forms/AboutDialog.cs
+++ b/src/Eto/Forms/AboutDialog.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using Eto.Drawing;
-
+using System.Runtime.CompilerServices;
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Application.cs b/src/Eto/Forms/Application.cs
index 3eb76b0a0f..4da10784ab 100644
--- a/src/Eto/Forms/Application.cs
+++ b/src/Eto/Forms/Application.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Binding/BindableBinding.cs b/src/Eto/Forms/Binding/BindableBinding.cs
index 6b0d25c32d..2503e7f411 100644
--- a/src/Eto/Forms/Binding/BindableBinding.cs
+++ b/src/Eto/Forms/Binding/BindableBinding.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Forms;
-using System.Linq.Expressions;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// Binding object to easily bind a property of a <see cref="IBindable"/> object, such as a <see cref="Eto.Forms.Control"/>.
diff --git a/src/Eto/Forms/Binding/BindableExtensions.cs b/src/Eto/Forms/Binding/BindableExtensions.cs
index 833efa2bd4..ebe0e72a79 100644
--- a/src/Eto/Forms/Binding/BindableExtensions.cs
+++ b/src/Eto/Forms/Binding/BindableExtensions.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Linq.Expressions;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Binding/BindableWidget.cs b/src/Eto/Forms/Binding/BindableWidget.cs
index 40c3840614..5abad73682 100644
--- a/src/Eto/Forms/Binding/BindableWidget.cs
+++ b/src/Eto/Forms/Binding/BindableWidget.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Binding/Binding.cs b/src/Eto/Forms/Binding/Binding.cs
index 238bd21ce9..97c3875c5b 100644
--- a/src/Eto/Forms/Binding/Binding.cs
+++ b/src/Eto/Forms/Binding/Binding.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Globalization;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Binding/Binding.helpers.cs b/src/Eto/Forms/Binding/Binding.helpers.cs
index 8899919682..8e97b25387 100644
--- a/src/Eto/Forms/Binding/Binding.helpers.cs
+++ b/src/Eto/Forms/Binding/Binding.helpers.cs
@@ -1,14 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Globalization;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using Eto.Forms;
-using System.Windows.Input;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 partial class Binding
 {
diff --git a/src/Eto/Forms/Binding/BindingChangedEventArgs.cs b/src/Eto/Forms/Binding/BindingChangedEventArgs.cs
index fd2f10195d..527ecd5654 100644
--- a/src/Eto/Forms/Binding/BindingChangedEventArgs.cs
+++ b/src/Eto/Forms/Binding/BindingChangedEventArgs.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Binding/BindingChangingEventArgs.cs b/src/Eto/Forms/Binding/BindingChangingEventArgs.cs
index 2fb056828d..288fb1ef37 100644
--- a/src/Eto/Forms/Binding/BindingChangingEventArgs.cs
+++ b/src/Eto/Forms/Binding/BindingChangingEventArgs.cs
@@ -1,5 +1,3 @@
-using System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Binding/BindingCollection.cs b/src/Eto/Forms/Binding/BindingCollection.cs
index 89832971d1..2140701382 100644
--- a/src/Eto/Forms/Binding/BindingCollection.cs
+++ b/src/Eto/Forms/Binding/BindingCollection.cs
@@ -1,5 +1,3 @@
-using System.Collections.ObjectModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Binding/BindingExtensionsNonGeneric.cs b/src/Eto/Forms/Binding/BindingExtensionsNonGeneric.cs
index 46679e4e2f..d97b9bfea1 100644
--- a/src/Eto/Forms/Binding/BindingExtensionsNonGeneric.cs
+++ b/src/Eto/Forms/Binding/BindingExtensionsNonGeneric.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Linq;
-using System.Reflection;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Binding/ColumnBinding.cs b/src/Eto/Forms/Binding/ColumnBinding.cs
index 2c7c8ad70c..490552f6da 100644
--- a/src/Eto/Forms/Binding/ColumnBinding.cs
+++ b/src/Eto/Forms/Binding/ColumnBinding.cs
@@ -1,8 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
-using System;
-using System.Globalization;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Binding/DelegateBinding.cs b/src/Eto/Forms/Binding/DelegateBinding.cs
index 724cc66977..def809f6c3 100644
--- a/src/Eto/Forms/Binding/DelegateBinding.cs
+++ b/src/Eto/Forms/Binding/DelegateBinding.cs
@@ -1,10 +1,3 @@
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Linq.Expressions;
-using Eto.Forms;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Binding/DirectBinding.cs b/src/Eto/Forms/Binding/DirectBinding.cs
index e91fd1af17..5c92ff1caa 100644
--- a/src/Eto/Forms/Binding/DirectBinding.cs
+++ b/src/Eto/Forms/Binding/DirectBinding.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Linq.Expressions;
-using System.Reflection;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// Abstraction to get/set values from a provided object
diff --git a/src/Eto/Forms/Binding/DualBinding.cs b/src/Eto/Forms/Binding/DualBinding.cs
index fe0af63377..7d6625cb31 100644
--- a/src/Eto/Forms/Binding/DualBinding.cs
+++ b/src/Eto/Forms/Binding/DualBinding.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Binding/IBindable.cs b/src/Eto/Forms/Binding/IBindable.cs
index 8b9abfdc6b..2ad6ce57e7 100644
--- a/src/Eto/Forms/Binding/IBindable.cs
+++ b/src/Eto/Forms/Binding/IBindable.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// Interface for objects that support binding
diff --git a/src/Eto/Forms/Binding/ICommand.cs b/src/Eto/Forms/Binding/ICommand.cs
index 08e4b4d3e0..f739cdbb29 100644
--- a/src/Eto/Forms/Binding/ICommand.cs
+++ b/src/Eto/Forms/Binding/ICommand.cs
@@ -1,6 +1,4 @@
 #if !NETSTANDARD && !NETCOREAPP
-using System;
-
 namespace System.Windows.Input
 {
 }
diff --git a/src/Eto/Forms/Binding/IValueConverter.cs b/src/Eto/Forms/Binding/IValueConverter.cs
index 45a9d6f9d1..580b5cd79d 100644
--- a/src/Eto/Forms/Binding/IValueConverter.cs
+++ b/src/Eto/Forms/Binding/IValueConverter.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Globalization;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// Interface for providing a reusable converter for binding values
diff --git a/src/Eto/Forms/Binding/IndirectBinding.cs b/src/Eto/Forms/Binding/IndirectBinding.cs
index bb06995bf7..0d92836c57 100644
--- a/src/Eto/Forms/Binding/IndirectBinding.cs
+++ b/src/Eto/Forms/Binding/IndirectBinding.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq.Expressions;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// Base interface for an indirect binding.
diff --git a/src/Eto/Forms/Binding/IndirectChildBinding.cs b/src/Eto/Forms/Binding/IndirectChildBinding.cs
index e9e63183e2..1d8bb298f0 100644
--- a/src/Eto/Forms/Binding/IndirectChildBinding.cs
+++ b/src/Eto/Forms/Binding/IndirectChildBinding.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Reflection;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// An indirect binding class to provide a way to bind to a child object of a value.
diff --git a/src/Eto/Forms/Binding/ObjectBinding.cs b/src/Eto/Forms/Binding/ObjectBinding.cs
index 5982c7e9d2..2c7b72591f 100755
--- a/src/Eto/Forms/Binding/ObjectBinding.cs
+++ b/src/Eto/Forms/Binding/ObjectBinding.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Linq.Expressions;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Binding/PropertyBinding.cs b/src/Eto/Forms/Binding/PropertyBinding.cs
index e617b6a74f..0691649407 100644
--- a/src/Eto/Forms/Binding/PropertyBinding.cs
+++ b/src/Eto/Forms/Binding/PropertyBinding.cs
@@ -1,11 +1,3 @@
-using System;
-using System.ComponentModel;
-using System.Globalization;
-using System.Reflection;
-using System.Linq;
-using System.Diagnostics;
-using sc = System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Binding/PropertyNotifyHelper.cs b/src/Eto/Forms/Binding/PropertyNotifyHelper.cs
index f716a10683..aa49c2b719 100644
--- a/src/Eto/Forms/Binding/PropertyNotifyHelper.cs
+++ b/src/Eto/Forms/Binding/PropertyNotifyHelper.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Diagnostics;
-using Eto.Forms;
-using System.ComponentModel;
-using System.Linq.Expressions;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/BindingExtensions.cs b/src/Eto/Forms/BindingExtensions.cs
index dc1c0b821a..e97a276b10 100644
--- a/src/Eto/Forms/BindingExtensions.cs
+++ b/src/Eto/Forms/BindingExtensions.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Linq.Expressions;
-using Eto.Forms;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Cells/Cell.cs b/src/Eto/Forms/Cells/Cell.cs
index 914c8553d5..988c22a712 100644
--- a/src/Eto/Forms/Cells/Cell.cs
+++ b/src/Eto/Forms/Cells/Cell.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Cells/CheckBoxCell.cs b/src/Eto/Forms/Cells/CheckBoxCell.cs
index f86926d013..70fcbe322f 100644
--- a/src/Eto/Forms/Cells/CheckBoxCell.cs
+++ b/src/Eto/Forms/Cells/CheckBoxCell.cs
@@ -1,6 +1,3 @@
-using System;
-
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Cells/ComboBoxCell.cs b/src/Eto/Forms/Cells/ComboBoxCell.cs
index f80ee62792..a69ca8f8a4 100644
--- a/src/Eto/Forms/Cells/ComboBoxCell.cs
+++ b/src/Eto/Forms/Cells/ComboBoxCell.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Collections;
-
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Cells/CustomCell.cs b/src/Eto/Forms/Cells/CustomCell.cs
index 6ce8b0286e..26ae7ff094 100755
--- a/src/Eto/Forms/Cells/CustomCell.cs
+++ b/src/Eto/Forms/Cells/CustomCell.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Cells/DrawableCell.cs b/src/Eto/Forms/Cells/DrawableCell.cs
index 2703c5dd3a..f3fe1ae7d1 100644
--- a/src/Eto/Forms/Cells/DrawableCell.cs
+++ b/src/Eto/Forms/Cells/DrawableCell.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Cells/ImageTextCell.cs b/src/Eto/Forms/Cells/ImageTextCell.cs
index a43f190d47..4c2bbb9bb2 100644
--- a/src/Eto/Forms/Cells/ImageTextCell.cs
+++ b/src/Eto/Forms/Cells/ImageTextCell.cs
@@ -1,9 +1,4 @@
-using System;
-using System.ComponentModel;
-using Eto.Drawing;
-
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// Cell for <see cref="Grid"/> controls to show image and text in one cell.
diff --git a/src/Eto/Forms/Cells/ImageViewCell.cs b/src/Eto/Forms/Cells/ImageViewCell.cs
index 76b41f7a43..a770270447 100644
--- a/src/Eto/Forms/Cells/ImageViewCell.cs
+++ b/src/Eto/Forms/Cells/ImageViewCell.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Cells/ProgressCell.cs b/src/Eto/Forms/Cells/ProgressCell.cs
index 2d5a2fcccd..929ca433ec 100644
--- a/src/Eto/Forms/Cells/ProgressCell.cs
+++ b/src/Eto/Forms/Cells/ProgressCell.cs
@@ -1,6 +1,4 @@
-using Eto.Forms;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// Cell for <see cref="Grid"/> controls to show and bind a int value to a progress bar.
diff --git a/src/Eto/Forms/Cells/PropertyCell.cs b/src/Eto/Forms/Cells/PropertyCell.cs
index 24538f35be..2e67cd4368 100644
--- a/src/Eto/Forms/Cells/PropertyCell.cs
+++ b/src/Eto/Forms/Cells/PropertyCell.cs
@@ -1,11 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Linq;
-using System.ComponentModel;
-using System.Windows.Input;
-using System.Reflection;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Cells/SingleValueCell.cs b/src/Eto/Forms/Cells/SingleValueCell.cs
index 7883168293..72eecbec67 100644
--- a/src/Eto/Forms/Cells/SingleValueCell.cs
+++ b/src/Eto/Forms/Cells/SingleValueCell.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Cells/TextBoxCell.cs b/src/Eto/Forms/Cells/TextBoxCell.cs
index 21089365c2..53f0c810e6 100644
--- a/src/Eto/Forms/Cells/TextBoxCell.cs
+++ b/src/Eto/Forms/Cells/TextBoxCell.cs
@@ -1,7 +1,4 @@
-using System;
-using System.ComponentModel;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// Cell for a text box in a <see cref="Grid"/>.
diff --git a/src/Eto/Forms/Clipboard.cs b/src/Eto/Forms/Clipboard.cs
index a1890b4444..8d9dcffe09 100644
--- a/src/Eto/Forms/Clipboard.cs
+++ b/src/Eto/Forms/Clipboard.cs
@@ -1,11 +1,5 @@
-using System;
 using Eto;
-using Eto.Drawing;
-using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
-using System.Diagnostics;
-using System.Reflection;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/ColorDialog.cs b/src/Eto/Forms/ColorDialog.cs
index 7a5dabe812..a14af13bc1 100644
--- a/src/Eto/Forms/ColorDialog.cs
+++ b/src/Eto/Forms/ColorDialog.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Command.cs b/src/Eto/Forms/Command.cs
index caf1d0a141..85610b2971 100644
--- a/src/Eto/Forms/Command.cs
+++ b/src/Eto/Forms/Command.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Globalization;
-using System.Windows.Input;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/CommonDialog.cs b/src/Eto/Forms/CommonDialog.cs
index 50f48a3c32..3e1a2a72c7 100644
--- a/src/Eto/Forms/CommonDialog.cs
+++ b/src/Eto/Forms/CommonDialog.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Container.cs b/src/Eto/Forms/Container.cs
index c4053077dd..366881ce23 100644
--- a/src/Eto/Forms/Container.cs
+++ b/src/Eto/Forms/Container.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/ControlBinding.cs b/src/Eto/Forms/ControlBinding.cs
index ac7fed3a4b..78a773afe8 100644
--- a/src/Eto/Forms/ControlBinding.cs
+++ b/src/Eto/Forms/ControlBinding.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Linq.Expressions;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/ControlConverter.cs b/src/Eto/Forms/ControlConverter.cs
index 43aa3ddd8f..1c8ca28075 100644
--- a/src/Eto/Forms/ControlConverter.cs
+++ b/src/Eto/Forms/ControlConverter.cs
@@ -1,7 +1,4 @@
-using System;
-using sc = System.ComponentModel;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 class ControlConverter : sc.TypeConverter
 {
diff --git a/src/Eto/Forms/Controls/Button.cs b/src/Eto/Forms/Controls/Button.cs
index c76ff42811..9dd44c4cb5 100644
--- a/src/Eto/Forms/Controls/Button.cs
+++ b/src/Eto/Forms/Controls/Button.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Windows.Input;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/Calendar.cs b/src/Eto/Forms/Controls/Calendar.cs
index 5ed3e98107..2afcd31728 100644
--- a/src/Eto/Forms/Controls/Calendar.cs
+++ b/src/Eto/Forms/Controls/Calendar.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// Possible modes for the <see cref="Calendar"/> control.
diff --git a/src/Eto/Forms/Controls/CheckBox.cs b/src/Eto/Forms/Controls/CheckBox.cs
index 2251432e06..c4d4b28fa5 100644
--- a/src/Eto/Forms/Controls/CheckBox.cs
+++ b/src/Eto/Forms/Controls/CheckBox.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/CheckBoxList.cs b/src/Eto/Forms/Controls/CheckBoxList.cs
index 35c008cd43..bc4bad817c 100644
--- a/src/Eto/Forms/Controls/CheckBoxList.cs
+++ b/src/Eto/Forms/Controls/CheckBoxList.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/CollectionEditor.cs b/src/Eto/Forms/Controls/CollectionEditor.cs
index d355df668e..f0c466f230 100644
--- a/src/Eto/Forms/Controls/CollectionEditor.cs
+++ b/src/Eto/Forms/Controls/CollectionEditor.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/ColorPicker.cs b/src/Eto/Forms/Controls/ColorPicker.cs
index 231788f918..eba4263371 100644
--- a/src/Eto/Forms/Controls/ColorPicker.cs
+++ b/src/Eto/Forms/Controls/ColorPicker.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/ComboBox.cs b/src/Eto/Forms/Controls/ComboBox.cs
index 673705cc09..93b2a6bb56 100644
--- a/src/Eto/Forms/Controls/ComboBox.cs
+++ b/src/Eto/Forms/Controls/ComboBox.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// Presents a combination of an editable text box and drop down to select from a list of items and enter text.
diff --git a/src/Eto/Forms/Controls/CommonControl.cs b/src/Eto/Forms/Controls/CommonControl.cs
index b2227565e4..8870781a4a 100644
--- a/src/Eto/Forms/Controls/CommonControl.cs
+++ b/src/Eto/Forms/Controls/CommonControl.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/Control.cs b/src/Eto/Forms/Controls/Control.cs
index ff35c8d7fb..7318db361a 100755
--- a/src/Eto/Forms/Controls/Control.cs
+++ b/src/Eto/Forms/Controls/Control.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using sc = System.ComponentModel;
-using System.Globalization;
-using Eto.Drawing;
-using System.Linq;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/DataStoreExtensions.cs b/src/Eto/Forms/Controls/DataStoreExtensions.cs
index 1e173ab7ab..7643d7a34c 100644
--- a/src/Eto/Forms/Controls/DataStoreExtensions.cs
+++ b/src/Eto/Forms/Controls/DataStoreExtensions.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/DateTimePicker.cs b/src/Eto/Forms/Controls/DateTimePicker.cs
index fc2c2ab078..b5c9a99ea5 100644
--- a/src/Eto/Forms/Controls/DateTimePicker.cs
+++ b/src/Eto/Forms/Controls/DateTimePicker.cs
@@ -1,7 +1,3 @@
-using System;
-using System.ComponentModel;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/DocumentControl.cs b/src/Eto/Forms/Controls/DocumentControl.cs
index 6abf85f45e..53de8f677c 100644
--- a/src/Eto/Forms/Controls/DocumentControl.cs
+++ b/src/Eto/Forms/Controls/DocumentControl.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Collections.ObjectModel;
-using System.Collections;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// Arguments for the <see cref="DocumentControl"/> to get the current page.
diff --git a/src/Eto/Forms/Controls/DocumentPage.cs b/src/Eto/Forms/Controls/DocumentPage.cs
index ef1b29dcdc..b2699d228e 100644
--- a/src/Eto/Forms/Controls/DocumentPage.cs
+++ b/src/Eto/Forms/Controls/DocumentPage.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Drawing;
-using System.Collections.ObjectModel;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// Control for a page in a <see cref="DocumentControl"/>
diff --git a/src/Eto/Forms/Controls/DragEventArgs.cs b/src/Eto/Forms/Controls/DragEventArgs.cs
index 12d43db417..226666c5fe 100644
--- a/src/Eto/Forms/Controls/DragEventArgs.cs
+++ b/src/Eto/Forms/Controls/DragEventArgs.cs
@@ -1,7 +1,3 @@
-using Eto.Drawing;
-using System;
-using System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/Drawable.cs b/src/Eto/Forms/Controls/Drawable.cs
index 86205125f7..8ec0522f01 100644
--- a/src/Eto/Forms/Controls/Drawable.cs
+++ b/src/Eto/Forms/Controls/Drawable.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/DropDown.cs b/src/Eto/Forms/Controls/DropDown.cs
index 9b81d4b056..e68afeaa9d 100755
--- a/src/Eto/Forms/Controls/DropDown.cs
+++ b/src/Eto/Forms/Controls/DropDown.cs
@@ -1,7 +1,3 @@
-using System;
-using System.ComponentModel;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/EnumCheckBoxList.cs b/src/Eto/Forms/Controls/EnumCheckBoxList.cs
index 1ba1ac62f0..591c0cb40f 100644
--- a/src/Eto/Forms/Controls/EnumCheckBoxList.cs
+++ b/src/Eto/Forms/Controls/EnumCheckBoxList.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/EnumDropDown.cs b/src/Eto/Forms/Controls/EnumDropDown.cs
index c6829b8cf6..1d129f71e6 100644
--- a/src/Eto/Forms/Controls/EnumDropDown.cs
+++ b/src/Eto/Forms/Controls/EnumDropDown.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Globalization;
-using System.Collections.Generic;
-using System.Reflection;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/EnumRadioButtonList.cs b/src/Eto/Forms/Controls/EnumRadioButtonList.cs
index a03dffff30..e41c15fba1 100644
--- a/src/Eto/Forms/Controls/EnumRadioButtonList.cs
+++ b/src/Eto/Forms/Controls/EnumRadioButtonList.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Globalization;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/Expander.cs b/src/Eto/Forms/Controls/Expander.cs
index a14c4b6881..3694fba82b 100644
--- a/src/Eto/Forms/Controls/Expander.cs
+++ b/src/Eto/Forms/Controls/Expander.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Linq;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// A control with a panel that can be expanded or collapsed with a header and button.
diff --git a/src/Eto/Forms/Controls/FilePicker.cs b/src/Eto/Forms/Controls/FilePicker.cs
index fbeb51fa1b..5a94485503 100644
--- a/src/Eto/Forms/Controls/FilePicker.cs
+++ b/src/Eto/Forms/Controls/FilePicker.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.ObjectModel;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// Control for picking a file or folder.
diff --git a/src/Eto/Forms/Controls/FontPicker.cs b/src/Eto/Forms/Controls/FontPicker.cs
index 4e51769335..fe1da62e00 100644
--- a/src/Eto/Forms/Controls/FontPicker.cs
+++ b/src/Eto/Forms/Controls/FontPicker.cs
@@ -1,7 +1,4 @@
-using System;
-using Eto.Drawing;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// Control to show and pick a font.
diff --git a/src/Eto/Forms/Controls/Grid.cs b/src/Eto/Forms/Controls/Grid.cs
index a49c9ca4e3..333275fa7c 100644
--- a/src/Eto/Forms/Controls/Grid.cs
+++ b/src/Eto/Forms/Controls/Grid.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/GridColumn.cs b/src/Eto/Forms/Controls/GridColumn.cs
index db7381bf4b..bb1f2f0ff5 100644
--- a/src/Eto/Forms/Controls/GridColumn.cs
+++ b/src/Eto/Forms/Controls/GridColumn.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/GridItem.cs b/src/Eto/Forms/Controls/GridItem.cs
index f2126d6a30..c73942c706 100644
--- a/src/Eto/Forms/Controls/GridItem.cs
+++ b/src/Eto/Forms/Controls/GridItem.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/GridView.cs b/src/Eto/Forms/Controls/GridView.cs
index 4e87ed6412..6a430b5dde 100644
--- a/src/Eto/Forms/Controls/GridView.cs
+++ b/src/Eto/Forms/Controls/GridView.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Collections;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/GroupBox.cs b/src/Eto/Forms/Controls/GroupBox.cs
index 522d7e6a24..1d50f3852d 100644
--- a/src/Eto/Forms/Controls/GroupBox.cs
+++ b/src/Eto/Forms/Controls/GroupBox.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/ImageView.cs b/src/Eto/Forms/Controls/ImageView.cs
index 10a6111a17..fd91271843 100644
--- a/src/Eto/Forms/Controls/ImageView.cs
+++ b/src/Eto/Forms/Controls/ImageView.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/KeyEventArgs.cs b/src/Eto/Forms/Controls/KeyEventArgs.cs
index 0287360637..4a08e297d0 100644
--- a/src/Eto/Forms/Controls/KeyEventArgs.cs
+++ b/src/Eto/Forms/Controls/KeyEventArgs.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/Label.cs b/src/Eto/Forms/Controls/Label.cs
index 1fdbadc848..70928f1941 100644
--- a/src/Eto/Forms/Controls/Label.cs
+++ b/src/Eto/Forms/Controls/Label.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/LinkButton.cs b/src/Eto/Forms/Controls/LinkButton.cs
index 2e404173f2..ab5de1d374 100644
--- a/src/Eto/Forms/Controls/LinkButton.cs
+++ b/src/Eto/Forms/Controls/LinkButton.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Windows.Input;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/ListBox.cs b/src/Eto/Forms/Controls/ListBox.cs
index 4f1681700f..86983e16e6 100644
--- a/src/Eto/Forms/Controls/ListBox.cs
+++ b/src/Eto/Forms/Controls/ListBox.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/ListControl.cs b/src/Eto/Forms/Controls/ListControl.cs
index 788b65ab9b..90404433ee 100644
--- a/src/Eto/Forms/Controls/ListControl.cs
+++ b/src/Eto/Forms/Controls/ListControl.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Linq;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using Eto.Drawing;
-using System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/MaskedTextBox.cs b/src/Eto/Forms/Controls/MaskedTextBox.cs
index 2cd843c6f0..22be8e3008 100755
--- a/src/Eto/Forms/Controls/MaskedTextBox.cs
+++ b/src/Eto/Forms/Controls/MaskedTextBox.cs
@@ -1,12 +1,3 @@
-using System;
-using System.Text;
-using System.Linq;
-using System.Globalization;
-using System.ComponentModel;
-using System.Collections.Generic;
-using System.Reflection;
-
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/MaskedTextStepper.cs b/src/Eto/Forms/Controls/MaskedTextStepper.cs
index b070adde7e..19f2aaf44e 100755
--- a/src/Eto/Forms/Controls/MaskedTextStepper.cs
+++ b/src/Eto/Forms/Controls/MaskedTextStepper.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Linq;
-using System.ComponentModel;
-using System.Globalization;
-using System.Text;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/MouseEventArgs.cs b/src/Eto/Forms/Controls/MouseEventArgs.cs
index 9a37242d6d..9871f7c300 100644
--- a/src/Eto/Forms/Controls/MouseEventArgs.cs
+++ b/src/Eto/Forms/Controls/MouseEventArgs.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/Navigation.cs b/src/Eto/Forms/Controls/Navigation.cs
index a7efb7d985..86df83af35 100644
--- a/src/Eto/Forms/Controls/Navigation.cs
+++ b/src/Eto/Forms/Controls/Navigation.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/NumericStepper.cs b/src/Eto/Forms/Controls/NumericStepper.cs
index 741c736d99..6a5fb7b068 100644
--- a/src/Eto/Forms/Controls/NumericStepper.cs
+++ b/src/Eto/Forms/Controls/NumericStepper.cs
@@ -1,9 +1,4 @@
-using System;
-using System.ComponentModel;
-using Eto.Drawing;
-using System.Globalization;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// Control for the user to enter a numeric value (obsolete, use NumericStepper instead)
diff --git a/src/Eto/Forms/Controls/Panel.cs b/src/Eto/Forms/Controls/Panel.cs
index 4653c7332e..ab4aae2ae7 100644
--- a/src/Eto/Forms/Controls/Panel.cs
+++ b/src/Eto/Forms/Controls/Panel.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/PasswordBox.cs b/src/Eto/Forms/Controls/PasswordBox.cs
index c982113bad..9f5472f418 100644
--- a/src/Eto/Forms/Controls/PasswordBox.cs
+++ b/src/Eto/Forms/Controls/PasswordBox.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/ProgressBar.cs b/src/Eto/Forms/Controls/ProgressBar.cs
index b9f5c8e6d4..61422cfcc7 100644
--- a/src/Eto/Forms/Controls/ProgressBar.cs
+++ b/src/Eto/Forms/Controls/ProgressBar.cs
@@ -1,6 +1,3 @@
-using System;
-using System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/PropertyGrid.cs b/src/Eto/Forms/Controls/PropertyGrid.cs
index c6680881d3..7c54af23d9 100644
--- a/src/Eto/Forms/Controls/PropertyGrid.cs
+++ b/src/Eto/Forms/Controls/PropertyGrid.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/RadioButton.cs b/src/Eto/Forms/Controls/RadioButton.cs
index 8ccbd7e0dd..f965fb5126 100644
--- a/src/Eto/Forms/Controls/RadioButton.cs
+++ b/src/Eto/Forms/Controls/RadioButton.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Windows.Input;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/RadioButtonList.cs b/src/Eto/Forms/Controls/RadioButtonList.cs
index 6e1d989de7..06f0a6ebfe 100644
--- a/src/Eto/Forms/Controls/RadioButtonList.cs
+++ b/src/Eto/Forms/Controls/RadioButtonList.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Eto.Drawing;
-using System.Collections;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/RichTextArea.cs b/src/Eto/Forms/Controls/RichTextArea.cs
index bb1289af25..50b708cfd4 100644
--- a/src/Eto/Forms/Controls/RichTextArea.cs
+++ b/src/Eto/Forms/Controls/RichTextArea.cs
@@ -1,9 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.IO;
-using System.Collections.Generic;
-using System.Text;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/Scrollable.cs b/src/Eto/Forms/Controls/Scrollable.cs
index d4646e503d..e8dba535bd 100644
--- a/src/Eto/Forms/Controls/Scrollable.cs
+++ b/src/Eto/Forms/Controls/Scrollable.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/SearchBox.cs b/src/Eto/Forms/Controls/SearchBox.cs
index 85d78c4bbe..1b32295c49 100644
--- a/src/Eto/Forms/Controls/SearchBox.cs
+++ b/src/Eto/Forms/Controls/SearchBox.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/Slider.cs b/src/Eto/Forms/Controls/Slider.cs
index 4c833bb621..71aa37adcf 100644
--- a/src/Eto/Forms/Controls/Slider.cs
+++ b/src/Eto/Forms/Controls/Slider.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/Spinner.cs b/src/Eto/Forms/Controls/Spinner.cs
index 22feb9489c..d4c34d0549 100644
--- a/src/Eto/Forms/Controls/Spinner.cs
+++ b/src/Eto/Forms/Controls/Spinner.cs
@@ -1,6 +1,3 @@
-using System;
-using System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/Splitter.cs b/src/Eto/Forms/Controls/Splitter.cs
index 37d3c241ff..c68f0cd58e 100644
--- a/src/Eto/Forms/Controls/Splitter.cs
+++ b/src/Eto/Forms/Controls/Splitter.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/Stepper.cs b/src/Eto/Forms/Controls/Stepper.cs
index cb8655bfb4..0d33ef9037 100644
--- a/src/Eto/Forms/Controls/Stepper.cs
+++ b/src/Eto/Forms/Controls/Stepper.cs
@@ -1,8 +1,4 @@
-using System;
-using System.ComponentModel;
-
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// Direction of the stepper when it has been clicked
diff --git a/src/Eto/Forms/Controls/TabControl.cs b/src/Eto/Forms/Controls/TabControl.cs
index 96f561199c..e7d5cea957 100644
--- a/src/Eto/Forms/Controls/TabControl.cs
+++ b/src/Eto/Forms/Controls/TabControl.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Collections.ObjectModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/TabPage.cs b/src/Eto/Forms/Controls/TabPage.cs
index 0b27cba22b..37362389c2 100644
--- a/src/Eto/Forms/Controls/TabPage.cs
+++ b/src/Eto/Forms/Controls/TabPage.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Collections.ObjectModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/TextArea.cs b/src/Eto/Forms/Controls/TextArea.cs
index f7a3936ca5..b796c440a1 100644
--- a/src/Eto/Forms/Controls/TextArea.cs
+++ b/src/Eto/Forms/Controls/TextArea.cs
@@ -1,7 +1,3 @@
-using Eto.Drawing;
-using System;
-using System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/TextBox.cs b/src/Eto/Forms/Controls/TextBox.cs
index da70adfebf..017bff3bbd 100644
--- a/src/Eto/Forms/Controls/TextBox.cs
+++ b/src/Eto/Forms/Controls/TextBox.cs
@@ -1,6 +1,3 @@
-using System;
-using System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/TextChangingEventArgs.cs b/src/Eto/Forms/Controls/TextChangingEventArgs.cs
index 665fd0929e..546627cdf9 100644
--- a/src/Eto/Forms/Controls/TextChangingEventArgs.cs
+++ b/src/Eto/Forms/Controls/TextChangingEventArgs.cs
@@ -1,6 +1,3 @@
-using System;
-using System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/TextControl.cs b/src/Eto/Forms/Controls/TextControl.cs
index a7e4fe7986..878f60f574 100644
--- a/src/Eto/Forms/Controls/TextControl.cs
+++ b/src/Eto/Forms/Controls/TextControl.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/TextInputEventArgs.cs b/src/Eto/Forms/Controls/TextInputEventArgs.cs
index 195282eb1e..ead60dfc25 100644
--- a/src/Eto/Forms/Controls/TextInputEventArgs.cs
+++ b/src/Eto/Forms/Controls/TextInputEventArgs.cs
@@ -1,6 +1,3 @@
-using System;
-using System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/TextStepper.cs b/src/Eto/Forms/Controls/TextStepper.cs
index 9e9794e20f..f9572c78c1 100755
--- a/src/Eto/Forms/Controls/TextStepper.cs
+++ b/src/Eto/Forms/Controls/TextStepper.cs
@@ -1,6 +1,3 @@
-using System;
-using System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/ThemedContainerHandler.cs b/src/Eto/Forms/Controls/ThemedContainerHandler.cs
index 765a925326..bce0abf851 100644
--- a/src/Eto/Forms/Controls/ThemedContainerHandler.cs
+++ b/src/Eto/Forms/Controls/ThemedContainerHandler.cs
@@ -1,5 +1,3 @@
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/ThemedControlHandler.cs b/src/Eto/Forms/Controls/ThemedControlHandler.cs
index 08163b099f..425a495756 100644
--- a/src/Eto/Forms/Controls/ThemedControlHandler.cs
+++ b/src/Eto/Forms/Controls/ThemedControlHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Collections.Generic;
-
 namespace Eto.Forms;
 
 interface IThemedControlHandler
diff --git a/src/Eto/Forms/Controls/ToggleButton.cs b/src/Eto/Forms/Controls/ToggleButton.cs
index aa7b89eb6e..c49ac9ebfc 100644
--- a/src/Eto/Forms/Controls/ToggleButton.cs
+++ b/src/Eto/Forms/Controls/ToggleButton.cs
@@ -1,4 +1,3 @@
-using System;
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/TreeGridItem.cs b/src/Eto/Forms/Controls/TreeGridItem.cs
index e920196802..9912fed063 100644
--- a/src/Eto/Forms/Controls/TreeGridItem.cs
+++ b/src/Eto/Forms/Controls/TreeGridItem.cs
@@ -1,6 +1,3 @@
-using System.Collections.Generic;
-using System.Collections.Specialized;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/TreeGridView.cs b/src/Eto/Forms/Controls/TreeGridView.cs
index 5b20af233e..78a448cf27 100644
--- a/src/Eto/Forms/Controls/TreeGridView.cs
+++ b/src/Eto/Forms/Controls/TreeGridView.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/TreeItem.cs b/src/Eto/Forms/Controls/TreeItem.cs
index 7a3d662afa..7b0435c2ca 100644
--- a/src/Eto/Forms/Controls/TreeItem.cs
+++ b/src/Eto/Forms/Controls/TreeItem.cs
@@ -1,6 +1,3 @@
-using System.Collections.Generic;
-using System.Collections.Specialized;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/TreeView.cs b/src/Eto/Forms/Controls/TreeView.cs
index 4e1d265fab..05599d9522 100644
--- a/src/Eto/Forms/Controls/TreeView.cs
+++ b/src/Eto/Forms/Controls/TreeView.cs
@@ -1,7 +1,3 @@
-using System;
-using System.ComponentModel;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Controls/WebView.cs b/src/Eto/Forms/Controls/WebView.cs
index 01cef03920..1e6f65dcd3 100644
--- a/src/Eto/Forms/Controls/WebView.cs
+++ b/src/Eto/Forms/Controls/WebView.cs
@@ -1,7 +1,3 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Cursor.cs b/src/Eto/Forms/Cursor.cs
index 6e02551d2a..edd7b74a10 100644
--- a/src/Eto/Forms/Cursor.cs
+++ b/src/Eto/Forms/Cursor.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Globalization;
-using System.IO;
-using System.Reflection;
 using System.Runtime.CompilerServices;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Cursors.cs b/src/Eto/Forms/Cursors.cs
index ed3727917b..c2700c68fa 100644
--- a/src/Eto/Forms/Cursors.cs
+++ b/src/Eto/Forms/Cursors.cs
@@ -1,6 +1,3 @@
-using System.Collections.Generic;
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/DataObject.cs b/src/Eto/Forms/DataObject.cs
index 017575ead3..1ce8ea084e 100644
--- a/src/Eto/Forms/DataObject.cs
+++ b/src/Eto/Forms/DataObject.cs
@@ -1,13 +1,4 @@
-using Eto.Drawing;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization.Formatters.Binary;
-using System.Text;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/DataStoreVirtualCollection.cs b/src/Eto/Forms/DataStoreVirtualCollection.cs
index be150428f2..f79d749816 100644
--- a/src/Eto/Forms/DataStoreVirtualCollection.cs
+++ b/src/Eto/Forms/DataStoreVirtualCollection.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Dialog.cs b/src/Eto/Forms/Dialog.cs
index c4a975d318..a8e3fb63b7 100644
--- a/src/Eto/Forms/Dialog.cs
+++ b/src/Eto/Forms/Dialog.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Threading.Tasks;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/DockPosition.cs b/src/Eto/Forms/DockPosition.cs
index 2454f7393c..5e66ff172e 100644
--- a/src/Eto/Forms/DockPosition.cs
+++ b/src/Eto/Forms/DockPosition.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Collections.ObjectModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/FileDialog.cs b/src/Eto/Forms/FileDialog.cs
index 67c2d1f615..50dca4083d 100644
--- a/src/Eto/Forms/FileDialog.cs
+++ b/src/Eto/Forms/FileDialog.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Globalization;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/FileFilter.cs b/src/Eto/Forms/FileFilter.cs
index 71a8eba945..d9bcceb9ad 100644
--- a/src/Eto/Forms/FileFilter.cs
+++ b/src/Eto/Forms/FileFilter.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Globalization;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/FilterCollection.cs b/src/Eto/Forms/FilterCollection.cs
index 785eeb445d..cd8638e5db 100644
--- a/src/Eto/Forms/FilterCollection.cs
+++ b/src/Eto/Forms/FilterCollection.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Collections;
-using System.Collections.ObjectModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/FontDialog.cs b/src/Eto/Forms/FontDialog.cs
index 9e0b0d4e6a..e0e945f098 100644
--- a/src/Eto/Forms/FontDialog.cs
+++ b/src/Eto/Forms/FontDialog.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Form.cs b/src/Eto/Forms/Form.cs
index a3bf306ebe..7238beba71 100644
--- a/src/Eto/Forms/Form.cs
+++ b/src/Eto/Forms/Form.cs
@@ -1,6 +1,3 @@
-using System;
-using System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/IDataStore.cs b/src/Eto/Forms/IDataStore.cs
index 50dee18393..e951597664 100644
--- a/src/Eto/Forms/IDataStore.cs
+++ b/src/Eto/Forms/IDataStore.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Collections;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/IKeyboardInputSource.cs b/src/Eto/Forms/IKeyboardInputSource.cs
index 1a4ccbb605..599d633761 100644
--- a/src/Eto/Forms/IKeyboardInputSource.cs
+++ b/src/Eto/Forms/IKeyboardInputSource.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/IMouseInputSource.cs b/src/Eto/Forms/IMouseInputSource.cs
index 30b61f4fb1..ee5076e357 100644
--- a/src/Eto/Forms/IMouseInputSource.cs
+++ b/src/Eto/Forms/IMouseInputSource.cs
@@ -1,5 +1,3 @@
-using System;
-
 using MouseEventHandler = System.EventHandler<Eto.Forms.MouseEventArgs>;
 
 namespace Eto.Forms;
diff --git a/src/Eto/Forms/Key.cs b/src/Eto/Forms/Key.cs
index 27c4bb18a2..1b719f4494 100644
--- a/src/Eto/Forms/Key.cs
+++ b/src/Eto/Forms/Key.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Text;
-using System.Collections.Generic;
-using sc = System.ComponentModel;
-using System.Diagnostics;
-
+
   namespace Eto.Forms; 
 
   /// <summary>
diff --git a/src/Eto/Forms/Keyboard.cs b/src/Eto/Forms/Keyboard.cs
index 9821b79cad..7db20503a6 100644
--- a/src/Eto/Forms/Keyboard.cs
+++ b/src/Eto/Forms/Keyboard.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// General keyboard methods
diff --git a/src/Eto/Forms/KeysConverter.cs b/src/Eto/Forms/KeysConverter.cs
index 8922d09319..ce5fd4b614 100644
--- a/src/Eto/Forms/KeysConverter.cs
+++ b/src/Eto/Forms/KeysConverter.cs
@@ -1,8 +1,4 @@
-using System;
-using sc = System.ComponentModel;
-using System.Linq;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 class KeysConverter : sc.TypeConverter
 {
diff --git a/src/Eto/Forms/Layout/DynamicItem.cs b/src/Eto/Forms/Layout/DynamicItem.cs
index 6c0c9d8593..380dba107c 100644
--- a/src/Eto/Forms/Layout/DynamicItem.cs
+++ b/src/Eto/Forms/Layout/DynamicItem.cs
@@ -1,7 +1,3 @@
-using sc = System.ComponentModel;
-using System;
-using System.Collections.Generic;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Layout/DynamicItemConverter.cs b/src/Eto/Forms/Layout/DynamicItemConverter.cs
index fa591548e1..01488d51f3 100644
--- a/src/Eto/Forms/Layout/DynamicItemConverter.cs
+++ b/src/Eto/Forms/Layout/DynamicItemConverter.cs
@@ -1,7 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.Globalization;
-
 namespace Eto.Forms;
 
 class DynamicItemConverter : sc.TypeConverter
diff --git a/src/Eto/Forms/Layout/DynamicLayout.cs b/src/Eto/Forms/Layout/DynamicLayout.cs
index 9e46d82354..8c8f398e02 100644
--- a/src/Eto/Forms/Layout/DynamicLayout.cs
+++ b/src/Eto/Forms/Layout/DynamicLayout.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using Eto.Drawing;
-using System.Collections.ObjectModel;
-using System.Linq;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Layout/DynamicRowConverter.cs b/src/Eto/Forms/Layout/DynamicRowConverter.cs
index bdfbf18a25..c6cb13785b 100644
--- a/src/Eto/Forms/Layout/DynamicRowConverter.cs
+++ b/src/Eto/Forms/Layout/DynamicRowConverter.cs
@@ -1,7 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.Globalization;
-
 namespace Eto.Forms;
 
 class DynamicRowConverter : sc.TypeConverter
diff --git a/src/Eto/Forms/Layout/DynamicTable.cs b/src/Eto/Forms/Layout/DynamicTable.cs
index 486965bc3a..718a0685e6 100644
--- a/src/Eto/Forms/Layout/DynamicTable.cs
+++ b/src/Eto/Forms/Layout/DynamicTable.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Eto.Drawing;
-using sc = System.ComponentModel;
-using System.Collections.ObjectModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Layout/Layout.cs b/src/Eto/Forms/Layout/Layout.cs
index 2f230cb3b1..224f1edd9f 100644
--- a/src/Eto/Forms/Layout/Layout.cs
+++ b/src/Eto/Forms/Layout/Layout.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Linq;
-using System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Layout/PixelLayout.cs b/src/Eto/Forms/Layout/PixelLayout.cs
index 993af46340..814857d2ad 100644
--- a/src/Eto/Forms/Layout/PixelLayout.cs
+++ b/src/Eto/Forms/Layout/PixelLayout.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Runtime.Serialization;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Layout/StackLayout.cs b/src/Eto/Forms/Layout/StackLayout.cs
index 33df08847f..d620ccd35e 100644
--- a/src/Eto/Forms/Layout/StackLayout.cs
+++ b/src/Eto/Forms/Layout/StackLayout.cs
@@ -1,12 +1,3 @@
-using System;
-using System.Collections;
-using System.Collections.ObjectModel;
-using sc = System.ComponentModel;
-using Eto.Drawing;
-using System.Globalization;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Layout/StackLayoutItemConverter.cs b/src/Eto/Forms/Layout/StackLayoutItemConverter.cs
index c05445c61d..b253254ec4 100644
--- a/src/Eto/Forms/Layout/StackLayoutItemConverter.cs
+++ b/src/Eto/Forms/Layout/StackLayoutItemConverter.cs
@@ -1,7 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.Globalization;
-
 namespace Eto.Forms;
 
 class StackLayoutItemConverter : sc.TypeConverter
diff --git a/src/Eto/Forms/Layout/TableCell.cs b/src/Eto/Forms/Layout/TableCell.cs
index 3e599a8fec..2c966da979 100755
--- a/src/Eto/Forms/Layout/TableCell.cs
+++ b/src/Eto/Forms/Layout/TableCell.cs
@@ -1,12 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Linq;
-using System.Collections.Generic;
-using sc = System.ComponentModel;
-using System.Runtime.Serialization;
-using System.Collections.ObjectModel;
-using System.Collections;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Layout/TableCellConverter.cs b/src/Eto/Forms/Layout/TableCellConverter.cs
index 7df15fbda5..a774b07a23 100644
--- a/src/Eto/Forms/Layout/TableCellConverter.cs
+++ b/src/Eto/Forms/Layout/TableCellConverter.cs
@@ -1,7 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.Globalization;
-
 namespace Eto.Forms;
 
 class TableCellConverter : sc.TypeConverter
diff --git a/src/Eto/Forms/Layout/TableLayout.cs b/src/Eto/Forms/Layout/TableLayout.cs
index b7e54aba27..b658310940 100644
--- a/src/Eto/Forms/Layout/TableLayout.cs
+++ b/src/Eto/Forms/Layout/TableLayout.cs
@@ -1,12 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Globalization;
-using System.Linq;
-using System.Runtime.Serialization;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Layout/TableRow.cs b/src/Eto/Forms/Layout/TableRow.cs
index e358955a45..72c6303af0 100755
--- a/src/Eto/Forms/Layout/TableRow.cs
+++ b/src/Eto/Forms/Layout/TableRow.cs
@@ -1,12 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Linq;
-using System.Collections.Generic;
-using sc = System.ComponentModel;
-using System.Runtime.Serialization;
-using System.Collections.ObjectModel;
-using System.Collections;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Layout/TableRowConverter.cs b/src/Eto/Forms/Layout/TableRowConverter.cs
index fdb20df3ce..77d8748486 100644
--- a/src/Eto/Forms/Layout/TableRowConverter.cs
+++ b/src/Eto/Forms/Layout/TableRowConverter.cs
@@ -1,7 +1,3 @@
-using System;
-using sc = System.ComponentModel;
-using System.Globalization;
-
 namespace Eto.Forms;
 
 class TableRowConverter : sc.TypeConverter
diff --git a/src/Eto/Forms/ListItem.cs b/src/Eto/Forms/ListItem.cs
index a2959d7138..ea6e1cbec8 100644
--- a/src/Eto/Forms/ListItem.cs
+++ b/src/Eto/Forms/ListItem.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Globalization;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/LocalizeEventArgs.cs b/src/Eto/Forms/LocalizeEventArgs.cs
index bb3c86f077..a24edfc172 100644
--- a/src/Eto/Forms/LocalizeEventArgs.cs
+++ b/src/Eto/Forms/LocalizeEventArgs.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/MaskedTextProvider/FixedMaskedTextProvider.cs b/src/Eto/Forms/MaskedTextProvider/FixedMaskedTextProvider.cs
index ed6c515704..4e17976c4c 100644
--- a/src/Eto/Forms/MaskedTextProvider/FixedMaskedTextProvider.cs
+++ b/src/Eto/Forms/MaskedTextProvider/FixedMaskedTextProvider.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Text;
-using System.Linq;
-using System.Globalization;
-using System.ComponentModel;
-using System.Collections.Generic;
-using System.Reflection;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/MaskedTextProvider/IMaskedTextProvider.cs b/src/Eto/Forms/MaskedTextProvider/IMaskedTextProvider.cs
index 957a7bd73e..ac3f9407f5 100644
--- a/src/Eto/Forms/MaskedTextProvider/IMaskedTextProvider.cs
+++ b/src/Eto/Forms/MaskedTextProvider/IMaskedTextProvider.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Text;
-using System.Linq;
-using System.Globalization;
-using System.ComponentModel;
-using System.Collections.Generic;
-using System.Reflection;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/MaskedTextProvider/NumericMaskedTextProvider.cs b/src/Eto/Forms/MaskedTextProvider/NumericMaskedTextProvider.cs
index eec0ad03dc..0cc5a64d29 100644
--- a/src/Eto/Forms/MaskedTextProvider/NumericMaskedTextProvider.cs
+++ b/src/Eto/Forms/MaskedTextProvider/NumericMaskedTextProvider.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Linq;
-using System.Globalization;
-using System.ComponentModel;
-using System.Collections.Generic;
-using System.Reflection;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/MaskedTextProvider/VariableMaskedTextProvider.cs b/src/Eto/Forms/MaskedTextProvider/VariableMaskedTextProvider.cs
index eb43b338d3..d60f3f3434 100644
--- a/src/Eto/Forms/MaskedTextProvider/VariableMaskedTextProvider.cs
+++ b/src/Eto/Forms/MaskedTextProvider/VariableMaskedTextProvider.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Text;
-using System.Linq;
-using System.Globalization;
-using System.ComponentModel;
-using System.Collections.Generic;
-using System.Reflection;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Menu/ButtonMenuItem.cs b/src/Eto/Forms/Menu/ButtonMenuItem.cs
index bd668b7487..4485f58862 100644
--- a/src/Eto/Forms/Menu/ButtonMenuItem.cs
+++ b/src/Eto/Forms/Menu/ButtonMenuItem.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Menu/CheckMenuItem.cs b/src/Eto/Forms/Menu/CheckMenuItem.cs
index b73d6db1bc..a8483e2a9f 100644
--- a/src/Eto/Forms/Menu/CheckMenuItem.cs
+++ b/src/Eto/Forms/Menu/CheckMenuItem.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Windows.Input;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Menu/ContextMenu.cs b/src/Eto/Forms/Menu/ContextMenu.cs
index c1057f740b..8ab9d65f5a 100644
--- a/src/Eto/Forms/Menu/ContextMenu.cs
+++ b/src/Eto/Forms/Menu/ContextMenu.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Menu/Menu.cs b/src/Eto/Forms/Menu/Menu.cs
index aa33ba1ea8..da9ae35d06 100644
--- a/src/Eto/Forms/Menu/Menu.cs
+++ b/src/Eto/Forms/Menu/Menu.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Menu/MenuBar.cs b/src/Eto/Forms/Menu/MenuBar.cs
index 66b009350c..fb4ac1037d 100644
--- a/src/Eto/Forms/Menu/MenuBar.cs
+++ b/src/Eto/Forms/Menu/MenuBar.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Menu/MenuItem.cs b/src/Eto/Forms/Menu/MenuItem.cs
index ce1298964a..f5c824485a 100644
--- a/src/Eto/Forms/Menu/MenuItem.cs
+++ b/src/Eto/Forms/Menu/MenuItem.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows.Input;
-using sc = System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Menu/MenuItemCollection.cs b/src/Eto/Forms/Menu/MenuItemCollection.cs
index 62cf15697e..c239c69d50 100644
--- a/src/Eto/Forms/Menu/MenuItemCollection.cs
+++ b/src/Eto/Forms/Menu/MenuItemCollection.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Collections.Generic;
-using System.Linq;
-using System.Collections;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Menu/MenuItemConverter.cs b/src/Eto/Forms/Menu/MenuItemConverter.cs
index c1ff015a66..752b3d200c 100644
--- a/src/Eto/Forms/Menu/MenuItemConverter.cs
+++ b/src/Eto/Forms/Menu/MenuItemConverter.cs
@@ -1,7 +1,4 @@
-using System;
-using sc = System.ComponentModel;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 class MenuItemConverter : sc.TypeConverter
 {
diff --git a/src/Eto/Forms/Menu/RadioMenuItem.cs b/src/Eto/Forms/Menu/RadioMenuItem.cs
index 696f3bf28e..0d1a4193de 100644
--- a/src/Eto/Forms/Menu/RadioMenuItem.cs
+++ b/src/Eto/Forms/Menu/RadioMenuItem.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Windows.Input;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Menu/SeparatorMenuItem.cs b/src/Eto/Forms/Menu/SeparatorMenuItem.cs
index ee9d2ae75c..c1dddc037f 100644
--- a/src/Eto/Forms/Menu/SeparatorMenuItem.cs
+++ b/src/Eto/Forms/Menu/SeparatorMenuItem.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Menu/SubMenu.cs b/src/Eto/Forms/Menu/SubMenu.cs
index 398c7dd4d0..d4c8814031 100644
--- a/src/Eto/Forms/Menu/SubMenu.cs
+++ b/src/Eto/Forms/Menu/SubMenu.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Menu/SubMenuItem.cs b/src/Eto/Forms/Menu/SubMenuItem.cs
index 4246005206..97af3a99c0 100644
--- a/src/Eto/Forms/Menu/SubMenuItem.cs
+++ b/src/Eto/Forms/Menu/SubMenuItem.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Collections.Generic;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/MessageBox.cs b/src/Eto/Forms/MessageBox.cs
index 79bcead996..b8eca15fb3 100644
--- a/src/Eto/Forms/MessageBox.cs
+++ b/src/Eto/Forms/MessageBox.cs
@@ -1,6 +1,3 @@
-using System;
-
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Mouse.cs b/src/Eto/Forms/Mouse.cs
index 8e04164cdc..42198bc309 100644
--- a/src/Eto/Forms/Mouse.cs
+++ b/src/Eto/Forms/Mouse.cs
@@ -1,7 +1,3 @@
-using Eto.Drawing;
-using System;
-using System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Notification.cs b/src/Eto/Forms/Notification.cs
index 3f8b0050a4..8a37095905 100644
--- a/src/Eto/Forms/Notification.cs
+++ b/src/Eto/Forms/Notification.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/NotificationEventArgs.cs b/src/Eto/Forms/NotificationEventArgs.cs
index a47d156d28..68e0da3fb3 100644
--- a/src/Eto/Forms/NotificationEventArgs.cs
+++ b/src/Eto/Forms/NotificationEventArgs.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/OpenFileDialog.cs b/src/Eto/Forms/OpenFileDialog.cs
index 5861b82f6e..917ed4fd42 100644
--- a/src/Eto/Forms/OpenFileDialog.cs
+++ b/src/Eto/Forms/OpenFileDialog.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/OpenWithDialog.cs b/src/Eto/Forms/OpenWithDialog.cs
index 4d9ecfad2e..b3573fc5ac 100644
--- a/src/Eto/Forms/OpenWithDialog.cs
+++ b/src/Eto/Forms/OpenWithDialog.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// Dialog for a user to pick the default application for the given file.
diff --git a/src/Eto/Forms/Orientation.cs b/src/Eto/Forms/Orientation.cs
index a48d222247..067ba9946a 100644
--- a/src/Eto/Forms/Orientation.cs
+++ b/src/Eto/Forms/Orientation.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.ObjectModel;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Printing/PageSettings.cs b/src/Eto/Forms/Printing/PageSettings.cs
index 5e72cb4e6e..f24ee38d97 100644
--- a/src/Eto/Forms/Printing/PageSettings.cs
+++ b/src/Eto/Forms/Printing/PageSettings.cs
@@ -1,6 +1,3 @@
-using Eto.Drawing;
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Printing/PrintDialog.cs b/src/Eto/Forms/Printing/PrintDialog.cs
index 9303d73b28..77c25e5af4 100644
--- a/src/Eto/Forms/Printing/PrintDialog.cs
+++ b/src/Eto/Forms/Printing/PrintDialog.cs
@@ -1,6 +1,3 @@
-using System.ComponentModel;
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Printing/PrintDocument.cs b/src/Eto/Forms/Printing/PrintDocument.cs
index 10cba3dae5..8148645927 100644
--- a/src/Eto/Forms/Printing/PrintDocument.cs
+++ b/src/Eto/Forms/Printing/PrintDocument.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Printing/PrintPageEventArgs.cs b/src/Eto/Forms/Printing/PrintPageEventArgs.cs
index 682e47988b..c12a073410 100644
--- a/src/Eto/Forms/Printing/PrintPageEventArgs.cs
+++ b/src/Eto/Forms/Printing/PrintPageEventArgs.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Printing/PrintPreviewDialog.cs b/src/Eto/Forms/Printing/PrintPreviewDialog.cs
index d04352037a..169960b18a 100755
--- a/src/Eto/Forms/Printing/PrintPreviewDialog.cs
+++ b/src/Eto/Forms/Printing/PrintPreviewDialog.cs
@@ -1,6 +1,3 @@
-using System.ComponentModel;
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Printing/PrintSettings.cs b/src/Eto/Forms/Printing/PrintSettings.cs
index 0a2e38ef01..e396a0137d 100644
--- a/src/Eto/Forms/Printing/PrintSettings.cs
+++ b/src/Eto/Forms/Printing/PrintSettings.cs
@@ -1,6 +1,3 @@
-using System.ComponentModel;
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Range.cs b/src/Eto/Forms/Range.cs
index b880243784..476469e0d9 100644
--- a/src/Eto/Forms/Range.cs
+++ b/src/Eto/Forms/Range.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Globalization;
-using System.Collections.Generic;
-using System.Linq.Expressions;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/RelayCommand.cs b/src/Eto/Forms/RelayCommand.cs
index ef1b6131b5..079ab93659 100644
--- a/src/Eto/Forms/RelayCommand.cs
+++ b/src/Eto/Forms/RelayCommand.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Globalization;
-using System.Windows.Input;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/RelayValueCommand.cs b/src/Eto/Forms/RelayValueCommand.cs
index e134bbeefa..ea33fc8c59 100644
--- a/src/Eto/Forms/RelayValueCommand.cs
+++ b/src/Eto/Forms/RelayValueCommand.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// A <see cref="IValueCommand{T}"/> class that uses delegates for getting and setting the value of the command
diff --git a/src/Eto/Forms/SaveFileDialog.cs b/src/Eto/Forms/SaveFileDialog.cs
index cc5375b70e..c5d9c001a8 100644
--- a/src/Eto/Forms/SaveFileDialog.cs
+++ b/src/Eto/Forms/SaveFileDialog.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Screen.cs b/src/Eto/Forms/Screen.cs
index 76af6ad2fb..bd54536007 100644
--- a/src/Eto/Forms/Screen.cs
+++ b/src/Eto/Forms/Screen.cs
@@ -1,8 +1,3 @@
-using System.Collections.Generic;
-using Eto.Drawing;
-using System;
-using System.Linq;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/SegmentedButton/ButtonSegmentedItem.cs b/src/Eto/Forms/SegmentedButton/ButtonSegmentedItem.cs
index 4e06c05b8c..2601b13092 100644
--- a/src/Eto/Forms/SegmentedButton/ButtonSegmentedItem.cs
+++ b/src/Eto/Forms/SegmentedButton/ButtonSegmentedItem.cs
@@ -1,5 +1,3 @@
-using System.Windows.Input;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/SegmentedButton/SegmentedButton.cs b/src/Eto/Forms/SegmentedButton/SegmentedButton.cs
index accca8926a..3dedc84c97 100755
--- a/src/Eto/Forms/SegmentedButton/SegmentedButton.cs
+++ b/src/Eto/Forms/SegmentedButton/SegmentedButton.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/SegmentedButton/SegmentedItem.cs b/src/Eto/Forms/SegmentedButton/SegmentedItem.cs
index b4454d8f7a..2da0b7b4d9 100644
--- a/src/Eto/Forms/SegmentedButton/SegmentedItem.cs
+++ b/src/Eto/Forms/SegmentedButton/SegmentedItem.cs
@@ -1,9 +1,3 @@
-using System;
-using System.ComponentModel;
-using System.Windows.Input;
-using Eto.Drawing;
-using sc = System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/SegmentedButton/SegmentedItemClickEventArgs.cs b/src/Eto/Forms/SegmentedButton/SegmentedItemClickEventArgs.cs
index c60581f88f..bfc779f688 100644
--- a/src/Eto/Forms/SegmentedButton/SegmentedItemClickEventArgs.cs
+++ b/src/Eto/Forms/SegmentedButton/SegmentedItemClickEventArgs.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// Event arguments when clicking a segment in the <see cref="SegmentedButton"/>.
diff --git a/src/Eto/Forms/SegmentedButton/SegmentedItemCollection.cs b/src/Eto/Forms/SegmentedButton/SegmentedItemCollection.cs
index dad7ec6215..98f42de2e3 100755
--- a/src/Eto/Forms/SegmentedButton/SegmentedItemCollection.cs
+++ b/src/Eto/Forms/SegmentedButton/SegmentedItemCollection.cs
@@ -1,7 +1,3 @@
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/SegmentedButton/SegmentedItemConverter.cs b/src/Eto/Forms/SegmentedButton/SegmentedItemConverter.cs
index 7f9103e16d..90829538b5 100644
--- a/src/Eto/Forms/SegmentedButton/SegmentedItemConverter.cs
+++ b/src/Eto/Forms/SegmentedButton/SegmentedItemConverter.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Globalization;
-using Eto.Drawing;
-using sc = System.ComponentModel;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 internal class SegmentedItemConverter : sc.TypeConverter
 {
diff --git a/src/Eto/Forms/SelectFolderDialog.cs b/src/Eto/Forms/SelectFolderDialog.cs
index e637805d68..33054e8786 100644
--- a/src/Eto/Forms/SelectFolderDialog.cs
+++ b/src/Eto/Forms/SelectFolderDialog.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/Taskbar.cs b/src/Eto/Forms/Taskbar.cs
index 11a0be5ddc..8be35b9930 100644
--- a/src/Eto/Forms/Taskbar.cs
+++ b/src/Eto/Forms/Taskbar.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// Methods to interact with application taskbar button.
diff --git a/src/Eto/Forms/ThemedControls/ThemedAboutHandler.cs b/src/Eto/Forms/ThemedControls/ThemedAboutHandler.cs
index d5fecac692..a43a744d90 100644
--- a/src/Eto/Forms/ThemedControls/ThemedAboutHandler.cs
+++ b/src/Eto/Forms/ThemedControls/ThemedAboutHandler.cs
@@ -1,7 +1,4 @@
-using System;
-using Eto.Drawing;
-
-namespace Eto.Forms.ThemedControls;
+namespace Eto.Forms.ThemedControls;
 
 /// <summary>
 /// A themed handler for the <see cref="AboutDialog"/> dialog.
diff --git a/src/Eto/Forms/ThemedControls/ThemedCollectionEditorHandler.cs b/src/Eto/Forms/ThemedControls/ThemedCollectionEditorHandler.cs
index 3e77ec1bec..d287a70062 100644
--- a/src/Eto/Forms/ThemedControls/ThemedCollectionEditorHandler.cs
+++ b/src/Eto/Forms/ThemedControls/ThemedCollectionEditorHandler.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Reflection;
-using Eto.Drawing;
-
 namespace Eto.Forms.ThemedControls;
 
 /// <summary>
diff --git a/src/Eto/Forms/ThemedControls/ThemedColorPickerHandler.cs b/src/Eto/Forms/ThemedControls/ThemedColorPickerHandler.cs
index 293e5bf600..00953d483c 100644
--- a/src/Eto/Forms/ThemedControls/ThemedColorPickerHandler.cs
+++ b/src/Eto/Forms/ThemedControls/ThemedColorPickerHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Forms.ThemedControls;
 
 /// <summary>
diff --git a/src/Eto/Forms/ThemedControls/ThemedDocumentControlHandler.cs b/src/Eto/Forms/ThemedControls/ThemedDocumentControlHandler.cs
index e80997ff14..97d90ad811 100644
--- a/src/Eto/Forms/ThemedControls/ThemedDocumentControlHandler.cs
+++ b/src/Eto/Forms/ThemedControls/ThemedDocumentControlHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using Eto.Drawing;
-
 namespace Eto.Forms.ThemedControls;
 
 /// <summary>
diff --git a/src/Eto/Forms/ThemedControls/ThemedDocumentPageHandler.cs b/src/Eto/Forms/ThemedControls/ThemedDocumentPageHandler.cs
index 736b8e1044..117986da26 100644
--- a/src/Eto/Forms/ThemedControls/ThemedDocumentPageHandler.cs
+++ b/src/Eto/Forms/ThemedControls/ThemedDocumentPageHandler.cs
@@ -1,7 +1,4 @@
-using System;
-using Eto.Drawing;
-
-namespace Eto.Forms.ThemedControls;
+namespace Eto.Forms.ThemedControls;
 
 /// <summary>
 /// A themed handler for the <see cref="DocumentPage"/> control.
diff --git a/src/Eto/Forms/ThemedControls/ThemedExpanderHandler.cs b/src/Eto/Forms/ThemedControls/ThemedExpanderHandler.cs
index 566dea7e02..fd2edfe012 100644
--- a/src/Eto/Forms/ThemedControls/ThemedExpanderHandler.cs
+++ b/src/Eto/Forms/ThemedControls/ThemedExpanderHandler.cs
@@ -1,7 +1,4 @@
-using System;
-using Eto.Drawing;
-
-namespace Eto.Forms.ThemedControls;
+namespace Eto.Forms.ThemedControls;
 
 /// <summary>
 /// A themed handler for the <see cref="Expander"/> control.
diff --git a/src/Eto/Forms/ThemedControls/ThemedFilePickerHandler.cs b/src/Eto/Forms/ThemedControls/ThemedFilePickerHandler.cs
index df1e95bfaf..ad15305739 100644
--- a/src/Eto/Forms/ThemedControls/ThemedFilePickerHandler.cs
+++ b/src/Eto/Forms/ThemedControls/ThemedFilePickerHandler.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-
-namespace Eto.Forms.ThemedControls;
+namespace Eto.Forms.ThemedControls;
 
 /// <summary>
 /// A themed handler for the <see cref="FilePicker"/> control.
diff --git a/src/Eto/Forms/ThemedControls/ThemedFontPickerHandler.cs b/src/Eto/Forms/ThemedControls/ThemedFontPickerHandler.cs
index e095e8e533..5a240b5df3 100644
--- a/src/Eto/Forms/ThemedControls/ThemedFontPickerHandler.cs
+++ b/src/Eto/Forms/ThemedControls/ThemedFontPickerHandler.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Eto.Drawing;
-
 namespace Eto.Forms.ThemedControls;
 
 /// <summary>
diff --git a/src/Eto/Forms/ThemedControls/ThemedPropertyGridHandler.cs b/src/Eto/Forms/ThemedControls/ThemedPropertyGridHandler.cs
index 4a113424ba..e5b7da8b3a 100644
--- a/src/Eto/Forms/ThemedControls/ThemedPropertyGridHandler.cs
+++ b/src/Eto/Forms/ThemedControls/ThemedPropertyGridHandler.cs
@@ -1,15 +1,4 @@
-using System;
-using Eto.Drawing;
-using System.Linq;
-using System.Reflection;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Threading.Tasks;
-using System.Collections;
 using System.Runtime.CompilerServices;
-using System.Collections.ObjectModel;
-using sc = System.ComponentModel;
-
 namespace Eto.Forms.ThemedControls;
 
 /// <summary>
diff --git a/src/Eto/Forms/ThemedControls/ThemedSegmentedButtonHandler.cs b/src/Eto/Forms/ThemedControls/ThemedSegmentedButtonHandler.cs
index 8f8b6684dd..fb61cd5982 100755
--- a/src/Eto/Forms/ThemedControls/ThemedSegmentedButtonHandler.cs
+++ b/src/Eto/Forms/ThemedControls/ThemedSegmentedButtonHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Eto.Drawing;
-using System.Linq;
-
 namespace Eto.Forms.ThemedControls;
 
 /// <summary>
diff --git a/src/Eto/Forms/ThemedControls/ThemedSpinnerHandler.cs b/src/Eto/Forms/ThemedControls/ThemedSpinnerHandler.cs
index 4fb61ecb8d..3995486a7f 100644
--- a/src/Eto/Forms/ThemedControls/ThemedSpinnerHandler.cs
+++ b/src/Eto/Forms/ThemedControls/ThemedSpinnerHandler.cs
@@ -1,6 +1,3 @@
-using Eto.Drawing;
-using System;
-
 namespace Eto.Forms.ThemedControls;
 
 /// <summary>
diff --git a/src/Eto/Forms/ThemedControls/ThemedSplitterHandler.cs b/src/Eto/Forms/ThemedControls/ThemedSplitterHandler.cs
index 2ca5508d48..e5a1153bb4 100644
--- a/src/Eto/Forms/ThemedControls/ThemedSplitterHandler.cs
+++ b/src/Eto/Forms/ThemedControls/ThemedSplitterHandler.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
-namespace Eto.Forms.ThemedControls;
+namespace Eto.Forms.ThemedControls;
 
 /// <summary>
 /// ! UNDER CONSTRUCTION !
diff --git a/src/Eto/Forms/ThemedControls/ThemedStepperHandler.cs b/src/Eto/Forms/ThemedControls/ThemedStepperHandler.cs
index 29615f42b0..404ebb6833 100644
--- a/src/Eto/Forms/ThemedControls/ThemedStepperHandler.cs
+++ b/src/Eto/Forms/ThemedControls/ThemedStepperHandler.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Drawing;
-using System.ComponentModel;
-
-namespace Eto.Forms.ThemedControls;
+namespace Eto.Forms.ThemedControls;
 
 /// <summary>
 /// Themed version of the <see cref="Stepper"/> control for platforms that have no support for such a control.
diff --git a/src/Eto/Forms/ThemedControls/ThemedTextStepperHandler.cs b/src/Eto/Forms/ThemedControls/ThemedTextStepperHandler.cs
index e028296661..b02055b876 100644
--- a/src/Eto/Forms/ThemedControls/ThemedTextStepperHandler.cs
+++ b/src/Eto/Forms/ThemedControls/ThemedTextStepperHandler.cs
@@ -1,8 +1,4 @@
-using System;
-using System.ComponentModel;
-using Eto.Drawing;
-
-namespace Eto.Forms.ThemedControls;
+namespace Eto.Forms.ThemedControls;
 
 /// <summary>
 /// Themed implementation of the <see cref="TextStepper"/> control composed of a <see cref="TextBox"/> and <see cref="Stepper"/>.
diff --git a/src/Eto/Forms/ToolBar/ButtonToolItem.cs b/src/Eto/Forms/ToolBar/ButtonToolItem.cs
index 7371b00ad0..35b1c390fb 100644
--- a/src/Eto/Forms/ToolBar/ButtonToolItem.cs
+++ b/src/Eto/Forms/ToolBar/ButtonToolItem.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/ToolBar/CheckToolItem.cs b/src/Eto/Forms/ToolBar/CheckToolItem.cs
index c191e2e63d..1e7d0dd0e6 100644
--- a/src/Eto/Forms/ToolBar/CheckToolItem.cs
+++ b/src/Eto/Forms/ToolBar/CheckToolItem.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Windows.Input;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/ToolBar/DropDownToolItem.cs b/src/Eto/Forms/ToolBar/DropDownToolItem.cs
index 37bd125a69..5b16680286 100644
--- a/src/Eto/Forms/ToolBar/DropDownToolItem.cs
+++ b/src/Eto/Forms/ToolBar/DropDownToolItem.cs
@@ -1,5 +1,3 @@
-using System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/ToolBar/RadioToolItem.cs b/src/Eto/Forms/ToolBar/RadioToolItem.cs
index 07d457e9a6..6ecc8c1baf 100644
--- a/src/Eto/Forms/ToolBar/RadioToolItem.cs
+++ b/src/Eto/Forms/ToolBar/RadioToolItem.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Windows.Input;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/ToolBar/SeparatorToolItem.cs b/src/Eto/Forms/ToolBar/SeparatorToolItem.cs
index d0bd49b54d..a1bb651e1e 100644
--- a/src/Eto/Forms/ToolBar/SeparatorToolItem.cs
+++ b/src/Eto/Forms/ToolBar/SeparatorToolItem.cs
@@ -1,6 +1,3 @@
-using System;
-
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/ToolBar/Tool.cs b/src/Eto/Forms/ToolBar/Tool.cs
index 8c5ba3b6db..7430860271 100644
--- a/src/Eto/Forms/ToolBar/Tool.cs
+++ b/src/Eto/Forms/ToolBar/Tool.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// Base class for tool items on a <see cref="ToolBar"/>
diff --git a/src/Eto/Forms/ToolBar/ToolBar.cs b/src/Eto/Forms/ToolBar/ToolBar.cs
index dbd2122fe8..04f2fd323a 100644
--- a/src/Eto/Forms/ToolBar/ToolBar.cs
+++ b/src/Eto/Forms/ToolBar/ToolBar.cs
@@ -1,7 +1,3 @@
-using System.Collections.ObjectModel;
-using System.Collections.Generic;
-using System;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/ToolBar/ToolItem.cs b/src/Eto/Forms/ToolBar/ToolItem.cs
index 806cec298e..39cf4bdb2f 100644
--- a/src/Eto/Forms/ToolBar/ToolItem.cs
+++ b/src/Eto/Forms/ToolBar/ToolItem.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Drawing;
-using System.Windows.Input;
-using sc = System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/ToolBar/ToolItemCollection.cs b/src/Eto/Forms/ToolBar/ToolItemCollection.cs
index 8352a141b5..237584c29a 100644
--- a/src/Eto/Forms/ToolBar/ToolItemCollection.cs
+++ b/src/Eto/Forms/ToolBar/ToolItemCollection.cs
@@ -1,7 +1,3 @@
-using System.Collections.ObjectModel;
-using System.Collections.Generic;
-using System.Collections;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/ToolBar/ToolItemConverter.cs b/src/Eto/Forms/ToolBar/ToolItemConverter.cs
index b3476f45ee..46cb691788 100644
--- a/src/Eto/Forms/ToolBar/ToolItemConverter.cs
+++ b/src/Eto/Forms/ToolBar/ToolItemConverter.cs
@@ -1,7 +1,4 @@
-using System;
-using sc = System.ComponentModel;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 class ToolItemConverter : sc.TypeConverter
 {
diff --git a/src/Eto/Forms/TrayIndicator.cs b/src/Eto/Forms/TrayIndicator.cs
index 180f565fc9..da0aeeb705 100644
--- a/src/Eto/Forms/TrayIndicator.cs
+++ b/src/Eto/Forms/TrayIndicator.cs
@@ -1,7 +1,4 @@
-using System;
-using Eto.Drawing;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// A system tray indicator.
diff --git a/src/Eto/Forms/UITimer.cs b/src/Eto/Forms/UITimer.cs
index 23895382e4..9d6c779d87 100644
--- a/src/Eto/Forms/UITimer.cs
+++ b/src/Eto/Forms/UITimer.cs
@@ -1,6 +1,3 @@
-using System;
-using System.ComponentModel;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/Forms/ValueCommand.cs b/src/Eto/Forms/ValueCommand.cs
index 615239cb92..9620be2ad8 100644
--- a/src/Eto/Forms/ValueCommand.cs
+++ b/src/Eto/Forms/ValueCommand.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Windows.Input;
-
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// Interface for a command that can provide a value
diff --git a/src/Eto/Forms/WidgetExtensions.cs b/src/Eto/Forms/WidgetExtensions.cs
index d3316eae01..b36146ad5c 100644
--- a/src/Eto/Forms/WidgetExtensions.cs
+++ b/src/Eto/Forms/WidgetExtensions.cs
@@ -1,5 +1,4 @@
-using System;
-namespace Eto.Forms;
+namespace Eto.Forms;
 
 /// <summary>
 /// Extensions for widget objects
diff --git a/src/Eto/Forms/Window.cs b/src/Eto/Forms/Window.cs
index 19207f9e03..2aad8e574e 100644
--- a/src/Eto/Forms/Window.cs
+++ b/src/Eto/Forms/Window.cs
@@ -1,7 +1,3 @@
-using System;
-using System.ComponentModel;
-using Eto.Drawing;
-
 namespace Eto.Forms;
 
 /// <summary>
diff --git a/src/Eto/HandlerAttribute.cs b/src/Eto/HandlerAttribute.cs
index 719b4cb4d2..1c8ac6cd15 100644
--- a/src/Eto/HandlerAttribute.cs
+++ b/src/Eto/HandlerAttribute.cs
@@ -1,7 +1,4 @@
-using System;
-using System.ComponentModel;
-
-namespace Eto;
+namespace Eto;
 
 /// <summary>
 /// Attribute to specify the interface type to use for the handler of a <see cref="Widget"/>
diff --git a/src/Eto/Helper.cs b/src/Eto/Helper.cs
index 2c77055247..6b5e9ad82b 100644
--- a/src/Eto/Helper.cs
+++ b/src/Eto/Helper.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Linq.Expressions;
-
 namespace Eto
 {
 
diff --git a/src/Eto/IO/SystemIcons.cs b/src/Eto/IO/SystemIcons.cs
index 00a218cb4f..00ee3fc963 100644
--- a/src/Eto/IO/SystemIcons.cs
+++ b/src/Eto/IO/SystemIcons.cs
@@ -1,9 +1,3 @@
-using System.IO;
-using System.Collections;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System;
-
 namespace Eto.IO;
 
 /// <summary>
diff --git a/src/Eto/NamespaceInfo.cs b/src/Eto/NamespaceInfo.cs
index 7892626044..db690289ab 100644
--- a/src/Eto/NamespaceInfo.cs
+++ b/src/Eto/NamespaceInfo.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Globalization;
-using System.IO;
-using System.Reflection;
-
 namespace Eto;
 
 /// <summary>
diff --git a/src/Eto/OperatingSystemPlatform.cs b/src/Eto/OperatingSystemPlatform.cs
index 3ee3e47575..c3d243d6c0 100644
--- a/src/Eto/OperatingSystemPlatform.cs
+++ b/src/Eto/OperatingSystemPlatform.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Runtime.InteropServices;
-using System.Reflection;
-using System.IO;
-using System.Linq;
-
 namespace Eto;
 
 /// <summary>
diff --git a/src/Eto/PclTypes.cs b/src/Eto/PclTypes.cs
index 6f01ca7853..d37dff4473 100644
--- a/src/Eto/PclTypes.cs
+++ b/src/Eto/PclTypes.cs
@@ -1,14 +1,4 @@
 #if NETSTANDARD || NETCOREAPP
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.ComponentModel;
-using System.Runtime.Serialization;
-using System.Reflection;
-
 // This file contains type definitions currently needed to compile Eto
 // as a Portable Class Library, in the project Eto.Pcl.csproj.
 namespace Eto
diff --git a/src/Eto/Platform.cs b/src/Eto/Platform.cs
index 4a80220dec..fc2aea8942 100644
--- a/src/Eto/Platform.cs
+++ b/src/Eto/Platform.cs
@@ -1,12 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Reflection;
-using System.Threading;
-using Eto.Drawing;
-
 namespace Eto;
 
 /// <summary>
diff --git a/src/Eto/PlatformContext.cs b/src/Eto/PlatformContext.cs
index 88a4802e0c..4a6619dd3d 100644
--- a/src/Eto/PlatformContext.cs
+++ b/src/Eto/PlatformContext.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace Eto;
 
 /// <summary>
diff --git a/src/Eto/PlatformExtension.cs b/src/Eto/PlatformExtension.cs
index 80546802ed..4195bf280c 100644
--- a/src/Eto/PlatformExtension.cs
+++ b/src/Eto/PlatformExtension.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Reflection;
 namespace Eto;
 
 /// <summary>
diff --git a/src/Eto/Platforms.cs b/src/Eto/Platforms.cs
index b83cb13473..ab9f0e984b 100644
--- a/src/Eto/Platforms.cs
+++ b/src/Eto/Platforms.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto;
 
 /// <summary>
diff --git a/src/Eto/Properties/AssemblyInfo.cs b/src/Eto/Properties/AssemblyInfo.cs
index 098016b604..81b595c669 100644
--- a/src/Eto/Properties/AssemblyInfo.cs
+++ b/src/Eto/Properties/AssemblyInfo.cs
@@ -1,4 +1,3 @@
-using System.Reflection;
 using System;
 
 [assembly: CLSCompliant(true)]
diff --git a/src/Eto/PropertyDescriptorHelpers.cs b/src/Eto/PropertyDescriptorHelpers.cs
index 17c4cca0d8..cb6a020f4c 100644
--- a/src/Eto/PropertyDescriptorHelpers.cs
+++ b/src/Eto/PropertyDescriptorHelpers.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Reflection;
-using sc = System.ComponentModel;
-using System.ComponentModel;
-using System.Collections;
-using System.Linq;
-using System.Collections.Generic;
-
 namespace Eto;
 
 // generic property descriptor wrapper needed to support using PropertyDescriptor in .NET Standard 1.0
diff --git a/src/Eto/PropertyStore.cs b/src/Eto/PropertyStore.cs
index 8abd72e278..0ec35af82a 100644
--- a/src/Eto/PropertyStore.cs
+++ b/src/Eto/PropertyStore.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Runtime.CompilerServices;
-using System.Windows.Input;
-using Eto.Forms;
-using System.Reflection;
-
 namespace Eto;
 
 /// <summary>
diff --git a/src/Eto/RuntimeNamePropertyAttribute.cs b/src/Eto/RuntimeNamePropertyAttribute.cs
index c5d33edcd5..4b6a510ffc 100644
--- a/src/Eto/RuntimeNamePropertyAttribute.cs
+++ b/src/Eto/RuntimeNamePropertyAttribute.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Eto;
+namespace Eto;
 
 /// <summary>
 /// Attribute to specify the name property of a control for serialization
diff --git a/src/Eto/Style.cs b/src/Eto/Style.cs
index a5ca88daf4..3a59b7859c 100644
--- a/src/Eto/Style.cs
+++ b/src/Eto/Style.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Reflection;
-
 namespace Eto;
 
 /// <summary>
diff --git a/src/Eto/Threading/Thread.cs b/src/Eto/Threading/Thread.cs
index 51ce8aa78d..16e7f8e021 100644
--- a/src/Eto/Threading/Thread.cs
+++ b/src/Eto/Threading/Thread.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Eto.Threading;
 
 /// <summary>
diff --git a/src/Eto/TypeHelper.cs b/src/Eto/TypeHelper.cs
index 409f63eef7..7edd21e862 100644
--- a/src/Eto/TypeHelper.cs
+++ b/src/Eto/TypeHelper.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-
-namespace Eto
+namespace Eto
 {
 	/// <summary>
 	/// Extension methods to provide a consistent .
diff --git a/src/Eto/UnhandledExceptionEventHandler.cs b/src/Eto/UnhandledExceptionEventHandler.cs
index 7b2307558b..375cc5fc85 100644
--- a/src/Eto/UnhandledExceptionEventHandler.cs
+++ b/src/Eto/UnhandledExceptionEventHandler.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Eto;
+namespace Eto;
 
 /// <summary>
 /// Provides data for the event that is raised when there is an exception that is not handled otherwise
diff --git a/src/Eto/Widget.cs b/src/Eto/Widget.cs
index 950d2601c9..f498bc0050 100644
--- a/src/Eto/Widget.cs
+++ b/src/Eto/Widget.cs
@@ -2,11 +2,6 @@
 // uncomment to track garbage collection of widgets
 //#define TRACK_GC
 
-using System;
-using System.Globalization;
-using System.Linq.Expressions;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
 
 namespace Eto;
diff --git a/src/Eto/WidgetHandler.cs b/src/Eto/WidgetHandler.cs
index 5920c85eba..796f4d503b 100755
--- a/src/Eto/WidgetHandler.cs
+++ b/src/Eto/WidgetHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Diagnostics;
-
 namespace Eto;
 
 /// <summary>
diff --git a/src/Shared/BaseBitmapData.cs b/src/Shared/BaseBitmapData.cs
index c33de41a2a..b76d49bd15 100644
--- a/src/Shared/BaseBitmapData.cs
+++ b/src/Shared/BaseBitmapData.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Diagnostics;
-using System.Globalization;
-using Eto.Drawing;
-
 namespace Eto.Shared.Drawing
 {
 	/// <summary>
diff --git a/src/Shared/Conversions.cs b/src/Shared/Conversions.cs
index 95ace881a6..4bce1ca2d3 100644
--- a/src/Shared/Conversions.cs
+++ b/src/Shared/Conversions.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-
-
-namespace Eto
+namespace Eto
 {
 
 	/// <summary>
diff --git a/src/Shared/EmbeddedAssemblyLoader.cs b/src/Shared/EmbeddedAssemblyLoader.cs
index 5c57814d1b..4af20b9ddc 100644
--- a/src/Shared/EmbeddedAssemblyLoader.cs
+++ b/src/Shared/EmbeddedAssemblyLoader.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Reflection;
 using System.Runtime.CompilerServices;
 
 namespace Eto
diff --git a/src/Shared/EnumerableExtensions.cs b/src/Shared/EnumerableExtensions.cs
index 959ba6b4d5..14c5be7131 100644
--- a/src/Shared/EnumerableExtensions.cs
+++ b/src/Shared/EnumerableExtensions.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Collections;
-using Eto.Forms;
-using System.Linq;
-
 namespace Eto;
 
 static class EnumerableExtensions
diff --git a/src/Shared/FixedMaskedTextProviderHandler.cs b/src/Shared/FixedMaskedTextProviderHandler.cs
index 0d4740b2f4..081505b93d 100644
--- a/src/Shared/FixedMaskedTextProviderHandler.cs
+++ b/src/Shared/FixedMaskedTextProviderHandler.cs
@@ -1,10 +1,4 @@
-using System;
-using Eto.Forms;
-using System.ComponentModel;
-using System.Globalization;
-using System.Linq;
-
-namespace Eto.Shared.Forms
+namespace Eto.Shared.Forms
 {
 	public class FixedMaskedTextProviderHandler : FixedMaskedTextProvider.IHandler
 	{
diff --git a/src/Shared/GlobalAssemblyInfo.cs b/src/Shared/GlobalAssemblyInfo.cs
deleted file mode 100644
index 67606345ff..0000000000
--- a/src/Shared/GlobalAssemblyInfo.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System.Reflection;
-
-[assembly: AssemblyCompany("Picoe Software Solutions Inc.")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("(c) 2010-2018 by Curtis Wensley, 2012-2014 by Vivek Jhaveri and contributors")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
\ No newline at end of file
diff --git a/src/Shared/GradientHelper.cs b/src/Shared/GradientHelper.cs
index 5fcf3f05b4..83eb832ee6 100644
--- a/src/Shared/GradientHelper.cs
+++ b/src/Shared/GradientHelper.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Runtime.InteropServices;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Eto
+namespace Eto
 {
 	static class GradientHelper
 	{
diff --git a/src/Shared/MutableCellEventArgs.cs b/src/Shared/MutableCellEventArgs.cs
index 67d30cbd6a..4100cc469e 100644
--- a/src/Shared/MutableCellEventArgs.cs
+++ b/src/Shared/MutableCellEventArgs.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Shared
 {
 	public class MutableCellEventArgs : CellEventArgs
diff --git a/src/Shared/OpenTypeFontInfo.cs b/src/Shared/OpenTypeFontInfo.cs
index fa9cf1242c..c589e99eab 100755
--- a/src/Shared/OpenTypeFontInfo.cs
+++ b/src/Shared/OpenTypeFontInfo.cs
@@ -1,9 +1,3 @@
-using System.IO;
-using System;
-using System.Text;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Eto.Shared.Drawing
 {
 	/// <summary>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 1f3a787b85..c0556b2ccd 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\build\Common.Build.props" />
   <PropertyGroup>
     <IsPackable>False</IsPackable>
-    <BaseOutputPath>$(BasePath)artifacts\test\$(MSBuildProjectName)\</BaseOutputPath>
+    <UseGlobalUsings>true</UseGlobalUsings>
+  </PropertyGroup>
+  <Import Project="..\build\Common.Build.props" />
+  <PropertyGroup>
+    <BaseOutputPath>$(ArtifactsDir)test\$(MSBuildProjectName)\</BaseOutputPath>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/test/Eto.Test.Android/MainActivity.cs b/test/Eto.Test.Android/MainActivity.cs
index bbf22334a1..726ad82b6e 100644
--- a/test/Eto.Test.Android/MainActivity.cs
+++ b/test/Eto.Test.Android/MainActivity.cs
@@ -1,14 +1,9 @@
-using System;
 using Android.App;
 using Android.Content;
 using Android.Runtime;
 using Android.Views;
 using Android.Widget;
 using Android.OS;
-using Eto.Forms;
-using System.Linq;
-using System.Collections.ObjectModel;
-
 namespace Eto.Test.Android
 {
 	[Activity(Label = "Eto.Test.Android", MainLauncher = true, Theme = "@android:style/Theme.DeviceDefault")]
diff --git a/test/Eto.Test.Direct2D/Startup.cs b/test/Eto.Test.Direct2D/Startup.cs
index 057e18999d..91062c1e6a 100644
--- a/test/Eto.Test.Direct2D/Startup.cs
+++ b/test/Eto.Test.Direct2D/Startup.cs
@@ -1,4 +1,3 @@
-using System;
 using Eto;
 using Eto.Test;
 
diff --git a/test/Eto.Test.Gtk/Startup.cs b/test/Eto.Test.Gtk/Startup.cs
index 39a3824de4..cab1e934fc 100644
--- a/test/Eto.Test.Gtk/Startup.cs
+++ b/test/Eto.Test.Gtk/Startup.cs
@@ -1,8 +1,5 @@
 using Eto;
 using Eto.Test;
-using System;
-using System.Diagnostics;
-
 namespace Eto.Test.Gtk
 {
 	class Startup
diff --git a/test/Eto.Test.Gtk/UnitTests/NativeParentWindowTests.cs b/test/Eto.Test.Gtk/UnitTests/NativeParentWindowTests.cs
index 8371974aa5..e40dc304bd 100644
--- a/test/Eto.Test.Gtk/UnitTests/NativeParentWindowTests.cs
+++ b/test/Eto.Test.Gtk/UnitTests/NativeParentWindowTests.cs
@@ -1,8 +1,5 @@
-using System;
 using Eto.Test.UnitTests;
 using NUnit.Framework;
-using Eto.Forms;
-using System.Threading;
 using g = Gtk;
 
 
diff --git a/test/Eto.Test.Mac/Eto.Test.Mac64.csproj b/test/Eto.Test.Mac/Eto.Test.Mac64.csproj
index e9643231cf..a5a65e7a2d 100644
--- a/test/Eto.Test.Mac/Eto.Test.Mac64.csproj
+++ b/test/Eto.Test.Mac/Eto.Test.Mac64.csproj
@@ -60,6 +60,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Assets\TestContent.txt" />
+    <Content Include="TestIcon.icns" />
   </ItemGroup>
   <ItemGroup>
     <BundleResource Include="Assets\TestBundleResource.txt" />
diff --git a/test/Eto.Test.Mac/Startup.cs b/test/Eto.Test.Mac/Startup.cs
index e60585b561..ebe09a3baf 100644
--- a/test/Eto.Test.Mac/Startup.cs
+++ b/test/Eto.Test.Mac/Startup.cs
@@ -1,11 +1,7 @@
 using Eto.Mac.Forms.Controls;
 using Eto.Mac.Forms;
 using Eto.Mac;
-using System.Diagnostics;
-using Eto.Drawing;
 using Eto.Mac.Forms.ToolBar;
-using Eto.Forms;
-
 namespace Eto.Test.Mac
 {
 	class Startup
diff --git a/test/Eto.Test.Mac/UnitTests/BitmapTests.cs b/test/Eto.Test.Mac/UnitTests/BitmapTests.cs
index 6a2493710c..6b82457cfe 100644
--- a/test/Eto.Test.Mac/UnitTests/BitmapTests.cs
+++ b/test/Eto.Test.Mac/UnitTests/BitmapTests.cs
@@ -1,5 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.Test.UnitTests;
 using NUnit.Framework;
 
diff --git a/test/Eto.Test.Mac/UnitTests/ButtonTests.cs b/test/Eto.Test.Mac/UnitTests/ButtonTests.cs
index 561db4932a..1816545b97 100644
--- a/test/Eto.Test.Mac/UnitTests/ButtonTests.cs
+++ b/test/Eto.Test.Mac/UnitTests/ButtonTests.cs
@@ -1,11 +1,7 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.Mac.Forms.Controls;
 using Eto.Test.UnitTests;
 using NUnit.Framework;
 using System.Runtime.ExceptionServices;
-using System.Threading.Tasks;
 using Eto.Mac;
 
 namespace Eto.Test.Mac.UnitTests
diff --git a/test/Eto.Test.Mac/UnitTests/CheckBoxTests.cs b/test/Eto.Test.Mac/UnitTests/CheckBoxTests.cs
index 98461c8cfe..318e4135cb 100644
--- a/test/Eto.Test.Mac/UnitTests/CheckBoxTests.cs
+++ b/test/Eto.Test.Mac/UnitTests/CheckBoxTests.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.Mac.Forms.Controls;
 using Eto.Test.UnitTests;
 using NUnit.Framework;
diff --git a/test/Eto.Test.Mac/UnitTests/DrawableTests.cs b/test/Eto.Test.Mac/UnitTests/DrawableTests.cs
index c25671fa99..4598a85571 100644
--- a/test/Eto.Test.Mac/UnitTests/DrawableTests.cs
+++ b/test/Eto.Test.Mac/UnitTests/DrawableTests.cs
@@ -1,5 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.Test.UnitTests;
 using NUnit.Framework;
 
diff --git a/test/Eto.Test.Mac/UnitTests/GridViewTests.cs b/test/Eto.Test.Mac/UnitTests/GridViewTests.cs
index 87f0f7eabc..7f4f633e88 100644
--- a/test/Eto.Test.Mac/UnitTests/GridViewTests.cs
+++ b/test/Eto.Test.Mac/UnitTests/GridViewTests.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.Mac;
 using Eto.Test.UnitTests;
 using NUnit.Framework;
diff --git a/test/Eto.Test.Mac/UnitTests/IconTests.cs b/test/Eto.Test.Mac/UnitTests/IconTests.cs
index b980cf5c36..336d5213b0 100644
--- a/test/Eto.Test.Mac/UnitTests/IconTests.cs
+++ b/test/Eto.Test.Mac/UnitTests/IconTests.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Linq;
-using Eto.Drawing;
 using Eto.Test.UnitTests;
 using NUnit.Framework;
 using Eto.Mac;
diff --git a/test/Eto.Test.Mac/UnitTests/LabelTests.cs b/test/Eto.Test.Mac/UnitTests/LabelTests.cs
index aff9030d49..f550460e8a 100644
--- a/test/Eto.Test.Mac/UnitTests/LabelTests.cs
+++ b/test/Eto.Test.Mac/UnitTests/LabelTests.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.Test.UnitTests;
 using NUnit.Framework;
 
diff --git a/test/Eto.Test.Mac/UnitTests/NativeParentWindowTests.cs b/test/Eto.Test.Mac/UnitTests/NativeParentWindowTests.cs
index 6636016c6f..45c0271633 100644
--- a/test/Eto.Test.Mac/UnitTests/NativeParentWindowTests.cs
+++ b/test/Eto.Test.Mac/UnitTests/NativeParentWindowTests.cs
@@ -1,9 +1,5 @@
-using System;
 using Eto.Test.UnitTests;
 using NUnit.Framework;
-using Eto.Forms;
-using System.Threading;
-
 namespace Eto.Test.Mac.UnitTests
 {
 	[TestFixture]
diff --git a/test/Eto.Test.Mac/UnitTests/RadioButtonTests.cs b/test/Eto.Test.Mac/UnitTests/RadioButtonTests.cs
index 0ce97efc01..bf6119ba14 100644
--- a/test/Eto.Test.Mac/UnitTests/RadioButtonTests.cs
+++ b/test/Eto.Test.Mac/UnitTests/RadioButtonTests.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using Eto.Mac.Forms.Controls;
 using Eto.Test.UnitTests;
 using NUnit.Framework;
diff --git a/test/Eto.Test.Mac/UnitTests/ResourceTests.cs b/test/Eto.Test.Mac/UnitTests/ResourceTests.cs
index 53baaab56a..c22798f9ef 100644
--- a/test/Eto.Test.Mac/UnitTests/ResourceTests.cs
+++ b/test/Eto.Test.Mac/UnitTests/ResourceTests.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Diagnostics;
-using System.IO;
 using NUnit.Framework;
 
 namespace Eto.Test.Mac64.UnitTests
diff --git a/test/Eto.Test.Mac/UnitTests/RichTextAreaHandlerTests.cs b/test/Eto.Test.Mac/UnitTests/RichTextAreaHandlerTests.cs
index 7801a6d6b9..50664aef69 100644
--- a/test/Eto.Test.Mac/UnitTests/RichTextAreaHandlerTests.cs
+++ b/test/Eto.Test.Mac/UnitTests/RichTextAreaHandlerTests.cs
@@ -1,7 +1,5 @@
-using System;
-using Eto.Test.UnitTests;
+using Eto.Test.UnitTests;
 using NUnit.Framework;
-using Eto.Forms;
 using Eto.Mac.Forms.Controls;
 namespace Eto.Test.Mac.UnitTests
 {
diff --git a/test/Eto.Test.Mac/UnitTests/ScrollableTests.cs b/test/Eto.Test.Mac/UnitTests/ScrollableTests.cs
index 43ef77560e..5f1a7ccfbc 100644
--- a/test/Eto.Test.Mac/UnitTests/ScrollableTests.cs
+++ b/test/Eto.Test.Mac/UnitTests/ScrollableTests.cs
@@ -1,10 +1,7 @@
 #if blah
-using System;
 using Eto.Test.UnitTests;
 using NUnit.Framework;
-using Eto.Forms;
 using Eto.Mac.Forms.Controls;
-using Eto.Drawing;
 namespace Eto.Test.Mac.UnitTests
 {
 	[TestFixture]
diff --git a/test/Eto.Test.WinForms/Eto.Test.WinForms.csproj b/test/Eto.Test.WinForms/Eto.Test.WinForms.csproj
index ee684f06ba..c0a691886e 100644
--- a/test/Eto.Test.WinForms/Eto.Test.WinForms.csproj
+++ b/test/Eto.Test.WinForms/Eto.Test.WinForms.csproj
@@ -17,6 +17,13 @@
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
+  
+  <ItemGroup>
+    <Using Include="System.Windows.Forms" Alias="swf" />
+    <Using Include="System.Drawing" Alias="sd" />
+    <Using Include="System.Drawing.Imaging" Alias="sdi" />
+    <Using Include="System.Drawing.Drawing2D" Alias="sd2" />
+  </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net48'">
     <Reference Include="System" />
diff --git a/test/Eto.Test.WinForms/Startup.cs b/test/Eto.Test.WinForms/Startup.cs
index 02ed77af25..124f9b58d2 100644
--- a/test/Eto.Test.WinForms/Startup.cs
+++ b/test/Eto.Test.WinForms/Startup.cs
@@ -1,4 +1,3 @@
-using System;
 using Eto;
 using Eto.Test;
 
diff --git a/test/Eto.Test.WinForms/UnitTests/NativeParentWindowTests.cs b/test/Eto.Test.WinForms/UnitTests/NativeParentWindowTests.cs
index eafe49ca90..dce92f6787 100644
--- a/test/Eto.Test.WinForms/UnitTests/NativeParentWindowTests.cs
+++ b/test/Eto.Test.WinForms/UnitTests/NativeParentWindowTests.cs
@@ -1,10 +1,6 @@
-using System;
 using Eto.Test.UnitTests;
 using NUnit.Framework;
-using Eto.Forms;
-using System.Threading;
 using sw = System.Windows;
-using swf = System.Windows.Forms;
 using Eto.WinForms.Forms;
 
 namespace Eto.Test.WinForms.UnitTests
diff --git a/test/Eto.Test.Wpf/Properties/AssemblyInfo.cs b/test/Eto.Test.Wpf/Properties/AssemblyInfo.cs
index 13a57e7076..fd27addf44 100644
--- a/test/Eto.Test.Wpf/Properties/AssemblyInfo.cs
+++ b/test/Eto.Test.Wpf/Properties/AssemblyInfo.cs
@@ -1,4 +1,3 @@
-using System.Reflection;
 using System.Windows;
 
 [assembly: ThemeInfo (
diff --git a/test/Eto.Test.Wpf/Startup.cs b/test/Eto.Test.Wpf/Startup.cs
index 865d9cb18b..3de79f4fad 100644
--- a/test/Eto.Test.Wpf/Startup.cs
+++ b/test/Eto.Test.Wpf/Startup.cs
@@ -1,5 +1,4 @@
 using Eto.Wpf.Forms.Controls;
-using System;
 using System.Windows.Media;
 
 namespace Eto.Test.Wpf
diff --git a/test/Eto.Test.Wpf/UnitTests/BitmapTests.cs b/test/Eto.Test.Wpf/UnitTests/BitmapTests.cs
index 1f40801e61..325c675d8a 100755
--- a/test/Eto.Test.Wpf/UnitTests/BitmapTests.cs
+++ b/test/Eto.Test.Wpf/UnitTests/BitmapTests.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Diagnostics;
-using Eto.Drawing;
 using Eto.Test.UnitTests;
 using NUnit.Framework;
 
diff --git a/test/Eto.Test.Wpf/UnitTests/DataContextTests.cs b/test/Eto.Test.Wpf/UnitTests/DataContextTests.cs
index ba313661f6..e372b27d89 100644
--- a/test/Eto.Test.Wpf/UnitTests/DataContextTests.cs
+++ b/test/Eto.Test.Wpf/UnitTests/DataContextTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Eto.Forms;
-using Eto.Drawing;
-using Eto.Test.UnitTests;
+using Eto.Test.UnitTests;
 using NUnit.Framework;
 using static Eto.Test.UnitTests.Forms.DataContextTests;
 
diff --git a/test/Eto.Test.Wpf/UnitTests/DropDownTests.cs b/test/Eto.Test.Wpf/UnitTests/DropDownTests.cs
index 6ff7e40669..fa484b8a9c 100755
--- a/test/Eto.Test.Wpf/UnitTests/DropDownTests.cs
+++ b/test/Eto.Test.Wpf/UnitTests/DropDownTests.cs
@@ -1,4 +1,3 @@
-using Eto.Forms;
 using Eto.Test.UnitTests;
 using NUnit.Framework;
 
diff --git a/test/Eto.Test.Wpf/UnitTests/LabelTests.cs b/test/Eto.Test.Wpf/UnitTests/LabelTests.cs
index 0075699fea..2b12f2a114 100644
--- a/test/Eto.Test.Wpf/UnitTests/LabelTests.cs
+++ b/test/Eto.Test.Wpf/UnitTests/LabelTests.cs
@@ -1,13 +1,5 @@
 using Eto.Test.UnitTests;
 using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Wpf.UnitTests
 {
 	[TestFixture]
diff --git a/test/Eto.Test.Wpf/UnitTests/MenuBarTests.cs b/test/Eto.Test.Wpf/UnitTests/MenuBarTests.cs
index bf78683c58..2f733610f3 100644
--- a/test/Eto.Test.Wpf/UnitTests/MenuBarTests.cs
+++ b/test/Eto.Test.Wpf/UnitTests/MenuBarTests.cs
@@ -1,12 +1,6 @@
-using Eto.Forms;
-using Eto.Test.UnitTests;
+using Eto.Test.UnitTests;
 using Eto.Wpf.Forms.Menu;
 using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using swi = System.Windows.Input;
 
 namespace Eto.Test.Wpf.UnitTests
diff --git a/test/Eto.Test.Wpf/UnitTests/NativeParentWindowTests.cs b/test/Eto.Test.Wpf/UnitTests/NativeParentWindowTests.cs
index 1a116a88ac..64c6da902a 100644
--- a/test/Eto.Test.Wpf/UnitTests/NativeParentWindowTests.cs
+++ b/test/Eto.Test.Wpf/UnitTests/NativeParentWindowTests.cs
@@ -1,8 +1,5 @@
-using System;
 using Eto.Test.UnitTests;
 using NUnit.Framework;
-using Eto.Forms;
-using System.Threading;
 using sw = System.Windows;
 using swc = System.Windows.Controls;
 using swf = System.Windows.Forms;
diff --git a/test/Eto.Test.Wpf/UnitTests/ScreenTests.cs b/test/Eto.Test.Wpf/UnitTests/ScreenTests.cs
index a6b2dd0ac6..192b456b28 100644
--- a/test/Eto.Test.Wpf/UnitTests/ScreenTests.cs
+++ b/test/Eto.Test.Wpf/UnitTests/ScreenTests.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Eto.Drawing;
 using NUnit.Framework;
 using sd = System.Drawing;
 
diff --git a/test/Eto.Test.Wpf/UnitTests/ScrollableTests.cs b/test/Eto.Test.Wpf/UnitTests/ScrollableTests.cs
index b513c2ed28..71ce40b731 100644
--- a/test/Eto.Test.Wpf/UnitTests/ScrollableTests.cs
+++ b/test/Eto.Test.Wpf/UnitTests/ScrollableTests.cs
@@ -1,6 +1,4 @@
-using Eto.Drawing;
-using Eto.Forms;
-using Eto.Test.UnitTests;
+using Eto.Test.UnitTests;
 using NUnit.Framework;
 
 namespace Eto.Test.Wpf.UnitTests
diff --git a/test/Eto.Test.Wpf/UnitTests/TransformStackTest.cs b/test/Eto.Test.Wpf/UnitTests/TransformStackTest.cs
index b60a14d6a1..c0db5c6643 100644
--- a/test/Eto.Test.Wpf/UnitTests/TransformStackTest.cs
+++ b/test/Eto.Test.Wpf/UnitTests/TransformStackTest.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Eto.Drawing;
-using Eto.Wpf.Drawing;
+using Eto.Wpf.Drawing;
 using Eto.Test.UnitTests.Drawing;
 using NUnit.Framework;
 
diff --git a/test/Eto.Test.iOS/MainForm.cs b/test/Eto.Test.iOS/MainForm.cs
index 3f0b10fc13..808a1a700e 100644
--- a/test/Eto.Test.iOS/MainForm.cs
+++ b/test/Eto.Test.iOS/MainForm.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.Test.iOS
 {
 	public class MainForm : Form
diff --git a/test/Eto.Test.iOS/Properties/AssemblyInfo.cs b/test/Eto.Test.iOS/Properties/AssemblyInfo.cs
index 58d597383f..d4ff2f42a6 100644
--- a/test/Eto.Test.iOS/Properties/AssemblyInfo.cs
+++ b/test/Eto.Test.iOS/Properties/AssemblyInfo.cs
@@ -1,4 +1,3 @@
-using System.Reflection;
 using System.Runtime.CompilerServices;
 
 [assembly: AssemblyTitle ("Eto Test for iOS")]
diff --git a/test/Eto.Test/Commands/About.cs b/test/Eto.Test/Commands/About.cs
index bfef225d53..d6d99af8f4 100644
--- a/test/Eto.Test/Commands/About.cs
+++ b/test/Eto.Test/Commands/About.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.Test.Commands
 {
 	public class About : Command
diff --git a/test/Eto.Test/Commands/Quit.cs b/test/Eto.Test/Commands/Quit.cs
index 33eebc2215..58f33f6321 100644
--- a/test/Eto.Test/Commands/Quit.cs
+++ b/test/Eto.Test/Commands/Quit.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Test.Commands
 {
 	public class Quit : Command
diff --git a/test/Eto.Test/CultureDropDown.cs b/test/Eto.Test/CultureDropDown.cs
index eabb2c01ab..b1cf228f08 100644
--- a/test/Eto.Test/CultureDropDown.cs
+++ b/test/Eto.Test/CultureDropDown.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Globalization;
-using System.Linq;
-using Eto.Forms;
-
 namespace Eto.Test
 {
 	public class CultureDropDown : DropDown
diff --git a/test/Eto.Test/Eto.Test.csproj b/test/Eto.Test/Eto.Test.csproj
index bc8a4c40f6..c58f708ea4 100644
--- a/test/Eto.Test/Eto.Test.csproj
+++ b/test/Eto.Test/Eto.Test.csproj
@@ -3,6 +3,7 @@
     <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);PCL</DefineConstants>
+    <LangVersion>10</LangVersion>
   </PropertyGroup>
   
   <PropertyGroup>
@@ -10,6 +11,14 @@
     <Description>An example application and Unit Tests for Eto.Forms.</Description>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Using Include="System" />
+    <Using Include="System.Collections" />
+    <Using Include="System.Collections.Generic" />
+    <Using Include="System.Linq" />
+    <Using Include="System.IO" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="..\..\src\Eto\Helper.cs">
       <Link>Helper.cs</Link>
diff --git a/test/Eto.Test/Handlers/TabControlHandler.cs b/test/Eto.Test/Handlers/TabControlHandler.cs
index 3f30cff7b4..115f30bffa 100644
--- a/test/Eto.Test/Handlers/TabControlHandler.cs
+++ b/test/Eto.Test/Handlers/TabControlHandler.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Handlers
 {
 	public class TabControlHandler : ThemedContainerHandler<Container, TabControl, TabControl.ICallback>, TabControl.IHandler
diff --git a/test/Eto.Test/Handlers/TabPageHandler.cs b/test/Eto.Test/Handlers/TabPageHandler.cs
index da26821159..b0e3f4d000 100644
--- a/test/Eto.Test/Handlers/TabPageHandler.cs
+++ b/test/Eto.Test/Handlers/TabPageHandler.cs
@@ -1,7 +1,4 @@
-using Eto.Drawing;
-using Eto.Forms;
-
-namespace Eto.Test.Handlers
+namespace Eto.Test.Handlers
 {
 	class TabPageHandler : ThemedContainerHandler<Panel, TabPage, TabPage.ICallback>, TabPage.IHandler
     {
diff --git a/test/Eto.Test/Log.cs b/test/Eto.Test/Log.cs
index 07b359da22..662b633199 100644
--- a/test/Eto.Test/Log.cs
+++ b/test/Eto.Test/Log.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Text;
-using Eto.Forms;
-using System.Diagnostics;
-
 namespace Eto.Test
 {
 	public static class Log
diff --git a/test/Eto.Test/MainForm.cs b/test/Eto.Test/MainForm.cs
index b5c8639440..5ac6cf1e18 100644
--- a/test/Eto.Test/MainForm.cs
+++ b/test/Eto.Test/MainForm.cs
@@ -1,14 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Threading.Tasks;
-using System.Linq;
-using System.Runtime.InteropServices;
-
 namespace Eto.Test
 {
 	public class MainForm : Form
diff --git a/test/Eto.Test/PointEntry.cs b/test/Eto.Test/PointEntry.cs
index 47b3326193..14e2dfe7d8 100644
--- a/test/Eto.Test/PointEntry.cs
+++ b/test/Eto.Test/PointEntry.cs
@@ -1,7 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-using System;
-
 namespace Eto.Test
 {
 	/// <summary>
diff --git a/test/Eto.Test/SectionList.cs b/test/Eto.Test/SectionList.cs
index 14a43e225d..cbccd45bf9 100644
--- a/test/Eto.Test/SectionList.cs
+++ b/test/Eto.Test/SectionList.cs
@@ -1,9 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Collections.Generic;
-using System.Linq;
-using Eto.Drawing;
-
 namespace Eto.Test
 {
 	public interface ISectionName
diff --git a/test/Eto.Test/Sections/Behaviors/AllControlsBase.cs b/test/Eto.Test/Sections/Behaviors/AllControlsBase.cs
index 218bd0b48a..df5a9142b8 100644
--- a/test/Eto.Test/Sections/Behaviors/AllControlsBase.cs
+++ b/test/Eto.Test/Sections/Behaviors/AllControlsBase.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Behaviors
 {
 	public class AllControlsBase : Panel
diff --git a/test/Eto.Test/Sections/Behaviors/BadgeLabelSection.cs b/test/Eto.Test/Sections/Behaviors/BadgeLabelSection.cs
index c0569703fe..381c7c7365 100644
--- a/test/Eto.Test/Sections/Behaviors/BadgeLabelSection.cs
+++ b/test/Eto.Test/Sections/Behaviors/BadgeLabelSection.cs
@@ -1,6 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Behaviors
 {
 	[Section("Behaviors", "Badge Label")]
diff --git a/test/Eto.Test/Sections/Behaviors/ClipboardSection.cs b/test/Eto.Test/Sections/Behaviors/ClipboardSection.cs
index 0bdd54f40b..87def57b35 100644
--- a/test/Eto.Test/Sections/Behaviors/ClipboardSection.cs
+++ b/test/Eto.Test/Sections/Behaviors/ClipboardSection.cs
@@ -1,9 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Text;
-using Eto.Drawing;
-using System.Linq;
-
 namespace Eto.Test.Sections.Behaviors
 {
 	[Section("Behaviors", "Clipboard")]
diff --git a/test/Eto.Test/Sections/Behaviors/ContextMenuSection.cs b/test/Eto.Test/Sections/Behaviors/ContextMenuSection.cs
index 5dc7633c38..00e269ee05 100644
--- a/test/Eto.Test/Sections/Behaviors/ContextMenuSection.cs
+++ b/test/Eto.Test/Sections/Behaviors/ContextMenuSection.cs
@@ -1,8 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-using System.Linq;
-using System;
-
 namespace Eto.Test.Sections.Behaviors
 {
 	[Section("Behaviors", "ContextMenu")]
diff --git a/test/Eto.Test/Sections/Behaviors/CursorSection.cs b/test/Eto.Test/Sections/Behaviors/CursorSection.cs
index 8a2555031b..517037e7ff 100644
--- a/test/Eto.Test/Sections/Behaviors/CursorSection.cs
+++ b/test/Eto.Test/Sections/Behaviors/CursorSection.cs
@@ -1,9 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Linq;
-using Eto.Drawing;
-using System.Collections.Generic;
-
 namespace Eto.Test.Sections.Behaviors
 {
 	[Section("Behaviors", typeof(Cursor))]
diff --git a/test/Eto.Test/Sections/Behaviors/DragDropSection.cs b/test/Eto.Test/Sections/Behaviors/DragDropSection.cs
index 10caedd8c5..7c13796ce2 100644
--- a/test/Eto.Test/Sections/Behaviors/DragDropSection.cs
+++ b/test/Eto.Test/Sections/Behaviors/DragDropSection.cs
@@ -1,11 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Text;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Linq;
-using System.Collections.ObjectModel;
-
 namespace Eto.Test.Sections.Behaviors
 {
 	[Section("Behaviors", "Drag and Drop")]
diff --git a/test/Eto.Test/Sections/Behaviors/DynamicFocusSection.cs b/test/Eto.Test/Sections/Behaviors/DynamicFocusSection.cs
index d6e3ee9314..4a6d2c1a07 100644
--- a/test/Eto.Test/Sections/Behaviors/DynamicFocusSection.cs
+++ b/test/Eto.Test/Sections/Behaviors/DynamicFocusSection.cs
@@ -1,12 +1,4 @@
-using Eto.Drawing;
-using Eto.Forms;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Eto.Test.Sections.Behaviors
+namespace Eto.Test.Sections.Behaviors
 {
 	[Section("Behaviors", "Dynamic Focus")]
 	public class DynamicFocusSection : Panel
diff --git a/test/Eto.Test/Sections/Behaviors/DynamicMenuBarSection.cs b/test/Eto.Test/Sections/Behaviors/DynamicMenuBarSection.cs
index 2168909873..89679cc687 100644
--- a/test/Eto.Test/Sections/Behaviors/DynamicMenuBarSection.cs
+++ b/test/Eto.Test/Sections/Behaviors/DynamicMenuBarSection.cs
@@ -1,11 +1,4 @@
-using System;
-using Eto.Forms;
-using System.Linq;
-using Eto.Drawing;
-using System.ComponentModel;
-
-
-namespace Eto.Test.Sections.Behaviors
+namespace Eto.Test.Sections.Behaviors
 {
 	[Section("Behaviors", "Dynamic MenuBar")]
 	public class DynamicMenuBarSection : Panel, INotifyPropertyChanged
diff --git a/test/Eto.Test/Sections/Behaviors/FocusEventsSection.cs b/test/Eto.Test/Sections/Behaviors/FocusEventsSection.cs
index 83db4d376d..99f28d087f 100644
--- a/test/Eto.Test/Sections/Behaviors/FocusEventsSection.cs
+++ b/test/Eto.Test/Sections/Behaviors/FocusEventsSection.cs
@@ -1,5 +1,3 @@
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Behaviors
 {
 	[Section("Behaviors", "Focus Events")]
diff --git a/test/Eto.Test/Sections/Behaviors/KeyEventsSection.cs b/test/Eto.Test/Sections/Behaviors/KeyEventsSection.cs
index e146d6d435..346761b56f 100644
--- a/test/Eto.Test/Sections/Behaviors/KeyEventsSection.cs
+++ b/test/Eto.Test/Sections/Behaviors/KeyEventsSection.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Behaviors
 {
 	[Section("Behaviors", "Key Events")]
diff --git a/test/Eto.Test/Sections/Behaviors/MouseEventsSection.cs b/test/Eto.Test/Sections/Behaviors/MouseEventsSection.cs
index e788313b97..95baecc283 100644
--- a/test/Eto.Test/Sections/Behaviors/MouseEventsSection.cs
+++ b/test/Eto.Test/Sections/Behaviors/MouseEventsSection.cs
@@ -1,6 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Behaviors
 {
 	[Section("Behaviors", "Mouse Events")]
diff --git a/test/Eto.Test/Sections/Behaviors/MousePositionSection.cs b/test/Eto.Test/Sections/Behaviors/MousePositionSection.cs
index 41b592f7ba..10117cd398 100644
--- a/test/Eto.Test/Sections/Behaviors/MousePositionSection.cs
+++ b/test/Eto.Test/Sections/Behaviors/MousePositionSection.cs
@@ -1,7 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-using System;
-
 namespace Eto.Test.Sections.Behaviors
 {
 	[Section("Behaviors", "Mouse Position", Requires = typeof(Mouse))]
diff --git a/test/Eto.Test/Sections/Behaviors/NotificationSection.cs b/test/Eto.Test/Sections/Behaviors/NotificationSection.cs
index d19399d8b9..08c7e5a10a 100644
--- a/test/Eto.Test/Sections/Behaviors/NotificationSection.cs
+++ b/test/Eto.Test/Sections/Behaviors/NotificationSection.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Behaviors
 {
 	[Section("Behaviors", typeof(Notification))]
diff --git a/test/Eto.Test/Sections/Behaviors/RestartSection.cs b/test/Eto.Test/Sections/Behaviors/RestartSection.cs
index fcffba0493..dcaa06573a 100644
--- a/test/Eto.Test/Sections/Behaviors/RestartSection.cs
+++ b/test/Eto.Test/Sections/Behaviors/RestartSection.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Behaviors
 {
 	[Section("Behaviors", "Restart")]
diff --git a/test/Eto.Test/Sections/Behaviors/ScreenSection.cs b/test/Eto.Test/Sections/Behaviors/ScreenSection.cs
index f3e8a0b9c3..8691710f5f 100755
--- a/test/Eto.Test/Sections/Behaviors/ScreenSection.cs
+++ b/test/Eto.Test/Sections/Behaviors/ScreenSection.cs
@@ -1,9 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Linq;
-using System.Collections.Generic;
-
 namespace Eto.Test.Sections.Behaviors
 {
 	/// <summary>
diff --git a/test/Eto.Test/Sections/Behaviors/TabIndexSection.cs b/test/Eto.Test/Sections/Behaviors/TabIndexSection.cs
index 81dee7ae93..7546c81b4d 100644
--- a/test/Eto.Test/Sections/Behaviors/TabIndexSection.cs
+++ b/test/Eto.Test/Sections/Behaviors/TabIndexSection.cs
@@ -1,6 +1,4 @@
-using System;
-using Eto.Forms;
-namespace Eto.Test.Sections.Behaviors
+namespace Eto.Test.Sections.Behaviors
 {
 	[Section("Behaviors", "TabIndex")]
 	public class TabIndexSection : Panel
diff --git a/test/Eto.Test/Sections/Behaviors/TaskbarSection.cs b/test/Eto.Test/Sections/Behaviors/TaskbarSection.cs
index 3de3014d01..a69b6cb5c0 100644
--- a/test/Eto.Test/Sections/Behaviors/TaskbarSection.cs
+++ b/test/Eto.Test/Sections/Behaviors/TaskbarSection.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
-namespace Eto.Test.Sections.Behaviors
+namespace Eto.Test.Sections.Behaviors
 {
     [Section("Behaviors", typeof(Taskbar))]
     public class TaskbarSection : Panel
diff --git a/test/Eto.Test/Sections/Behaviors/ToolBarSection.cs b/test/Eto.Test/Sections/Behaviors/ToolBarSection.cs
index eefe105e78..c3c592db30 100644
--- a/test/Eto.Test/Sections/Behaviors/ToolBarSection.cs
+++ b/test/Eto.Test/Sections/Behaviors/ToolBarSection.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Behaviors
 {
 	[Section("Behaviors", typeof(ToolBar))]
diff --git a/test/Eto.Test/Sections/Behaviors/TrayIndicatorSection.cs b/test/Eto.Test/Sections/Behaviors/TrayIndicatorSection.cs
index 4490742e24..fe3af2e1fd 100644
--- a/test/Eto.Test/Sections/Behaviors/TrayIndicatorSection.cs
+++ b/test/Eto.Test/Sections/Behaviors/TrayIndicatorSection.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Behaviors
 {
 	[Section("Behaviors", typeof(TrayIndicator))]
diff --git a/test/Eto.Test/Sections/Behaviors/WindowsSection.cs b/test/Eto.Test/Sections/Behaviors/WindowsSection.cs
index 71e740b040..e0fd6d6202 100644
--- a/test/Eto.Test/Sections/Behaviors/WindowsSection.cs
+++ b/test/Eto.Test/Sections/Behaviors/WindowsSection.cs
@@ -1,8 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-using System;
-using System.Linq;
-using System.ComponentModel;
 using System.Runtime.CompilerServices;
 
 namespace Eto.Test.Sections.Behaviors
diff --git a/test/Eto.Test/Sections/Controls/ButtonSection.cs b/test/Eto.Test/Sections/Controls/ButtonSection.cs
index a77ca2356d..848fe84b53 100644
--- a/test/Eto.Test/Sections/Controls/ButtonSection.cs
+++ b/test/Eto.Test/Sections/Controls/ButtonSection.cs
@@ -1,8 +1,4 @@
-using Eto.Drawing;
-using Eto.Forms;
-using System.ComponentModel;
-
-namespace Eto.Test.Sections.Controls
+namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(Button))]
 	public class ButtonSection : Scrollable, INotifyPropertyChanged
diff --git a/test/Eto.Test/Sections/Controls/CalendarSection.cs b/test/Eto.Test/Sections/Controls/CalendarSection.cs
index f7c4fc0bf9..370d0403f6 100644
--- a/test/Eto.Test/Sections/Controls/CalendarSection.cs
+++ b/test/Eto.Test/Sections/Controls/CalendarSection.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(Calendar))]
diff --git a/test/Eto.Test/Sections/Controls/CheckBoxListSection.cs b/test/Eto.Test/Sections/Controls/CheckBoxListSection.cs
index 1a9fc8e3c4..646e80a254 100644
--- a/test/Eto.Test/Sections/Controls/CheckBoxListSection.cs
+++ b/test/Eto.Test/Sections/Controls/CheckBoxListSection.cs
@@ -1,7 +1,3 @@
-using System.Linq;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(CheckBoxList))]
diff --git a/test/Eto.Test/Sections/Controls/CheckBoxSection.cs b/test/Eto.Test/Sections/Controls/CheckBoxSection.cs
index 09e6ed80e6..6c5eb6c9c0 100644
--- a/test/Eto.Test/Sections/Controls/CheckBoxSection.cs
+++ b/test/Eto.Test/Sections/Controls/CheckBoxSection.cs
@@ -1,7 +1,4 @@
-using Eto.Drawing;
-using Eto.Forms;
-
-namespace Eto.Test.Sections.Controls
+namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(CheckBox))]
 	public class CheckBoxSection : Scrollable
diff --git a/test/Eto.Test/Sections/Controls/ColorPickerSection.cs b/test/Eto.Test/Sections/Controls/ColorPickerSection.cs
index fcb0866b37..0f92706eb1 100644
--- a/test/Eto.Test/Sections/Controls/ColorPickerSection.cs
+++ b/test/Eto.Test/Sections/Controls/ColorPickerSection.cs
@@ -1,7 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-using System.ComponentModel;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(ColorPicker))]
diff --git a/test/Eto.Test/Sections/Controls/ComboBoxSection.cs b/test/Eto.Test/Sections/Controls/ComboBoxSection.cs
index 5af5f01381..d436da034e 100644
--- a/test/Eto.Test/Sections/Controls/ComboBoxSection.cs
+++ b/test/Eto.Test/Sections/Controls/ComboBoxSection.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(ComboBox))]
diff --git a/test/Eto.Test/Sections/Controls/ControlColorsSection.cs b/test/Eto.Test/Sections/Controls/ControlColorsSection.cs
index 190f784f2c..4597e534d5 100644
--- a/test/Eto.Test/Sections/Controls/ControlColorsSection.cs
+++ b/test/Eto.Test/Sections/Controls/ControlColorsSection.cs
@@ -1,9 +1,4 @@
-using Eto.Forms;
-using Eto.Drawing;
 using Eto.Test.Sections.Behaviors;
-using System.Collections.Generic;
-using System;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", "Control Font & Colors")]
diff --git a/test/Eto.Test/Sections/Controls/DateTimePickerSection.cs b/test/Eto.Test/Sections/Controls/DateTimePickerSection.cs
index e7f6bd406d..72d66c14dd 100644
--- a/test/Eto.Test/Sections/Controls/DateTimePickerSection.cs
+++ b/test/Eto.Test/Sections/Controls/DateTimePickerSection.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(DateTimePicker))]
diff --git a/test/Eto.Test/Sections/Controls/DocumentControlSection.cs b/test/Eto.Test/Sections/Controls/DocumentControlSection.cs
index 97acceadba..60664c5730 100644
--- a/test/Eto.Test/Sections/Controls/DocumentControlSection.cs
+++ b/test/Eto.Test/Sections/Controls/DocumentControlSection.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
-namespace Eto.Test.Sections.Controls
+namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(DocumentControl))]
 	public class DocumentControlSection : Panel
diff --git a/test/Eto.Test/Sections/Controls/DrawableSection.cs b/test/Eto.Test/Sections/Controls/DrawableSection.cs
index abf4fe5735..74362881b8 100644
--- a/test/Eto.Test/Sections/Controls/DrawableSection.cs
+++ b/test/Eto.Test/Sections/Controls/DrawableSection.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(Drawable))]
diff --git a/test/Eto.Test/Sections/Controls/DropDownSection.cs b/test/Eto.Test/Sections/Controls/DropDownSection.cs
index 6d0519e754..ef93bf68de 100644
--- a/test/Eto.Test/Sections/Controls/DropDownSection.cs
+++ b/test/Eto.Test/Sections/Controls/DropDownSection.cs
@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(DropDown))]
diff --git a/test/Eto.Test/Sections/Controls/ExpanderSection.cs b/test/Eto.Test/Sections/Controls/ExpanderSection.cs
index 85b1a06ab5..ff06c69801 100644
--- a/test/Eto.Test/Sections/Controls/ExpanderSection.cs
+++ b/test/Eto.Test/Sections/Controls/ExpanderSection.cs
@@ -1,7 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-using System.ComponentModel;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(Expander))]
diff --git a/test/Eto.Test/Sections/Controls/FilePickerSection.cs b/test/Eto.Test/Sections/Controls/FilePickerSection.cs
index ace0ad5b40..a5d8372afa 100644
--- a/test/Eto.Test/Sections/Controls/FilePickerSection.cs
+++ b/test/Eto.Test/Sections/Controls/FilePickerSection.cs
@@ -1,7 +1,4 @@
-using Eto.Drawing;
-using Eto.Forms;
-
-namespace Eto.Test.Sections.Controls
+namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(FilePicker))]
 	public class FilePickerSection : Panel
diff --git a/test/Eto.Test/Sections/Controls/FontPickerSection.cs b/test/Eto.Test/Sections/Controls/FontPickerSection.cs
index b2be2d9c29..f14e235ada 100644
--- a/test/Eto.Test/Sections/Controls/FontPickerSection.cs
+++ b/test/Eto.Test/Sections/Controls/FontPickerSection.cs
@@ -1,9 +1,4 @@
-using System;
-using System.ComponentModel;
-using Eto.Drawing;
-using Eto.Forms;
-
-namespace Eto.Test.Sections.Controls
+namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(FontPicker))]
 	public class FontPickerSection : Panel
diff --git a/test/Eto.Test/Sections/Controls/GridCellFormattingSection.cs b/test/Eto.Test/Sections/Controls/GridCellFormattingSection.cs
index 84e841c071..378e9f4292 100644
--- a/test/Eto.Test/Sections/Controls/GridCellFormattingSection.cs
+++ b/test/Eto.Test/Sections/Controls/GridCellFormattingSection.cs
@@ -1,7 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-using System;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(GridView), "GridView Formatting")]
diff --git a/test/Eto.Test/Sections/Controls/GridViewSection.cs b/test/Eto.Test/Sections/Controls/GridViewSection.cs
index 36f69cc593..2a53efcc2b 100644
--- a/test/Eto.Test/Sections/Controls/GridViewSection.cs
+++ b/test/Eto.Test/Sections/Controls/GridViewSection.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Linq;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-using System.ComponentModel;
 using System.Runtime.CompilerServices;
 
 namespace Eto.Test.Sections.Controls
diff --git a/test/Eto.Test/Sections/Controls/GroupBoxSection.cs b/test/Eto.Test/Sections/Controls/GroupBoxSection.cs
index bf986d608f..8aed981ce3 100644
--- a/test/Eto.Test/Sections/Controls/GroupBoxSection.cs
+++ b/test/Eto.Test/Sections/Controls/GroupBoxSection.cs
@@ -1,6 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(GroupBox))]
diff --git a/test/Eto.Test/Sections/Controls/ImageViewSection.cs b/test/Eto.Test/Sections/Controls/ImageViewSection.cs
index b49a8f7d9e..d27d8b0908 100644
--- a/test/Eto.Test/Sections/Controls/ImageViewSection.cs
+++ b/test/Eto.Test/Sections/Controls/ImageViewSection.cs
@@ -1,6 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(ImageView))]
diff --git a/test/Eto.Test/Sections/Controls/KitchenSinkSection.cs b/test/Eto.Test/Sections/Controls/KitchenSinkSection.cs
index 1b269b0824..cd90d35b45 100644
--- a/test/Eto.Test/Sections/Controls/KitchenSinkSection.cs
+++ b/test/Eto.Test/Sections/Controls/KitchenSinkSection.cs
@@ -1,9 +1,4 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-using System.Collections.Generic;
-
-namespace Eto.Test.Sections.Controls
+namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", "Kitchen Sink")]
 	public class KitchenSinkSection : Panel
diff --git a/test/Eto.Test/Sections/Controls/LabelSection.cs b/test/Eto.Test/Sections/Controls/LabelSection.cs
index 374ec99efa..cf737acb2c 100644
--- a/test/Eto.Test/Sections/Controls/LabelSection.cs
+++ b/test/Eto.Test/Sections/Controls/LabelSection.cs
@@ -1,7 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-using System;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(Label))]
diff --git a/test/Eto.Test/Sections/Controls/LinkButtonSection.cs b/test/Eto.Test/Sections/Controls/LinkButtonSection.cs
index d6c8548df5..4b45637062 100644
--- a/test/Eto.Test/Sections/Controls/LinkButtonSection.cs
+++ b/test/Eto.Test/Sections/Controls/LinkButtonSection.cs
@@ -1,7 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-using System.ComponentModel;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(LinkButton))]
diff --git a/test/Eto.Test/Sections/Controls/ListBoxSection.cs b/test/Eto.Test/Sections/Controls/ListBoxSection.cs
index 6c032c8991..c5a098b666 100644
--- a/test/Eto.Test/Sections/Controls/ListBoxSection.cs
+++ b/test/Eto.Test/Sections/Controls/ListBoxSection.cs
@@ -1,8 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Collections;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(ListBox))]
diff --git a/test/Eto.Test/Sections/Controls/MaskedTextBoxSection.cs b/test/Eto.Test/Sections/Controls/MaskedTextBoxSection.cs
index ca5a9d1ab0..84a1b17809 100644
--- a/test/Eto.Test/Sections/Controls/MaskedTextBoxSection.cs
+++ b/test/Eto.Test/Sections/Controls/MaskedTextBoxSection.cs
@@ -1,10 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Diagnostics;
-using Eto.Drawing;
-using System.Linq;
-using System.Globalization;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(MaskedTextBox))]
diff --git a/test/Eto.Test/Sections/Controls/MaskedTextStepperSection.cs b/test/Eto.Test/Sections/Controls/MaskedTextStepperSection.cs
index a16b7c2460..7f6801abba 100644
--- a/test/Eto.Test/Sections/Controls/MaskedTextStepperSection.cs
+++ b/test/Eto.Test/Sections/Controls/MaskedTextStepperSection.cs
@@ -1,9 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Diagnostics;
-using Eto.Drawing;
-using System.Linq;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(MaskedTextStepper))]
diff --git a/test/Eto.Test/Sections/Controls/NumericStepperSection.cs b/test/Eto.Test/Sections/Controls/NumericStepperSection.cs
index f6134071ed..9447ad069f 100644
--- a/test/Eto.Test/Sections/Controls/NumericStepperSection.cs
+++ b/test/Eto.Test/Sections/Controls/NumericStepperSection.cs
@@ -1,11 +1,4 @@
 using Eto.Drawing;
-using Eto.Forms;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Reflection;
-using System.Linq;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(NumericStepper))]
diff --git a/test/Eto.Test/Sections/Controls/PasswordBoxSection.cs b/test/Eto.Test/Sections/Controls/PasswordBoxSection.cs
index 15253abe33..7eb9787c81 100644
--- a/test/Eto.Test/Sections/Controls/PasswordBoxSection.cs
+++ b/test/Eto.Test/Sections/Controls/PasswordBoxSection.cs
@@ -1,6 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(PasswordBox))]
diff --git a/test/Eto.Test/Sections/Controls/ProgressBarSection.cs b/test/Eto.Test/Sections/Controls/ProgressBarSection.cs
index e6198590b7..9fde83a684 100644
--- a/test/Eto.Test/Sections/Controls/ProgressBarSection.cs
+++ b/test/Eto.Test/Sections/Controls/ProgressBarSection.cs
@@ -1,6 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(ProgressBar))]
diff --git a/test/Eto.Test/Sections/Controls/PropertyCellSection.cs b/test/Eto.Test/Sections/Controls/PropertyCellSection.cs
index bc51b56232..7cc50bd8f9 100644
--- a/test/Eto.Test/Sections/Controls/PropertyCellSection.cs
+++ b/test/Eto.Test/Sections/Controls/PropertyCellSection.cs
@@ -1,11 +1,4 @@
-using System;
-using Eto.Forms;
-using System.Windows.Input;
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
-using Eto.Drawing;
-using System.Diagnostics;
-
+using System.Runtime.CompilerServices;
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", "PropertyCell")]
diff --git a/test/Eto.Test/Sections/Controls/PropertyGridSection.cs b/test/Eto.Test/Sections/Controls/PropertyGridSection.cs
index 2085b752ef..eb147797b8 100644
--- a/test/Eto.Test/Sections/Controls/PropertyGridSection.cs
+++ b/test/Eto.Test/Sections/Controls/PropertyGridSection.cs
@@ -1,12 +1,4 @@
-using System;
-using System.Globalization;
-using System.ComponentModel;
-using System.Collections.Generic;
-using Eto.Drawing;
-using Eto.Forms;
-using System.Linq;
-using sc = System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Eto.Test.Sections.Controls
 {
diff --git a/test/Eto.Test/Sections/Controls/RadioButtonListSection.cs b/test/Eto.Test/Sections/Controls/RadioButtonListSection.cs
index 41861b755b..8e7c0af422 100644
--- a/test/Eto.Test/Sections/Controls/RadioButtonListSection.cs
+++ b/test/Eto.Test/Sections/Controls/RadioButtonListSection.cs
@@ -1,6 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(RadioButtonList))]
diff --git a/test/Eto.Test/Sections/Controls/RadioButtonSection.cs b/test/Eto.Test/Sections/Controls/RadioButtonSection.cs
index 4becf14233..6037416b36 100644
--- a/test/Eto.Test/Sections/Controls/RadioButtonSection.cs
+++ b/test/Eto.Test/Sections/Controls/RadioButtonSection.cs
@@ -1,7 +1,4 @@
-using Eto.Drawing;
-using Eto.Forms;
-
-namespace Eto.Test.Sections.Controls
+namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(RadioButton))]
 	public class RadioButtonSection : Panel
diff --git a/test/Eto.Test/Sections/Controls/RichTextAreaSection.cs b/test/Eto.Test/Sections/Controls/RichTextAreaSection.cs
index 433ecff4b6..61acbdfad8 100644
--- a/test/Eto.Test/Sections/Controls/RichTextAreaSection.cs
+++ b/test/Eto.Test/Sections/Controls/RichTextAreaSection.cs
@@ -1,10 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using System.IO;
-using System.Text;
-using System.Linq;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(RichTextArea))]
diff --git a/test/Eto.Test/Sections/Controls/ScrollableSection.cs b/test/Eto.Test/Sections/Controls/ScrollableSection.cs
index bb096b3765..6481c79b64 100644
--- a/test/Eto.Test/Sections/Controls/ScrollableSection.cs
+++ b/test/Eto.Test/Sections/Controls/ScrollableSection.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(Scrollable))]
diff --git a/test/Eto.Test/Sections/Controls/SegmentedButtonSection.cs b/test/Eto.Test/Sections/Controls/SegmentedButtonSection.cs
index 68f010023b..e3bcdc3bfe 100644
--- a/test/Eto.Test/Sections/Controls/SegmentedButtonSection.cs
+++ b/test/Eto.Test/Sections/Controls/SegmentedButtonSection.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Linq;
-using System.Windows.Input;
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(SegmentedButton))]
diff --git a/test/Eto.Test/Sections/Controls/SliderSection.cs b/test/Eto.Test/Sections/Controls/SliderSection.cs
index 2e4cadfda4..aeb32b7323 100644
--- a/test/Eto.Test/Sections/Controls/SliderSection.cs
+++ b/test/Eto.Test/Sections/Controls/SliderSection.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(Slider))]
diff --git a/test/Eto.Test/Sections/Controls/SpinnerSection.cs b/test/Eto.Test/Sections/Controls/SpinnerSection.cs
index cd00f82ded..e3b130c8f7 100644
--- a/test/Eto.Test/Sections/Controls/SpinnerSection.cs
+++ b/test/Eto.Test/Sections/Controls/SpinnerSection.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(Spinner))]
diff --git a/test/Eto.Test/Sections/Controls/SplitterSection.cs b/test/Eto.Test/Sections/Controls/SplitterSection.cs
index 4182fe603d..0d2d404a23 100644
--- a/test/Eto.Test/Sections/Controls/SplitterSection.cs
+++ b/test/Eto.Test/Sections/Controls/SplitterSection.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(Splitter))]
diff --git a/test/Eto.Test/Sections/Controls/StepperSection.cs b/test/Eto.Test/Sections/Controls/StepperSection.cs
index 2723056589..dd186053a8 100644
--- a/test/Eto.Test/Sections/Controls/StepperSection.cs
+++ b/test/Eto.Test/Sections/Controls/StepperSection.cs
@@ -1,6 +1,4 @@
-using System;
-using Eto.Forms;
-namespace Eto.Test.Sections.Controls
+namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(Stepper))]
 	public class StepperSection : Panel
diff --git a/test/Eto.Test/Sections/Controls/TabControlSection.cs b/test/Eto.Test/Sections/Controls/TabControlSection.cs
index e3f7237f64..c843814d0f 100644
--- a/test/Eto.Test/Sections/Controls/TabControlSection.cs
+++ b/test/Eto.Test/Sections/Controls/TabControlSection.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
-namespace Eto.Test.Sections.Controls
+namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(TabControl))]
 	public class TabControlSection : Panel
diff --git a/test/Eto.Test/Sections/Controls/TextAreaSection.cs b/test/Eto.Test/Sections/Controls/TextAreaSection.cs
index eb8d9736b3..fa78446152 100644
--- a/test/Eto.Test/Sections/Controls/TextAreaSection.cs
+++ b/test/Eto.Test/Sections/Controls/TextAreaSection.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Linq;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(TextArea))]
diff --git a/test/Eto.Test/Sections/Controls/TextBoxSection.cs b/test/Eto.Test/Sections/Controls/TextBoxSection.cs
index 00219bd37f..9d0f329707 100755
--- a/test/Eto.Test/Sections/Controls/TextBoxSection.cs
+++ b/test/Eto.Test/Sections/Controls/TextBoxSection.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(TextBox))]
diff --git a/test/Eto.Test/Sections/Controls/TextStepperSection.cs b/test/Eto.Test/Sections/Controls/TextStepperSection.cs
index a3618036ae..ef670ed312 100644
--- a/test/Eto.Test/Sections/Controls/TextStepperSection.cs
+++ b/test/Eto.Test/Sections/Controls/TextStepperSection.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
-namespace Eto.Test.Sections.Controls
+namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(TextStepper))]
 	public class TextStepperSection : Scrollable
diff --git a/test/Eto.Test/Sections/Controls/ToggleButtonSection.cs b/test/Eto.Test/Sections/Controls/ToggleButtonSection.cs
index d886287470..b2bc3705fd 100755
--- a/test/Eto.Test/Sections/Controls/ToggleButtonSection.cs
+++ b/test/Eto.Test/Sections/Controls/ToggleButtonSection.cs
@@ -1,9 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Text;
-using System.ComponentModel;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(ToggleButton))]
diff --git a/test/Eto.Test/Sections/Controls/TreeGridViewSection.cs b/test/Eto.Test/Sections/Controls/TreeGridViewSection.cs
index d1b671af65..5fbc4e0710 100644
--- a/test/Eto.Test/Sections/Controls/TreeGridViewSection.cs
+++ b/test/Eto.Test/Sections/Controls/TreeGridViewSection.cs
@@ -1,11 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Threading.Tasks;
-using System.Linq;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(TreeGridView))]
diff --git a/test/Eto.Test/Sections/Controls/TreeViewSection.cs b/test/Eto.Test/Sections/Controls/TreeViewSection.cs
index 6f576633c6..030fb37795 100644
--- a/test/Eto.Test/Sections/Controls/TreeViewSection.cs
+++ b/test/Eto.Test/Sections/Controls/TreeViewSection.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Linq;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Obsolete("Since 2.4")]
diff --git a/test/Eto.Test/Sections/Controls/WebViewSection.cs b/test/Eto.Test/Sections/Controls/WebViewSection.cs
index bb309fec07..27e5c8611d 100644
--- a/test/Eto.Test/Sections/Controls/WebViewSection.cs
+++ b/test/Eto.Test/Sections/Controls/WebViewSection.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Controls
 {
 	[Section("Controls", typeof(WebView))]
diff --git a/test/Eto.Test/Sections/Dialogs/AboutDialogSection.cs b/test/Eto.Test/Sections/Dialogs/AboutDialogSection.cs
index b8a5a91d2d..257945308e 100644
--- a/test/Eto.Test/Sections/Dialogs/AboutDialogSection.cs
+++ b/test/Eto.Test/Sections/Dialogs/AboutDialogSection.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
-namespace Eto.Test.Sections.Dialogs
+namespace Eto.Test.Sections.Dialogs
 {
 	[Section("Dialogs", typeof(AboutDialog))]
 	public class AboutDialogSection : Panel
diff --git a/test/Eto.Test/Sections/Dialogs/ColorDialogSection.cs b/test/Eto.Test/Sections/Dialogs/ColorDialogSection.cs
index 15818f3c0f..0d7e103ec0 100644
--- a/test/Eto.Test/Sections/Dialogs/ColorDialogSection.cs
+++ b/test/Eto.Test/Sections/Dialogs/ColorDialogSection.cs
@@ -1,6 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Dialogs
 {
 	[Section("Dialogs", typeof(ColorDialog))]
diff --git a/test/Eto.Test/Sections/Dialogs/DialogSection.cs b/test/Eto.Test/Sections/Dialogs/DialogSection.cs
index ebb6714d52..460a10e686 100644
--- a/test/Eto.Test/Sections/Dialogs/DialogSection.cs
+++ b/test/Eto.Test/Sections/Dialogs/DialogSection.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Dialogs
 {
 	[Section("Dialogs", typeof(Dialog))]
diff --git a/test/Eto.Test/Sections/Dialogs/FileDialogSection.cs b/test/Eto.Test/Sections/Dialogs/FileDialogSection.cs
index 5064795447..a9e1973215 100644
--- a/test/Eto.Test/Sections/Dialogs/FileDialogSection.cs
+++ b/test/Eto.Test/Sections/Dialogs/FileDialogSection.cs
@@ -1,9 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-using System.Collections.Generic;
-using System.Linq;
-using System;
-
 namespace Eto.Test.Sections.Dialogs
 {
 	[Section("Dialogs", "File Dialog")]
diff --git a/test/Eto.Test/Sections/Dialogs/FontDialogSection.cs b/test/Eto.Test/Sections/Dialogs/FontDialogSection.cs
index de65e1a8a8..287fcbf221 100644
--- a/test/Eto.Test/Sections/Dialogs/FontDialogSection.cs
+++ b/test/Eto.Test/Sections/Dialogs/FontDialogSection.cs
@@ -1,10 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-using System.Collections.Generic;
-using System.Linq;
-using System.IO;
-
 namespace Eto.Test.Sections.Dialogs
 {
 	[Section("Dialogs", typeof(FontDialog))]
diff --git a/test/Eto.Test/Sections/Dialogs/MessageBoxSection.cs b/test/Eto.Test/Sections/Dialogs/MessageBoxSection.cs
index b2b9a5c437..b2a2a71677 100644
--- a/test/Eto.Test/Sections/Dialogs/MessageBoxSection.cs
+++ b/test/Eto.Test/Sections/Dialogs/MessageBoxSection.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Dialogs
 {
 	[Section("Dialogs", typeof(MessageBox))]
diff --git a/test/Eto.Test/Sections/Dialogs/OpenWithDialogSection.cs b/test/Eto.Test/Sections/Dialogs/OpenWithDialogSection.cs
index 3dbe6a460e..cad5a7abf0 100644
--- a/test/Eto.Test/Sections/Dialogs/OpenWithDialogSection.cs
+++ b/test/Eto.Test/Sections/Dialogs/OpenWithDialogSection.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
-
-namespace Eto.Test.Sections.Dialogs
+namespace Eto.Test.Sections.Dialogs
 {
 	[Section("Dialogs", typeof(OpenWithDialog))]
 	public class OpenWithDialogSection : Panel
diff --git a/test/Eto.Test/Sections/Dialogs/SelectFolderSection.cs b/test/Eto.Test/Sections/Dialogs/SelectFolderSection.cs
index f9fb487bd4..fc9e7541e7 100644
--- a/test/Eto.Test/Sections/Dialogs/SelectFolderSection.cs
+++ b/test/Eto.Test/Sections/Dialogs/SelectFolderSection.cs
@@ -1,8 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-using System.IO;
-using System;
-
 namespace Eto.Test.Sections.Dialogs
 {
 	[Section("Dialogs", typeof(SelectFolderDialog))]
diff --git a/test/Eto.Test/Sections/Drawing/AntialiasSection.cs b/test/Eto.Test/Sections/Drawing/AntialiasSection.cs
index 87b6492d09..2b1cbe6279 100644
--- a/test/Eto.Test/Sections/Drawing/AntialiasSection.cs
+++ b/test/Eto.Test/Sections/Drawing/AntialiasSection.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Drawing
 {
 	[Section("Drawing", "Antialias")]
diff --git a/test/Eto.Test/Sections/Drawing/BitmapSection.cs b/test/Eto.Test/Sections/Drawing/BitmapSection.cs
index 1283972627..d6b32053dc 100644
--- a/test/Eto.Test/Sections/Drawing/BitmapSection.cs
+++ b/test/Eto.Test/Sections/Drawing/BitmapSection.cs
@@ -1,8 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-using System;
-using System.Collections.Generic;
-
 namespace Eto.Test.Sections.Drawing
 {
 	/// <summary>
diff --git a/test/Eto.Test/Sections/Drawing/BrushSection.cs b/test/Eto.Test/Sections/Drawing/BrushSection.cs
index 02e7122851..0ad49a896a 100644
--- a/test/Eto.Test/Sections/Drawing/BrushSection.cs
+++ b/test/Eto.Test/Sections/Drawing/BrushSection.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Linq;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Drawing
 {
 	/// <summary>
diff --git a/test/Eto.Test/Sections/Drawing/ClearSection.cs b/test/Eto.Test/Sections/Drawing/ClearSection.cs
index dfe08dd16b..39fda3c279 100644
--- a/test/Eto.Test/Sections/Drawing/ClearSection.cs
+++ b/test/Eto.Test/Sections/Drawing/ClearSection.cs
@@ -1,8 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-using System;
-using System.ComponentModel;
-
 namespace Eto.Test.Sections.Drawing
 {
 	[Section("Drawing", "Clear")]
diff --git a/test/Eto.Test/Sections/Drawing/ClipSection.cs b/test/Eto.Test/Sections/Drawing/ClipSection.cs
index eb87fcb2b1..cc33c9e93f 100644
--- a/test/Eto.Test/Sections/Drawing/ClipSection.cs
+++ b/test/Eto.Test/Sections/Drawing/ClipSection.cs
@@ -1,7 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-using System.ComponentModel;
-
 namespace Eto.Test.Sections.Drawing
 {
 	[Section("Drawing", "Clip")]
diff --git a/test/Eto.Test/Sections/Drawing/ClipTransformSection.cs b/test/Eto.Test/Sections/Drawing/ClipTransformSection.cs
index 3d71f30965..22e69231fd 100644
--- a/test/Eto.Test/Sections/Drawing/ClipTransformSection.cs
+++ b/test/Eto.Test/Sections/Drawing/ClipTransformSection.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
-namespace Eto.Test.Sections.Drawing
+namespace Eto.Test.Sections.Drawing
 {
 	[Section("Drawing", "Clip Transforms")]
 	public class ClipTransformSection : Panel
diff --git a/test/Eto.Test/Sections/Drawing/DrawLoopSection.cs b/test/Eto.Test/Sections/Drawing/DrawLoopSection.cs
index cb85c8fdcb..2025df4157 100644
--- a/test/Eto.Test/Sections/Drawing/DrawLoopSection.cs
+++ b/test/Eto.Test/Sections/Drawing/DrawLoopSection.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Collections.Generic;
-using Eto.Drawing;
-using Eto.Forms;
-using System.Threading;
-using System.Diagnostics;
-using System.Threading.Tasks;
-
 namespace Eto.Test.Sections.Drawing
 {
 	[Section("Drawing", "Draw Loop")]
diff --git a/test/Eto.Test/Sections/Drawing/DrawTextSection.cs b/test/Eto.Test/Sections/Drawing/DrawTextSection.cs
index 6f420aff39..f3d81c1ef9 100644
--- a/test/Eto.Test/Sections/Drawing/DrawTextSection.cs
+++ b/test/Eto.Test/Sections/Drawing/DrawTextSection.cs
@@ -1,8 +1,3 @@
-using System.Collections.Generic;
-using Eto.Forms;
-using Eto.Drawing;
-using System;
-
 namespace Eto.Test.Sections.Drawing
 {
 	[Section("Drawing", "DrawText")]
diff --git a/test/Eto.Test/Sections/Drawing/FormattedTextSection.cs b/test/Eto.Test/Sections/Drawing/FormattedTextSection.cs
index 9f104d654f..c11bce78b3 100644
--- a/test/Eto.Test/Sections/Drawing/FormattedTextSection.cs
+++ b/test/Eto.Test/Sections/Drawing/FormattedTextSection.cs
@@ -1,8 +1,3 @@
-using System.Collections.Generic;
-using Eto.Forms;
-using Eto.Drawing;
-using System;
-
 namespace Eto.Test.Sections.Drawing
 {
 	[Section("Drawing", typeof(FormattedText))]
diff --git a/test/Eto.Test/Sections/Drawing/GetPixelSection.cs b/test/Eto.Test/Sections/Drawing/GetPixelSection.cs
index 08a87a2ca8..dfbd5b527b 100644
--- a/test/Eto.Test/Sections/Drawing/GetPixelSection.cs
+++ b/test/Eto.Test/Sections/Drawing/GetPixelSection.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Eto.Forms;
-using Eto.Drawing;
-
-namespace Eto.Test.Sections.Drawing
+namespace Eto.Test.Sections.Drawing
 {
 	[Section("Drawing", "Bitmap GetPixel")]
 	public class GetPixelSection : Panel
diff --git a/test/Eto.Test/Sections/Drawing/GraphicsPathSection.cs b/test/Eto.Test/Sections/Drawing/GraphicsPathSection.cs
index 92e94dfe99..1f83f257bf 100644
--- a/test/Eto.Test/Sections/Drawing/GraphicsPathSection.cs
+++ b/test/Eto.Test/Sections/Drawing/GraphicsPathSection.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Linq;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Drawing
 {
 	[Section("Drawing", "GraphicsPath")]
diff --git a/test/Eto.Test/Sections/Drawing/IconFrameSection.cs b/test/Eto.Test/Sections/Drawing/IconFrameSection.cs
index a1d112cfc4..856b63a0d5 100644
--- a/test/Eto.Test/Sections/Drawing/IconFrameSection.cs
+++ b/test/Eto.Test/Sections/Drawing/IconFrameSection.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Drawing
 {
 	[Section("Drawing", typeof(Icon))]
diff --git a/test/Eto.Test/Sections/Drawing/IndexedBitmapSection.cs b/test/Eto.Test/Sections/Drawing/IndexedBitmapSection.cs
index 7366c882c4..df35bc4323 100644
--- a/test/Eto.Test/Sections/Drawing/IndexedBitmapSection.cs
+++ b/test/Eto.Test/Sections/Drawing/IndexedBitmapSection.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Drawing
 {
 	[Section("Drawing", "IndexedBitmap")]
diff --git a/test/Eto.Test/Sections/Drawing/InterpolationSection.cs b/test/Eto.Test/Sections/Drawing/InterpolationSection.cs
index cbe03443ae..7c91b99034 100644
--- a/test/Eto.Test/Sections/Drawing/InterpolationSection.cs
+++ b/test/Eto.Test/Sections/Drawing/InterpolationSection.cs
@@ -1,7 +1,3 @@
-using System.Reflection;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Drawing
 {
 	[Section("Drawing", "ImageInterpolation")]
diff --git a/test/Eto.Test/Sections/Drawing/PenSection.cs b/test/Eto.Test/Sections/Drawing/PenSection.cs
index ad543f601a..b99c2bac70 100644
--- a/test/Eto.Test/Sections/Drawing/PenSection.cs
+++ b/test/Eto.Test/Sections/Drawing/PenSection.cs
@@ -1,7 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-using System;
-
 namespace Eto.Test.Sections.Drawing
 {
 	/// <summary>
diff --git a/test/Eto.Test/Sections/Drawing/PixelOffsetModeSection.cs b/test/Eto.Test/Sections/Drawing/PixelOffsetModeSection.cs
index 596f94c5cd..23b817418d 100644
--- a/test/Eto.Test/Sections/Drawing/PixelOffsetModeSection.cs
+++ b/test/Eto.Test/Sections/Drawing/PixelOffsetModeSection.cs
@@ -1,6 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Drawing
 {
 	[Section("Drawing", "PixelOffsetMode")]
diff --git a/test/Eto.Test/Sections/Drawing/PixelOffsetTransforms.cs b/test/Eto.Test/Sections/Drawing/PixelOffsetTransforms.cs
index bc8ae3384c..d1c2498231 100644
--- a/test/Eto.Test/Sections/Drawing/PixelOffsetTransforms.cs
+++ b/test/Eto.Test/Sections/Drawing/PixelOffsetTransforms.cs
@@ -1,9 +1,4 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Collections.Generic;
-
-namespace Eto.Test.Sections.Drawing
+namespace Eto.Test.Sections.Drawing
 {
 	[Section("Drawing", "PixelOffsetMode Transforms")]
 	public class PixelOffsetTransforms : StackLayout
diff --git a/test/Eto.Test/Sections/Drawing/SystemColorSection.cs b/test/Eto.Test/Sections/Drawing/SystemColorSection.cs
index 52de7ae0e0..ecf8142361 100644
--- a/test/Eto.Test/Sections/Drawing/SystemColorSection.cs
+++ b/test/Eto.Test/Sections/Drawing/SystemColorSection.cs
@@ -1,11 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Linq;
-using Eto.Drawing;
-using System.Reflection;
-using System.Collections.Generic;
-using System.ComponentModel;
-
 namespace Eto.Test.Sections.Drawing
 {
 	[Section("Drawing", typeof(SystemColors))]
diff --git a/test/Eto.Test/Sections/Drawing/TextureBrushesSection.cs b/test/Eto.Test/Sections/Drawing/TextureBrushesSection.cs
index 6e761b1ce6..d95dfd59e8 100644
--- a/test/Eto.Test/Sections/Drawing/TextureBrushesSection.cs
+++ b/test/Eto.Test/Sections/Drawing/TextureBrushesSection.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Drawing
 {
 	[Section("Drawing", "TextureBrush")]
diff --git a/test/Eto.Test/Sections/Drawing/TextureBrushesSection2.cs b/test/Eto.Test/Sections/Drawing/TextureBrushesSection2.cs
index 0071b5ce91..0387d141b8 100644
--- a/test/Eto.Test/Sections/Drawing/TextureBrushesSection2.cs
+++ b/test/Eto.Test/Sections/Drawing/TextureBrushesSection2.cs
@@ -1,8 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Diagnostics;
-
 namespace Eto.Test.Sections.Drawing
 {
 	/// <summary>
diff --git a/test/Eto.Test/Sections/Drawing/TransformSection.cs b/test/Eto.Test/Sections/Drawing/TransformSection.cs
index 9a5fb74e4f..758b8a02e6 100644
--- a/test/Eto.Test/Sections/Drawing/TransformSection.cs
+++ b/test/Eto.Test/Sections/Drawing/TransformSection.cs
@@ -1,7 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-using System;
-
 namespace Eto.Test.Sections.Drawing
 {
 	[Section("Drawing", "Transforms")]
diff --git a/test/Eto.Test/Sections/Layouts/PixelLayoutSection/AnchorSection.cs b/test/Eto.Test/Sections/Layouts/PixelLayoutSection/AnchorSection.cs
index fbe7374f0c..b6cbd54bde 100644
--- a/test/Eto.Test/Sections/Layouts/PixelLayoutSection/AnchorSection.cs
+++ b/test/Eto.Test/Sections/Layouts/PixelLayoutSection/AnchorSection.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Linq;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Layouts.PixelLayoutSection
 {
 	[Flags]
diff --git a/test/Eto.Test/Sections/Layouts/ScrollingLayouts/DockLayoutExpansion.cs b/test/Eto.Test/Sections/Layouts/ScrollingLayouts/DockLayoutExpansion.cs
index 9ec286e77c..8f00368c2b 100644
--- a/test/Eto.Test/Sections/Layouts/ScrollingLayouts/DockLayoutExpansion.cs
+++ b/test/Eto.Test/Sections/Layouts/ScrollingLayouts/DockLayoutExpansion.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Layouts.ScrollingLayouts
 {
 	[Section("Scrollable", "Dock Expansion")]
diff --git a/test/Eto.Test/Sections/Layouts/ScrollingLayouts/PixelLayoutExpansion.cs b/test/Eto.Test/Sections/Layouts/ScrollingLayouts/PixelLayoutExpansion.cs
index fe1d7782d5..8d76866991 100644
--- a/test/Eto.Test/Sections/Layouts/ScrollingLayouts/PixelLayoutExpansion.cs
+++ b/test/Eto.Test/Sections/Layouts/ScrollingLayouts/PixelLayoutExpansion.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Layouts.ScrollingLayouts
 {
 	[Section("Scrollable", "PixelLayout Expansion")]
diff --git a/test/Eto.Test/Sections/Layouts/ScrollingLayouts/TableLayoutExpansion.cs b/test/Eto.Test/Sections/Layouts/ScrollingLayouts/TableLayoutExpansion.cs
index 291621449f..e01b6c85a8 100644
--- a/test/Eto.Test/Sections/Layouts/ScrollingLayouts/TableLayoutExpansion.cs
+++ b/test/Eto.Test/Sections/Layouts/ScrollingLayouts/TableLayoutExpansion.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Layouts.ScrollingLayouts
 {
 	[Section("Scrollable", "TableLayout Expansion")]
diff --git a/test/Eto.Test/Sections/Layouts/ScrollingLayouts/TablePaddingAndSpacingSection.cs b/test/Eto.Test/Sections/Layouts/ScrollingLayouts/TablePaddingAndSpacingSection.cs
index 67234b0e6c..9def894ce8 100644
--- a/test/Eto.Test/Sections/Layouts/ScrollingLayouts/TablePaddingAndSpacingSection.cs
+++ b/test/Eto.Test/Sections/Layouts/ScrollingLayouts/TablePaddingAndSpacingSection.cs
@@ -1,12 +1,4 @@
-using Eto.Drawing;
-using Eto.Forms;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Eto.Test.Sections.Layouts.ScrollingLayouts
+namespace Eto.Test.Sections.Layouts.ScrollingLayouts
 {
 	[Section("Scrollable", typeof(Scrollable), "Table Padding & Spacing")]
 	public class TablePaddingAndSpacingSection : Scrollable
diff --git a/test/Eto.Test/Sections/Layouts/TableLayoutSection/ChildWidthSection.cs b/test/Eto.Test/Sections/Layouts/TableLayoutSection/ChildWidthSection.cs
index 9b02b1ea34..ae9b60f10b 100644
--- a/test/Eto.Test/Sections/Layouts/TableLayoutSection/ChildWidthSection.cs
+++ b/test/Eto.Test/Sections/Layouts/TableLayoutSection/ChildWidthSection.cs
@@ -1,5 +1,3 @@
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Layouts.TableLayoutSection
 {
 	/// <summary>
diff --git a/test/Eto.Test/Sections/Layouts/TableLayoutSection/RuntimeSection.cs b/test/Eto.Test/Sections/Layouts/TableLayoutSection/RuntimeSection.cs
index fe181152fc..f58cfa9e3d 100644
--- a/test/Eto.Test/Sections/Layouts/TableLayoutSection/RuntimeSection.cs
+++ b/test/Eto.Test/Sections/Layouts/TableLayoutSection/RuntimeSection.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Layouts.TableLayoutSection
 {
 	[Section("TableLayout", "Runtime Creation")]
diff --git a/test/Eto.Test/Sections/Layouts/TableLayoutSection/ScalingSection.cs b/test/Eto.Test/Sections/Layouts/TableLayoutSection/ScalingSection.cs
index 3c6530c5fa..e5dbeae680 100644
--- a/test/Eto.Test/Sections/Layouts/TableLayoutSection/ScalingSection.cs
+++ b/test/Eto.Test/Sections/Layouts/TableLayoutSection/ScalingSection.cs
@@ -1,6 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Layouts.TableLayoutSection
 {
 	[Section("TableLayout", "Scaling")]
diff --git a/test/Eto.Test/Sections/Layouts/TableLayoutSection/SpacingSection.cs b/test/Eto.Test/Sections/Layouts/TableLayoutSection/SpacingSection.cs
index e141e3d2e5..d4893f3c1a 100644
--- a/test/Eto.Test/Sections/Layouts/TableLayoutSection/SpacingSection.cs
+++ b/test/Eto.Test/Sections/Layouts/TableLayoutSection/SpacingSection.cs
@@ -1,6 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Layouts.TableLayoutSection
 {
 	[Section("TableLayout", "Spacing")]
diff --git a/test/Eto.Test/Sections/Printing/PrintDialogSection.cs b/test/Eto.Test/Sections/Printing/PrintDialogSection.cs
index 5bfceec017..52e29f17a8 100644
--- a/test/Eto.Test/Sections/Printing/PrintDialogSection.cs
+++ b/test/Eto.Test/Sections/Printing/PrintDialogSection.cs
@@ -1,7 +1,3 @@
-using System;
-using Eto.Forms;
-using Eto.Drawing;
-
 namespace Eto.Test.Sections.Printing
 {
 	[Section("Printing", "Print Dialog")]
diff --git a/test/Eto.Test/Sections/Serialization/Json/Test.cs b/test/Eto.Test/Sections/Serialization/Json/Test.cs
index 1293903f32..e293638117 100644
--- a/test/Eto.Test/Sections/Serialization/Json/Test.cs
+++ b/test/Eto.Test/Sections/Serialization/Json/Test.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-using System.Diagnostics;
 using Eto.Serialization.Json;
 
 namespace Eto.Test.Sections.Serialization.Json
diff --git a/test/Eto.Test/Sections/Serialization/JsonReadSection.cs b/test/Eto.Test/Sections/Serialization/JsonReadSection.cs
index b9a7e9c880..cb706887ac 100644
--- a/test/Eto.Test/Sections/Serialization/JsonReadSection.cs
+++ b/test/Eto.Test/Sections/Serialization/JsonReadSection.cs
@@ -1,5 +1,3 @@
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Serialization
 {
 	[Section("Serialization", "Json")]
diff --git a/test/Eto.Test/Sections/Serialization/Xaml/Test.cs b/test/Eto.Test/Sections/Serialization/Xaml/Test.cs
index 675ff2c692..102f6171ce 100644
--- a/test/Eto.Test/Sections/Serialization/Xaml/Test.cs
+++ b/test/Eto.Test/Sections/Serialization/Xaml/Test.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Forms;
 using Eto.Serialization.Xaml;
-using System.Windows.Input;
-using System.Diagnostics;
 using System.Collections.Generic;
 
 
diff --git a/test/Eto.Test/Sections/Serialization/XamlReadSection.cs b/test/Eto.Test/Sections/Serialization/XamlReadSection.cs
index a2cd16509c..b58b06a5d7 100644
--- a/test/Eto.Test/Sections/Serialization/XamlReadSection.cs
+++ b/test/Eto.Test/Sections/Serialization/XamlReadSection.cs
@@ -1,5 +1,3 @@
-using Eto.Forms;
-
 namespace Eto.Test.Sections.Serialization
 {
 	[Section("Serialization", "Xaml")]
diff --git a/test/Eto.Test/Sections/UnitTestPanel.cs b/test/Eto.Test/Sections/UnitTestPanel.cs
index d80ecb2a26..53e045fbec 100755
--- a/test/Eto.Test/Sections/UnitTestPanel.cs
+++ b/test/Eto.Test/Sections/UnitTestPanel.cs
@@ -1,22 +1,7 @@
-using System;
-using System.Reflection;
-using Eto.Forms;
-using System.Collections.Generic;
 using NUnit.Framework.Internal;
 using NUnit.Framework.Api;
-using System.Threading.Tasks;
-using Eto.Drawing;
-using System.Linq;
 using NUnit.Framework.Interfaces;
-using System.IO;
-using System.Collections.ObjectModel;
-using System.Text.RegularExpressions;
-using System.Diagnostics;
-using System.Text;
 using System.Collections.Concurrent;
-using System.Collections;
-using System.ComponentModel;
-using System.Threading;
 using Eto.Test.UnitTests;
 
 namespace Eto.Test.Sections
diff --git a/test/Eto.Test/Sections/UnitTestSection.cs b/test/Eto.Test/Sections/UnitTestSection.cs
index af94788bfd..5e9634a733 100644
--- a/test/Eto.Test/Sections/UnitTestSection.cs
+++ b/test/Eto.Test/Sections/UnitTestSection.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Forms;
-
 namespace Eto.Test.Sections
 {
 
diff --git a/test/Eto.Test/Settings.cs b/test/Eto.Test/Settings.cs
index 2c43404776..15dceaab44 100644
--- a/test/Eto.Test/Settings.cs
+++ b/test/Eto.Test/Settings.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using Eto.Drawing;
-
-namespace Eto.Test
+namespace Eto.Test
 {
 	public class Settings
 	{
diff --git a/test/Eto.Test/SizeEntry.cs b/test/Eto.Test/SizeEntry.cs
index a5c3918c62..a078eee1c3 100644
--- a/test/Eto.Test/SizeEntry.cs
+++ b/test/Eto.Test/SizeEntry.cs
@@ -1,7 +1,3 @@
-using Eto.Forms;
-using Eto.Drawing;
-using System;
-
 namespace Eto.Test
 {
 	/// <summary>
diff --git a/test/Eto.Test/TestApplication.cs b/test/Eto.Test/TestApplication.cs
index 463aae1299..d75a9c8a46 100644
--- a/test/Eto.Test/TestApplication.cs
+++ b/test/Eto.Test/TestApplication.cs
@@ -1,12 +1,3 @@
-using System;
-using Eto.Forms;
-using System.ComponentModel;
-using System.Diagnostics;
-using Eto.Drawing;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-
 namespace Eto.Test
 {
 	public class TestApplication : Application
diff --git a/test/Eto.Test/TestIcons.cs b/test/Eto.Test/TestIcons.cs
index a33253d9bb..d85b33c25c 100644
--- a/test/Eto.Test/TestIcons.cs
+++ b/test/Eto.Test/TestIcons.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Reflection;
-using Eto.Drawing;
-using Eto.Forms;
-
 namespace Eto.Test
 {
 	public static class TestIcons
diff --git a/test/Eto.Test/TestSections.cs b/test/Eto.Test/TestSections.cs
index 08e9de5fa8..41950e5e05 100644
--- a/test/Eto.Test/TestSections.cs
+++ b/test/Eto.Test/TestSections.cs
@@ -1,12 +1,6 @@
-using Eto.Forms;
-using System.Collections.Generic;
 using Eto.Test.Sections.Controls;
 using Eto.Test.Sections.Drawing;
 using Eto.Test.Sections;
-using System.Linq;
-using System;
-using System.Reflection;
-
 namespace Eto.Test
 {
 	[System.AttributeUsage(System.AttributeTargets.Class, Inherited = false, AllowMultiple = true)]
diff --git a/test/Eto.Test/UnitTests/CollectionChangedHandlerTest.cs b/test/Eto.Test/UnitTests/CollectionChangedHandlerTest.cs
index 81bb7eac4e..557fbc3175 100644
--- a/test/Eto.Test/UnitTests/CollectionChangedHandlerTest.cs
+++ b/test/Eto.Test/UnitTests/CollectionChangedHandlerTest.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
 using NUnit.Framework;
 using Eto;
 
diff --git a/test/Eto.Test/UnitTests/Drawing/BitmapTests.cs b/test/Eto.Test/UnitTests/Drawing/BitmapTests.cs
index 366a1dd251..7ec9b719e5 100644
--- a/test/Eto.Test/UnitTests/Drawing/BitmapTests.cs
+++ b/test/Eto.Test/UnitTests/Drawing/BitmapTests.cs
@@ -1,13 +1,4 @@
-using Eto.Drawing;
-using Eto.Forms;
 using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace Eto.Test.UnitTests.Drawing
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Drawing/BrushTests.cs b/test/Eto.Test/UnitTests/Drawing/BrushTests.cs
index 5d7f7a0bc9..d0e6bbe247 100644
--- a/test/Eto.Test/UnitTests/Drawing/BrushTests.cs
+++ b/test/Eto.Test/UnitTests/Drawing/BrushTests.cs
@@ -1,11 +1,4 @@
-using Eto.Drawing;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+using NUnit.Framework;
 namespace Eto.Test.UnitTests.Drawing
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Drawing/ClipTests.cs b/test/Eto.Test/UnitTests/Drawing/ClipTests.cs
index 588d09c320..1fb200af09 100644
--- a/test/Eto.Test/UnitTests/Drawing/ClipTests.cs
+++ b/test/Eto.Test/UnitTests/Drawing/ClipTests.cs
@@ -1,5 +1,4 @@
-using Eto.Drawing;
-using NUnit.Framework;
+using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Drawing
 {
diff --git a/test/Eto.Test/UnitTests/Drawing/ColorTests.cs b/test/Eto.Test/UnitTests/Drawing/ColorTests.cs
index c8807b315a..87dc486ce8 100644
--- a/test/Eto.Test/UnitTests/Drawing/ColorTests.cs
+++ b/test/Eto.Test/UnitTests/Drawing/ColorTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Globalization;
-using System.Threading;
-using Eto.Drawing;
-using NUnit.Framework;
+using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Drawing
 {
diff --git a/test/Eto.Test/UnitTests/Drawing/DefaultValueTests.cs b/test/Eto.Test/UnitTests/Drawing/DefaultValueTests.cs
index d89395ba50..edafb61a3b 100644
--- a/test/Eto.Test/UnitTests/Drawing/DefaultValueTests.cs
+++ b/test/Eto.Test/UnitTests/Drawing/DefaultValueTests.cs
@@ -1,12 +1,4 @@
 using NUnit.Framework;
-using System;
-using System.Reflection;
-using System.Collections.Generic;
-using System.Linq;
-using System.ComponentModel;
-using Eto.Drawing;
-using System.Linq.Expressions;
-
 namespace Eto.Test.UnitTests.Drawing
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Drawing/FontTests.cs b/test/Eto.Test/UnitTests/Drawing/FontTests.cs
index 98ad6d4f46..bbbb8f9324 100644
--- a/test/Eto.Test/UnitTests/Drawing/FontTests.cs
+++ b/test/Eto.Test/UnitTests/Drawing/FontTests.cs
@@ -1,11 +1,4 @@
-using Eto.Drawing;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+using NUnit.Framework;
 namespace Eto.Test.UnitTests.Drawing
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Drawing/GraphicsOffsetModeTests.cs b/test/Eto.Test/UnitTests/Drawing/GraphicsOffsetModeTests.cs
index 11e8d4fe14..865a1633f6 100644
--- a/test/Eto.Test/UnitTests/Drawing/GraphicsOffsetModeTests.cs
+++ b/test/Eto.Test/UnitTests/Drawing/GraphicsOffsetModeTests.cs
@@ -1,7 +1,3 @@
-using System;
-using System.IO;
-using Eto.Forms;
-using Eto.Drawing;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Drawing
diff --git a/test/Eto.Test/UnitTests/Drawing/GraphicsPathTests.cs b/test/Eto.Test/UnitTests/Drawing/GraphicsPathTests.cs
index b85382217e..c4ea95841e 100644
--- a/test/Eto.Test/UnitTests/Drawing/GraphicsPathTests.cs
+++ b/test/Eto.Test/UnitTests/Drawing/GraphicsPathTests.cs
@@ -1,5 +1,3 @@
-using System.IO;
-using Eto.Drawing;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Drawing
diff --git a/test/Eto.Test/UnitTests/Drawing/GraphicsTests.cs b/test/Eto.Test/UnitTests/Drawing/GraphicsTests.cs
index cbc09a65cc..817b966d77 100755
--- a/test/Eto.Test/UnitTests/Drawing/GraphicsTests.cs
+++ b/test/Eto.Test/UnitTests/Drawing/GraphicsTests.cs
@@ -1,12 +1,4 @@
-using Eto.Drawing;
-using Eto.Forms;
 using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace Eto.Test.UnitTests.Drawing
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Drawing/IconTests.cs b/test/Eto.Test/UnitTests/Drawing/IconTests.cs
index bc2ab8290c..d8ab10afcd 100755
--- a/test/Eto.Test/UnitTests/Drawing/IconTests.cs
+++ b/test/Eto.Test/UnitTests/Drawing/IconTests.cs
@@ -1,10 +1,4 @@
-using System;
 using NUnit.Framework;
-using Eto.Drawing;
-using System.Linq;
-using Eto.Forms;
-using System.IO;
-
 namespace Eto.Test.UnitTests.Drawing
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Drawing/MatrixTests.cs b/test/Eto.Test/UnitTests/Drawing/MatrixTests.cs
index 2db4be5882..a1c51f3dc6 100644
--- a/test/Eto.Test/UnitTests/Drawing/MatrixTests.cs
+++ b/test/Eto.Test/UnitTests/Drawing/MatrixTests.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using NUnit.Framework;
-using Eto.Drawing;
-
+using NUnit.Framework;
 namespace Eto.Test.UnitTests.Drawing
 {
 	/// <summary>
diff --git a/test/Eto.Test/UnitTests/Drawing/PenTests.cs b/test/Eto.Test/UnitTests/Drawing/PenTests.cs
index 39e0e60c52..f29a376976 100644
--- a/test/Eto.Test/UnitTests/Drawing/PenTests.cs
+++ b/test/Eto.Test/UnitTests/Drawing/PenTests.cs
@@ -1,9 +1,4 @@
-using Eto.Drawing;
 using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace Eto.Test.UnitTests.Drawing
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/ApplicationTests.cs b/test/Eto.Test/UnitTests/Forms/ApplicationTests.cs
index e5bb38f0f6..05fcbc0615 100755
--- a/test/Eto.Test/UnitTests/Forms/ApplicationTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/ApplicationTests.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Forms
diff --git a/test/Eto.Test/UnitTests/Forms/Behaviors/MouseTests.cs b/test/Eto.Test/UnitTests/Forms/Behaviors/MouseTests.cs
index b894c8fe31..5a85f3357e 100644
--- a/test/Eto.Test/UnitTests/Forms/Behaviors/MouseTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Behaviors/MouseTests.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Forms.Behaviors
diff --git a/test/Eto.Test/UnitTests/Forms/Bindings/ChildBindingTests.cs b/test/Eto.Test/UnitTests/Forms/Bindings/ChildBindingTests.cs
index 909eaa863a..ecfa0b417f 100644
--- a/test/Eto.Test/UnitTests/Forms/Bindings/ChildBindingTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Bindings/ChildBindingTests.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Forms.Bindings
diff --git a/test/Eto.Test/UnitTests/Forms/Bindings/ObjectBindingChangedTests.cs b/test/Eto.Test/UnitTests/Forms/Bindings/ObjectBindingChangedTests.cs
index 157bb13a82..5df2724a2d 100644
--- a/test/Eto.Test/UnitTests/Forms/Bindings/ObjectBindingChangedTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Bindings/ObjectBindingChangedTests.cs
@@ -1,8 +1,4 @@
-using System;
-using NUnit.Framework;
-using System.ComponentModel;
-using Eto.Forms;
-
+using NUnit.Framework;
 namespace Eto.Test.UnitTests.Forms.Bindings
 {
 	class BindObject : INotifyPropertyChanged
diff --git a/test/Eto.Test/UnitTests/Forms/Bindings/ObjectBindingObjectChangedTests.cs b/test/Eto.Test/UnitTests/Forms/Bindings/ObjectBindingObjectChangedTests.cs
index a146d97800..4ab149b90c 100644
--- a/test/Eto.Test/UnitTests/Forms/Bindings/ObjectBindingObjectChangedTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Bindings/ObjectBindingObjectChangedTests.cs
@@ -1,7 +1,4 @@
-using System;
-using NUnit.Framework;
-using Eto.Forms;
-
+using NUnit.Framework;
 namespace Eto.Test.UnitTests.Forms.Bindings
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/Bindings/PropertyBindingTests.cs b/test/Eto.Test/UnitTests/Forms/Bindings/PropertyBindingTests.cs
index 19902fef91..32e3b9e4fe 100644
--- a/test/Eto.Test/UnitTests/Forms/Bindings/PropertyBindingTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Bindings/PropertyBindingTests.cs
@@ -1,11 +1,5 @@
-using System;
-using NUnit.Framework;
-using Eto.Forms;
+using NUnit.Framework;
 using System.Data;
-using System.ComponentModel;
-using System.Collections.Generic;
-using sc = System.ComponentModel;
-
 namespace Eto.Test.UnitTests.Forms.Bindings
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/CascadingStyleTests.cs b/test/Eto.Test/UnitTests/Forms/CascadingStyleTests.cs
index 632b0743a2..473874f0b2 100644
--- a/test/Eto.Test/UnitTests/Forms/CascadingStyleTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/CascadingStyleTests.cs
@@ -1,5 +1,4 @@
-using Eto.Forms;
-using NUnit.Framework;
+using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Forms
 {
diff --git a/test/Eto.Test/UnitTests/Forms/ClipboardTests.cs b/test/Eto.Test/UnitTests/Forms/ClipboardTests.cs
index c55b73abd9..ecd8fded9d 100755
--- a/test/Eto.Test/UnitTests/Forms/ClipboardTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/ClipboardTests.cs
@@ -1,13 +1,4 @@
-using Eto.Forms;
 using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Eto.Drawing;
-using System.IO;
-
 namespace Eto.Test.UnitTests.Forms
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/ContainerTests.cs b/test/Eto.Test/UnitTests/Forms/ContainerTests.cs
index d5dc4ae1e8..1cd0fc28cd 100644
--- a/test/Eto.Test/UnitTests/Forms/ContainerTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/ContainerTests.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using Eto.Drawing;
-using Eto.Forms;
 using NUnit.Framework;
-using Container = Eto.Forms.Container;
 
 namespace Eto.Test.UnitTests.Forms
 {
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/ButtonTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/ButtonTests.cs
index b2dec1c8f8..5a1a77bc00 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/ButtonTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/ButtonTests.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Forms.Controls
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/CalendarTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/CalendarTests.cs
index 1fe90af587..a3a02d4f86 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/CalendarTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/CalendarTests.cs
@@ -1,7 +1,4 @@
-using System;
-using NUnit.Framework;
-using Eto.Forms;
-
+using NUnit.Framework;
 namespace Eto.Test.UnitTests.Forms.Controls
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/ComboBoxTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/ComboBoxTests.cs
index 8c56048fa0..7e72f4e68c 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/ComboBoxTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/ComboBoxTests.cs
@@ -1,4 +1,3 @@
-using Eto.Forms;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Forms.Controls
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/ControlEventTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/ControlEventTests.cs
index 6019cf9a11..986dc3ba0b 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/ControlEventTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/ControlEventTests.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Linq;
 using NUnit.Framework;
-using Eto.Forms;
-using System.Collections.Generic;
-using System.Reflection;
-
 namespace Eto.Test.UnitTests.Forms.Controls
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/ControlTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/ControlTests.cs
index 9613b9f32c..73e3a812f6 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/ControlTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/ControlTests.cs
@@ -1,13 +1,5 @@
-using System;
-using Eto.Forms;
 using NUnit.Framework;
-using System.Collections.Generic;
-using Eto.Drawing;
-using System.Threading;
 using System.Runtime.ExceptionServices;
-using System.Reflection;
-using System.Linq;
-
 namespace Eto.Test.UnitTests.Forms.Controls
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/CustomCellTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/CustomCellTests.cs
index 4e3810d982..b88918fdb5 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/CustomCellTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/CustomCellTests.cs
@@ -1,11 +1,4 @@
-using Eto.Forms;
 using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace Eto.Test.UnitTests.Forms.Controls
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/DocumentControlTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/DocumentControlTests.cs
index b39bf2f1cd..cb10dbc323 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/DocumentControlTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/DocumentControlTests.cs
@@ -1,8 +1,4 @@
-using System;
-using NUnit.Framework;
-using Eto.Forms;
-using Eto.Drawing;
-
+using NUnit.Framework;
 namespace Eto.Test.UnitTests.Forms.Controls
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/DrawableTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/DrawableTests.cs
index b8c4024340..d56d3710b1 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/DrawableTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/DrawableTests.cs
@@ -1,5 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Forms.Controls
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/DropDownTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/DropDownTests.cs
index 3adb7d13f0..57cf735060 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/DropDownTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/DropDownTests.cs
@@ -1,8 +1,4 @@
-using System;
 using NUnit.Framework;
-using Eto.Forms;
-using System.Collections.Generic;
-
 namespace Eto.Test.UnitTests.Forms.Controls
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/GridTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/GridTests.cs
index 6f0d631ccd..fdf05794e6 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/GridTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/GridTests.cs
@@ -1,8 +1,4 @@
 using NUnit.Framework;
-using Eto.Forms;
-using System.Collections.Generic;
-using Eto.Drawing;
-
 namespace Eto.Test.UnitTests.Forms.Controls
 {
 	public abstract class GridTests<T> : TestBase
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/GridViewFilterTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/GridViewFilterTests.cs
index 831d38ca3d..081006026e 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/GridViewFilterTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/GridViewFilterTests.cs
@@ -1,12 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
-using Eto.Forms;
-using System;
-using System.Collections.ObjectModel;
-using Eto.Drawing;
-using System.Threading.Tasks;
-
+using NUnit.Framework;
 namespace Eto.Test.UnitTests.Forms.Controls
 {
 	/// <summary>
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/GridViewSelectTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/GridViewSelectTests.cs
index 5d387d242f..8dca07d1db 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/GridViewSelectTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/GridViewSelectTests.cs
@@ -1,12 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
-using Eto.Forms;
-using System;
-using System.Collections.ObjectModel;
-using Eto.Drawing;
-using System.Threading.Tasks;
-
+using NUnit.Framework;
 namespace Eto.Test.UnitTests.Forms.Controls
 {
 	/// <summary>
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/GridViewSelectableFilterTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/GridViewSelectableFilterTests.cs
index e0b5abee10..04a1ae18c2 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/GridViewSelectableFilterTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/GridViewSelectableFilterTests.cs
@@ -1,12 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
-using Eto.Forms;
-using System;
-using System.Collections.ObjectModel;
-using Eto.Drawing;
-using System.Threading.Tasks;
-
+using NUnit.Framework;
 namespace Eto.Test.UnitTests.Forms.Controls
 {
 	/// <summary>
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/GridViewTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/GridViewTests.cs
index d57d809ffb..b64b11e27d 100755
--- a/test/Eto.Test/UnitTests/Forms/Controls/GridViewTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/GridViewTests.cs
@@ -1,15 +1,5 @@
-using System;
 using NUnit.Framework;
-using Eto.Forms;
-using System.Collections.Generic;
 using System.Runtime.ExceptionServices;
-using Eto.Drawing;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Threading;
-
 namespace Eto.Test.UnitTests.Forms.Controls
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/GroupBoxTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/GroupBoxTests.cs
index 44c4ef74b7..8323da4516 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/GroupBoxTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/GroupBoxTests.cs
@@ -1,5 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Forms.Controls
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/ImageViewTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/ImageViewTests.cs
index 13c0070bd4..7fca83deba 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/ImageViewTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/ImageViewTests.cs
@@ -1,10 +1,5 @@
-using System;
 using NUnit.Framework;
-using Eto.Forms;
-using Eto.Drawing;
 using System.Runtime.ExceptionServices;
-using System.Collections.Generic;
-
 namespace Eto.Test.UnitTests.Forms.Controls
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/LabelTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/LabelTests.cs
index ba3b18222c..fa7dd11f52 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/LabelTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/LabelTests.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Forms.Controls
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/ListBoxTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/ListBoxTests.cs
index 3b4e8f1793..ecc4837115 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/ListBoxTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/ListBoxTests.cs
@@ -1,5 +1,3 @@
-using System;
-using Eto.Forms;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Forms.Controls
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/ListControlTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/ListControlTests.cs
index 083fcfaba9..e61f2143fe 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/ListControlTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/ListControlTests.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Forms.Controls
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/NumericStepperTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/NumericStepperTests.cs
index 416148ae83..14a36c24c6 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/NumericStepperTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/NumericStepperTests.cs
@@ -1,12 +1,5 @@
-using Eto.Forms;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using NUnit.Framework;
 using System.Runtime.ExceptionServices;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace Eto.Test.UnitTests.Forms.Controls
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/PanelTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/PanelTests.cs
index efc5110039..0c22cc293b 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/PanelTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/PanelTests.cs
@@ -1,11 +1,4 @@
-using Eto.Forms;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+using NUnit.Framework;
 namespace Eto.Test.UnitTests.Forms.Controls
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/RadioButtonListTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/RadioButtonListTests.cs
index 708250271b..ae0661db0d 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/RadioButtonListTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/RadioButtonListTests.cs
@@ -1,4 +1,3 @@
-using Eto.Forms;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Forms.Controls
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/RadioButtonTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/RadioButtonTests.cs
index 6dea7bb229..ebe8e1b926 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/RadioButtonTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/RadioButtonTests.cs
@@ -1,7 +1,4 @@
-using System;
 using NUnit.Framework;
-using Eto.Forms;
-using System.Threading;
 using NUnit.Framework.Interfaces;
 using NUnit.Framework.Internal.Commands;
 using NUnit.Framework.Internal;
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/RichTextAreaTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/RichTextAreaTests.cs
index 6e51f3bd7c..be70602ad6 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/RichTextAreaTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/RichTextAreaTests.cs
@@ -1,12 +1,4 @@
-using System;
-using Eto.Forms;
 using NUnit.Framework;
-using Eto.Drawing;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
 using Range = Eto.Forms.Range;
 
 namespace Eto.Test.UnitTests.Forms.Controls
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/ScrollableTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/ScrollableTests.cs
index 736be5297f..c08f0fc3c8 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/ScrollableTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/ScrollableTests.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using Eto.Drawing;
-using Eto.Forms;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Forms.Controls
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/SegmentedButtonTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/SegmentedButtonTests.cs
index e3604f97e8..e451e23030 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/SegmentedButtonTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/SegmentedButtonTests.cs
@@ -1,8 +1,4 @@
-using System;
 using NUnit.Framework;
-using Eto.Forms;
-using System.Linq;
-
 namespace Eto.Test.UnitTests.Forms.Controls
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/SliderTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/SliderTests.cs
index 56c897ff99..3f5b564f3a 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/SliderTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/SliderTests.cs
@@ -1,7 +1,4 @@
-using System;
-using NUnit.Framework;
-using Eto.Forms;
-
+using NUnit.Framework;
 namespace Eto.Test.UnitTests.Forms.Controls
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/SplitterTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/SplitterTests.cs
index b23ce82426..61e8bae117 100755
--- a/test/Eto.Test/UnitTests/Forms/Controls/SplitterTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/SplitterTests.cs
@@ -1,9 +1,4 @@
-using Eto.Drawing;
-using Eto.Forms;
 using NUnit.Framework;
-using System;
-using System.Collections;
-
 namespace Eto.Test.UnitTests.Forms.Controls
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/TextAreaTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/TextAreaTests.cs
index bbbfd74e91..25a75e0243 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/TextAreaTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/TextAreaTests.cs
@@ -1,5 +1,3 @@
-using System;
-using Eto.Forms;
 using NUnit.Framework;
 using Range = Eto.Forms.Range;
 
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/TextBoxTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/TextBoxTests.cs
index 0f369bcbb5..f3bbe63aa0 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/TextBoxTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/TextBoxTests.cs
@@ -1,8 +1,4 @@
-using System;
 using NUnit.Framework;
-using Eto.Forms;
-using System.Threading.Tasks;
-using System.Collections.Generic;
 using Range = Eto.Forms.Range;
 
 namespace Eto.Test.UnitTests.Forms.Controls
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/TextChangingEventArgsTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/TextChangingEventArgsTests.cs
index 986d81ad28..493c25f14a 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/TextChangingEventArgsTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/TextChangingEventArgsTests.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using Eto.Forms;
 using NUnit.Framework;
 using Range = Eto.Forms.Range;
 
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/TreeGridViewTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/TreeGridViewTests.cs
index f6f35d2221..03bf654e47 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/TreeGridViewTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/TreeGridViewTests.cs
@@ -1,11 +1,5 @@
-using System;
 using NUnit.Framework;
-using Eto.Forms;
-using System.Linq;
-using Eto.Drawing;
 using System.Runtime.ExceptionServices;
-using System.Collections.Generic;
-
 namespace Eto.Test.UnitTests.Forms.Controls
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/Controls/WebViewTests.cs b/test/Eto.Test/UnitTests/Forms/Controls/WebViewTests.cs
index 78840ecd8f..552912fa83 100644
--- a/test/Eto.Test/UnitTests/Forms/Controls/WebViewTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Controls/WebViewTests.cs
@@ -1,12 +1,5 @@
-using System;
 using NUnit.Framework;
-using Eto.Forms;
-using System.Threading.Tasks;
-using System.Collections.Generic;
 using System.Runtime.ExceptionServices;
-using System.Threading;
-using Eto.Drawing;
-
 namespace Eto.Test.UnitTests.Forms.Controls
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/DataContextTests.cs b/test/Eto.Test/UnitTests/Forms/DataContextTests.cs
index ea80e475d4..82808b70fd 100644
--- a/test/Eto.Test/UnitTests/Forms/DataContextTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/DataContextTests.cs
@@ -1,6 +1,4 @@
-using System;
-using NUnit.Framework;
-using Eto.Forms;
+using NUnit.Framework;
 namespace Eto.Test.UnitTests.Forms
 {
 	/// <summary>
diff --git a/test/Eto.Test/UnitTests/Forms/DefaultStyleProviderTests.cs b/test/Eto.Test/UnitTests/Forms/DefaultStyleProviderTests.cs
index 91453b5ede..6fd352e5da 100644
--- a/test/Eto.Test/UnitTests/Forms/DefaultStyleProviderTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/DefaultStyleProviderTests.cs
@@ -1,5 +1,3 @@
-using System;
-using Eto.Forms;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Forms
diff --git a/test/Eto.Test/UnitTests/Forms/DialogTests.cs b/test/Eto.Test/UnitTests/Forms/DialogTests.cs
index 399956e048..50a1c3420f 100644
--- a/test/Eto.Test/UnitTests/Forms/DialogTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/DialogTests.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Threading.Tasks;
-using Eto.Drawing;
-using Eto.Forms;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Forms
diff --git a/test/Eto.Test/UnitTests/Forms/FileDialogTests.cs b/test/Eto.Test/UnitTests/Forms/FileDialogTests.cs
index c3829016dd..52124369aa 100644
--- a/test/Eto.Test/UnitTests/Forms/FileDialogTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/FileDialogTests.cs
@@ -1,8 +1,3 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using Eto.Drawing;
-using Eto.Forms;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Forms
diff --git a/test/Eto.Test/UnitTests/Forms/FilterCollectionTests.cs b/test/Eto.Test/UnitTests/Forms/FilterCollectionTests.cs
index 4576ea8910..0ebfe5e183 100644
--- a/test/Eto.Test/UnitTests/Forms/FilterCollectionTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/FilterCollectionTests.cs
@@ -1,11 +1,4 @@
-using System;
 using NUnit.Framework;
-using Eto.Forms;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Collections.Specialized;
-
 namespace Eto.Test.UnitTests.Forms
 {
 	/// <summary>
diff --git a/test/Eto.Test/UnitTests/Forms/FontDialogTests.cs b/test/Eto.Test/UnitTests/Forms/FontDialogTests.cs
index 7d5b83be84..62facd805a 100644
--- a/test/Eto.Test/UnitTests/Forms/FontDialogTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/FontDialogTests.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Threading.Tasks;
-using Eto.Drawing;
-using Eto.Forms;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Forms
diff --git a/test/Eto.Test/UnitTests/Forms/GridViewUtils.cs b/test/Eto.Test/UnitTests/Forms/GridViewUtils.cs
index 577caf7a9b..3dc375e6ff 100644
--- a/test/Eto.Test/UnitTests/Forms/GridViewUtils.cs
+++ b/test/Eto.Test/UnitTests/Forms/GridViewUtils.cs
@@ -1,12 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Eto.Forms;
-using System.Collections.ObjectModel;
-
-namespace Eto.Test.UnitTests.Forms
+namespace Eto.Test.UnitTests.Forms
 {
 	class DataItem
 	{
diff --git a/test/Eto.Test/UnitTests/Forms/Layout/DynamicLayoutTests.cs b/test/Eto.Test/UnitTests/Forms/Layout/DynamicLayoutTests.cs
index 994566b801..1f03f9f7d7 100644
--- a/test/Eto.Test/UnitTests/Forms/Layout/DynamicLayoutTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Layout/DynamicLayoutTests.cs
@@ -1,8 +1,4 @@
-using System;
-using NUnit.Framework;
-using Eto.Forms;
-using System.Collections.Generic;
-
+using NUnit.Framework;
 namespace Eto.Test.UnitTests.Forms.Layout
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/Layout/LayoutTests.cs b/test/Eto.Test/UnitTests/Forms/Layout/LayoutTests.cs
index d80eb63343..cf48d41fe5 100755
--- a/test/Eto.Test/UnitTests/Forms/Layout/LayoutTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Layout/LayoutTests.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Forms.Layout
diff --git a/test/Eto.Test/UnitTests/Forms/Layout/PixelLayoutTests.cs b/test/Eto.Test/UnitTests/Forms/Layout/PixelLayoutTests.cs
index 6f3f1a8900..b761bd59d7 100644
--- a/test/Eto.Test/UnitTests/Forms/Layout/PixelLayoutTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Layout/PixelLayoutTests.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Forms.Layout
diff --git a/test/Eto.Test/UnitTests/Forms/Layout/StackLayoutTests.cs b/test/Eto.Test/UnitTests/Forms/Layout/StackLayoutTests.cs
index d84092747a..e5fe712940 100644
--- a/test/Eto.Test/UnitTests/Forms/Layout/StackLayoutTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Layout/StackLayoutTests.cs
@@ -1,8 +1,4 @@
-using System;
-using Eto.Forms;
 using NUnit.Framework;
-using Eto.Drawing;
-
 namespace Eto.Test.UnitTests.Forms.Layout
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/Layout/TableLayoutTests.cs b/test/Eto.Test/UnitTests/Forms/Layout/TableLayoutTests.cs
index b875e3d640..6f49cb5574 100644
--- a/test/Eto.Test/UnitTests/Forms/Layout/TableLayoutTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Layout/TableLayoutTests.cs
@@ -1,9 +1,4 @@
-using System;
 using NUnit.Framework;
-using Eto.Forms;
-using Eto.Drawing;
-using System.Linq;
-
 namespace Eto.Test.UnitTests.Forms.Layout
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/MenuItemTests.cs b/test/Eto.Test/UnitTests/Forms/MenuItemTests.cs
index 1d4028980e..808c08e993 100644
--- a/test/Eto.Test/UnitTests/Forms/MenuItemTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/MenuItemTests.cs
@@ -1,6 +1,3 @@
-using System;
-using Eto.Drawing;
-using Eto.Forms;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Forms
diff --git a/test/Eto.Test/UnitTests/Forms/MessageBoxTests.cs b/test/Eto.Test/UnitTests/Forms/MessageBoxTests.cs
index 225d556545..989a6365ca 100644
--- a/test/Eto.Test/UnitTests/Forms/MessageBoxTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/MessageBoxTests.cs
@@ -1,8 +1,3 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using Eto.Drawing;
-using Eto.Forms;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Forms
diff --git a/test/Eto.Test/UnitTests/Forms/PrintingTests.cs b/test/Eto.Test/UnitTests/Forms/PrintingTests.cs
index 565b380f82..69ee7749dc 100644
--- a/test/Eto.Test/UnitTests/Forms/PrintingTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/PrintingTests.cs
@@ -1,5 +1,3 @@
-using Eto.Drawing;
-using Eto.Forms;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Forms
diff --git a/test/Eto.Test/UnitTests/Forms/RangeTests.cs b/test/Eto.Test/UnitTests/Forms/RangeTests.cs
index 4e69cbb800..a4543d5ee2 100644
--- a/test/Eto.Test/UnitTests/Forms/RangeTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/RangeTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Eto.Forms;
-using NUnit.Framework;
+using NUnit.Framework;
 
 namespace Eto.Test.UnitTests.Forms
 {
diff --git a/test/Eto.Test/UnitTests/Forms/TestClasses.cs b/test/Eto.Test/UnitTests/Forms/TestClasses.cs
index d6eaaceb72..db00d59abb 100644
--- a/test/Eto.Test/UnitTests/Forms/TestClasses.cs
+++ b/test/Eto.Test/UnitTests/Forms/TestClasses.cs
@@ -1,7 +1,4 @@
-using System;
-using Eto.Forms;
-
-namespace Eto.Test.UnitTests.Forms
+namespace Eto.Test.UnitTests.Forms
 {
 	public class TestXamlChild : Panel
 	{
diff --git a/test/Eto.Test/UnitTests/Forms/ToolBarTests.cs b/test/Eto.Test/UnitTests/Forms/ToolBarTests.cs
index 658848310e..aec57d5c74 100644
--- a/test/Eto.Test/UnitTests/Forms/ToolBarTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/ToolBarTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Threading;
-using Eto.Forms;
 using NUnit.Framework;
-using Eto.Drawing;
 namespace Eto.Test.UnitTests.Forms
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/ToolItemCollectionTests.cs b/test/Eto.Test/UnitTests/Forms/ToolItemCollectionTests.cs
index 96b4e5c125..661deb901f 100644
--- a/test/Eto.Test/UnitTests/Forms/ToolItemCollectionTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/ToolItemCollectionTests.cs
@@ -1,7 +1,4 @@
-using System;
-using NUnit.Framework;
-using Eto.Forms;
-
+using NUnit.Framework;
 namespace Eto.Test.UnitTests.Forms
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/WindowTests.cs b/test/Eto.Test/UnitTests/Forms/WindowTests.cs
index 4fe40aa32c..6b6fe9d43e 100644
--- a/test/Eto.Test/UnitTests/Forms/WindowTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/WindowTests.cs
@@ -1,15 +1,4 @@
-using System;
 using NUnit.Framework;
-using Eto.Forms;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Collections.Specialized;
-using Eto.Drawing;
-using System.Threading;
-using System.Threading.Tasks;
-using System.ComponentModel;
-
 namespace Eto.Test.UnitTests.Forms
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/Forms/XamlTests.cs b/test/Eto.Test/UnitTests/Forms/XamlTests.cs
index 8972e77196..4e35dd4d1d 100644
--- a/test/Eto.Test/UnitTests/Forms/XamlTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/XamlTests.cs
@@ -1,11 +1,6 @@
-using System;
-using NUnit.Framework.Internal;
+using NUnit.Framework.Internal;
 using Eto.Serialization.Xaml;
-using System.IO;
-using Eto.Forms;
 using NUnit.Framework;
-using Eto.Drawing;
-
 namespace Eto.Test.UnitTests.Forms
 {
 	[TestFixture]
diff --git a/test/Eto.Test/UnitTests/PlatformTests.cs b/test/Eto.Test/UnitTests/PlatformTests.cs
index c8b20be715..b2e3a68f41 100755
--- a/test/Eto.Test/UnitTests/PlatformTests.cs
+++ b/test/Eto.Test/UnitTests/PlatformTests.cs
@@ -1,4 +1,3 @@
-using System;
 using NUnit.Framework;
 
 namespace Eto.Test.UnitTests
diff --git a/test/Eto.Test/UnitTests/SingleFileDefaultTestAssemblyBuilder.cs b/test/Eto.Test/UnitTests/SingleFileDefaultTestAssemblyBuilder.cs
index c436c37877..145a1ac270 100644
--- a/test/Eto.Test/UnitTests/SingleFileDefaultTestAssemblyBuilder.cs
+++ b/test/Eto.Test/UnitTests/SingleFileDefaultTestAssemblyBuilder.cs
@@ -1,11 +1,6 @@
 // Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
 // modified to remove use of CodeBase which is unsupported in single file applications
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
 using System.Security;
 using NUnit;
 using NUnit.Framework;
diff --git a/test/Eto.Test/UnitTests/TestBase.cs b/test/Eto.Test/UnitTests/TestBase.cs
index 46a00c12f5..95a7d06909 100755
--- a/test/Eto.Test/UnitTests/TestBase.cs
+++ b/test/Eto.Test/UnitTests/TestBase.cs
@@ -1,22 +1,8 @@
-using Eto.Drawing;
-using Eto.Forms;
 using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Diagnostics;
 using System.Runtime.ExceptionServices;
-using System.Threading.Tasks;
-using System.IO;
-using System.Linq.Expressions;
-using System.Reflection;
-using System.ComponentModel;
 using NUnit.Framework.Interfaces;
 using NUnit.Framework.Internal.Commands;
 using NUnit.Framework.Internal;
-using Container = Eto.Forms.Container;
 
 namespace Eto.Test.UnitTests
 {
diff --git a/test/Eto.Test/Utility.cs b/test/Eto.Test/Utility.cs
index 80180339bd..aa9fab51fd 100755
--- a/test/Eto.Test/Utility.cs
+++ b/test/Eto.Test/Utility.cs
@@ -1,5 +1,3 @@
-using System.Text;
-
 namespace Eto.Test
 {
 	public static class Utility