diff --git a/InstallerProjects/CustomActions/Properties/AssemblyInfo.cs b/InstallerProjects/CustomActions/Properties/AssemblyInfo.cs
index 7bc84e2c..3114143c 100644
--- a/InstallerProjects/CustomActions/Properties/AssemblyInfo.cs
+++ b/InstallerProjects/CustomActions/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
diff --git a/mRemoteNG.Specs/Properties/AssemblyInfo.cs b/mRemoteNG.Specs/Properties/AssemblyInfo.cs
index fd46c27c..4d1ab78b 100644
--- a/mRemoteNG.Specs/Properties/AssemblyInfo.cs
+++ b/mRemoteNG.Specs/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
diff --git a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormatTests.cs b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormatTests.cs
index c0c562d1..d9ca691d 100644
--- a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormatTests.cs
+++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormatTests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using mRemoteNG.Config.Serializers;
 using mRemoteNG.Config.Serializers.Csv;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
diff --git a/mRemoteNGTests/Config/Serializers/DataTableDeserializerTests.cs b/mRemoteNGTests/Config/Serializers/DataTableDeserializerTests.cs
index 8d7cc77f..54cc8e22 100644
--- a/mRemoteNGTests/Config/Serializers/DataTableDeserializerTests.cs
+++ b/mRemoteNGTests/Config/Serializers/DataTableDeserializerTests.cs
@@ -6,7 +6,6 @@ using mRemoteNG.Security;
 using mRemoteNG.Security.SymmetricEncryption;
 using mRemoteNG.Tree;
 using mRemoteNGTests.TestHelpers;
-using NSubstitute;
 using NUnit.Framework;
 
 namespace mRemoteNGTests.Config.Serializers
diff --git a/mRemoteNGTests/Config/Serializers/DataTableSerializerTests.cs b/mRemoteNGTests/Config/Serializers/DataTableSerializerTests.cs
index 6292419a..a3ca2738 100644
--- a/mRemoteNGTests/Config/Serializers/DataTableSerializerTests.cs
+++ b/mRemoteNGTests/Config/Serializers/DataTableSerializerTests.cs
@@ -1,15 +1,11 @@
 using System.Linq;
 using System.Security;
-using mRemoteNG.Config.Serializers;
 using mRemoteNG.Config.Serializers.MsSql;
 using mRemoteNG.Connection;
-using mRemoteNG.Container;
 using mRemoteNG.Security;
 using mRemoteNG.Security.SymmetricEncryption;
 using mRemoteNG.Tree;
-using mRemoteNG.Tree.Root;
 using mRemoteNGTests.TestHelpers;
-using NSubstitute;
 using NUnit.Framework;
 
 namespace mRemoteNGTests.Config.Serializers
diff --git a/mRemoteNGTests/Connection/Protocol/IntegratedProgramTests.cs b/mRemoteNGTests/Connection/Protocol/IntegratedProgramTests.cs
index 86a9cd30..a0ae68a4 100644
--- a/mRemoteNGTests/Connection/Protocol/IntegratedProgramTests.cs
+++ b/mRemoteNGTests/Connection/Protocol/IntegratedProgramTests.cs
@@ -1,5 +1,4 @@
-using System.Collections.ObjectModel;
-using mRemoteNG.App;
+using mRemoteNG.App;
 using mRemoteNG.Connection;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Tools;
diff --git a/mRemoteNGTests/Properties/AssemblyInfo.cs b/mRemoteNGTests/Properties/AssemblyInfo.cs
index b7cdbe8e..40f8c457 100644
--- a/mRemoteNGTests/Properties/AssemblyInfo.cs
+++ b/mRemoteNGTests/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
diff --git a/mRemoteNGTests/UI/Controls/PageSequenceTests.cs b/mRemoteNGTests/UI/Controls/PageSequenceTests.cs
index 49cabc31..8a227701 100644
--- a/mRemoteNGTests/UI/Controls/PageSequenceTests.cs
+++ b/mRemoteNGTests/UI/Controls/PageSequenceTests.cs
@@ -1,7 +1,6 @@
 using System.Linq;
 using System.Windows.Forms;
 using mRemoteNG.UI.Controls.PageSequence;
-using NSubstitute;
 using NUnit.Framework;
 
 namespace mRemoteNGTests.UI.Controls
diff --git a/mRemoteNGTests/UI/Controls/TestForm.cs b/mRemoteNGTests/UI/Controls/TestForm.cs
index 3c70a2e9..200e032d 100644
--- a/mRemoteNGTests/UI/Controls/TestForm.cs
+++ b/mRemoteNGTests/UI/Controls/TestForm.cs
@@ -1,11 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace mRemoteNGTests.UI.Controls
diff --git a/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowRdpSpecialTests.cs b/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowRdpSpecialTests.cs
index 448a28e3..a21cecc5 100644
--- a/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowRdpSpecialTests.cs
+++ b/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowRdpSpecialTests.cs
@@ -1,5 +1,4 @@
-using mRemoteNG.Connection;
-using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Connection.Protocol.RDP;
 using NUnit.Framework;
 
diff --git a/mRemoteV1/Config/Connections/CsvConnectionsSaver.cs b/mRemoteV1/Config/Connections/CsvConnectionsSaver.cs
index e49a293e..d8d3ef2a 100644
--- a/mRemoteV1/Config/Connections/CsvConnectionsSaver.cs
+++ b/mRemoteV1/Config/Connections/CsvConnectionsSaver.cs
@@ -1,7 +1,6 @@
 using System;
 using mRemoteNG.App;
 using mRemoteNG.Config.DataProviders;
-using mRemoteNG.Config.Serializers;
 using mRemoteNG.Config.Serializers.Csv;
 using mRemoteNG.Security;
 using mRemoteNG.Tree;
diff --git a/mRemoteV1/Config/Connections/SqlConnectionsSaver.cs b/mRemoteV1/Config/Connections/SqlConnectionsSaver.cs
index 4b160847..a3a24dd1 100644
--- a/mRemoteV1/Config/Connections/SqlConnectionsSaver.cs
+++ b/mRemoteV1/Config/Connections/SqlConnectionsSaver.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Data.SqlClient;
 using System.Globalization;
 using System.Linq;
 using mRemoteNG.App;
diff --git a/mRemoteV1/Config/Connections/XmlConnectionsSaver.cs b/mRemoteV1/Config/Connections/XmlConnectionsSaver.cs
index b7cea279..e4452af9 100644
--- a/mRemoteV1/Config/Connections/XmlConnectionsSaver.cs
+++ b/mRemoteV1/Config/Connections/XmlConnectionsSaver.cs
@@ -2,7 +2,6 @@
 using System.Linq;
 using mRemoteNG.App;
 using mRemoteNG.Config.DataProviders;
-using mRemoteNG.Config.Serializers;
 using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Security;
 using mRemoteNG.Security.Factories;
diff --git a/mRemoteV1/Config/Import/MRemoteNGXmlImporter.cs b/mRemoteV1/Config/Import/MRemoteNGXmlImporter.cs
index 2ee1f5e3..464f439e 100644
--- a/mRemoteV1/Config/Import/MRemoteNGXmlImporter.cs
+++ b/mRemoteV1/Config/Import/MRemoteNGXmlImporter.cs
@@ -1,8 +1,7 @@
-using System.IO;
+using System.IO;
 using System.Linq;
 using mRemoteNG.App;
 using mRemoteNG.Config.DataProviders;
-using mRemoteNG.Config.Serializers;
 using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Container;
 using mRemoteNG.Messages;
diff --git a/mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs b/mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs
index c434deab..f47600fe 100644
--- a/mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs
+++ b/mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs
@@ -14,7 +14,6 @@ using System.Data;
 using System.Linq;
 using System.Security;
 using mRemoteNG.Security;
-using mRemoteNG.Security.SymmetricEncryption;
 using mRemoteNG.Tools;
 
 namespace mRemoteNG.Config.Serializers.MsSql
diff --git a/mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/SqlConnectionListMetaData.cs b/mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/SqlConnectionListMetaData.cs
index 98d61ae4..e61a1228 100644
--- a/mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/SqlConnectionListMetaData.cs
+++ b/mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/SqlConnectionListMetaData.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Security;
 
 namespace mRemoteNG.Config.Serializers.MsSql
 {
diff --git a/mRemoteV1/Connection/ConnectionInitiator.cs b/mRemoteV1/Connection/ConnectionInitiator.cs
index 9ed26128..fc565a8c 100644
--- a/mRemoteV1/Connection/ConnectionInitiator.cs
+++ b/mRemoteV1/Connection/ConnectionInitiator.cs
@@ -5,7 +5,6 @@ using mRemoteNG.App;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Container;
 using mRemoteNG.Messages;
-using mRemoteNG.Tools;
 using mRemoteNG.UI.Forms;
 using mRemoteNG.UI.Panels;
 using mRemoteNG.UI.Tabs;
diff --git a/mRemoteV1/Connection/Protocol/PowerShell/Connection.Protocol.PowerShell.cs b/mRemoteV1/Connection/Protocol/PowerShell/Connection.Protocol.PowerShell.cs
index 186495e3..4f084806 100644
--- a/mRemoteV1/Connection/Protocol/PowerShell/Connection.Protocol.PowerShell.cs
+++ b/mRemoteV1/Connection/Protocol/PowerShell/Connection.Protocol.PowerShell.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Diagnostics;
 using System.Drawing;
-using System.Runtime.InteropServices;
-using System.Threading;
 using System.Windows.Forms;
 using mRemoteNG.App;
 using mRemoteNG.Messages;
diff --git a/mRemoteV1/Settings.cs b/mRemoteV1/Settings.cs
index 60a55207..af8a8703 100644
--- a/mRemoteV1/Settings.cs
+++ b/mRemoteV1/Settings.cs
@@ -1,6 +1,4 @@
-using System.Configuration;
-
-namespace mRemoteNG
+namespace mRemoteNG
 {
     // This class allows you to handle specific events on the settings class:
     //  The SettingChanging event is raised before a setting's value is changed.
diff --git a/mRemoteV1/Tree/ClickHandlers/ITreeNodeClickHandler.cs b/mRemoteV1/Tree/ClickHandlers/ITreeNodeClickHandler.cs
index 5369fc6d..c2225397 100644
--- a/mRemoteV1/Tree/ClickHandlers/ITreeNodeClickHandler.cs
+++ b/mRemoteV1/Tree/ClickHandlers/ITreeNodeClickHandler.cs
@@ -1,6 +1,4 @@
-using mRemoteNG.Connection;
-
-namespace mRemoteNG.Tree
+namespace mRemoteNG.Tree
 {
     public interface ITreeNodeClickHandler<in T>
     {
diff --git a/mRemoteV1/UI/Controls/Base/NGLabel.cs b/mRemoteV1/UI/Controls/Base/NGLabel.cs
index 28cdd43a..9442d669 100644
--- a/mRemoteV1/UI/Controls/Base/NGLabel.cs
+++ b/mRemoteV1/UI/Controls/Base/NGLabel.cs
@@ -1,9 +1,6 @@
 using System;
-using System.ComponentModel;
 using mRemoteNG.Themes;
 using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Drawing.Text;
 using System.Windows.Forms;
 
 namespace mRemoteNG.UI.Controls.Base
diff --git a/mRemoteV1/UI/Tabs/Enums.cs b/mRemoteV1/UI/Tabs/Enums.cs
index 601f30d1..30367ce0 100644
--- a/mRemoteV1/UI/Tabs/Enums.cs
+++ b/mRemoteV1/UI/Tabs/Enums.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace mRemoteNG.UI.Tabs
 {
diff --git a/mRemoteV1/UI/Tabs/FloatWindowNG.cs b/mRemoteV1/UI/Tabs/FloatWindowNG.cs
index 770474da..b749df96 100644
--- a/mRemoteV1/UI/Tabs/FloatWindowNG.cs
+++ b/mRemoteV1/UI/Tabs/FloatWindowNG.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Drawing;
 using WeifenLuo.WinFormsUI.Docking;
 
 namespace mRemoteNG.UI.Tabs
diff --git a/mRemoteV1/UI/Window/ComponentsCheckWindow.cs b/mRemoteV1/UI/Window/ComponentsCheckWindow.cs
index 727e2555..211c0aa7 100644
--- a/mRemoteV1/UI/Window/ComponentsCheckWindow.cs
+++ b/mRemoteV1/UI/Window/ComponentsCheckWindow.cs
@@ -4,7 +4,6 @@ using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Threading;
-using AxMSTSCLib;
 using AxWFICALib;
 using Gecko;
 using mRemoteNG.App;
diff --git a/mRemoteV1/UI/Window/HelpWindow.cs b/mRemoteV1/UI/Window/HelpWindow.cs
index 34ed5d57..ace2a733 100644
--- a/mRemoteV1/UI/Window/HelpWindow.cs
+++ b/mRemoteV1/UI/Window/HelpWindow.cs
@@ -1,7 +1,6 @@
 using mRemoteNG.App.Info;
 using System;
 using System.Diagnostics;
-using System.Windows.Forms;
 using Gecko;
 using WeifenLuo.WinFormsUI.Docking;