diff --git a/.editorconfig b/.editorconfig
index 0f0b6b33..f43f4af3 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -130,6 +130,23 @@ dotnet_diagnostic.IDE0150.severity = none
 dotnet_diagnostic.IDE0020.severity = none
 dotnet_diagnostic.IDE0061.severity = none
 dotnet_diagnostic.IDE0062.severity = none
+dotnet_diagnostic.CA2215.severity = none
+dotnet_diagnostic.CA2229.severity = none
+dotnet_diagnostic.CA1710.severity = none
+dotnet_diagnostic.CA1050.severity = none
+
+# XML doc warnings
+dotnet_diagnostic.CS1591.severity = none
+dotnet_diagnostic.CS1570.severity = none
+dotnet_diagnostic.CS1571.severity = none
+dotnet_diagnostic.CS1572.severity = none
+dotnet_diagnostic.CS1573.severity = none
+dotnet_diagnostic.CS1587.severity = none
+dotnet_diagnostic.CS1574.severity = none
+dotnet_diagnostic.CS0419.severity = none
+dotnet_diagnostic.CS1723.severity = none
+dotnet_diagnostic.CS1711.severity = none
+
 
 #### Core EditorConfig Options ####
 
diff --git a/Directory.Build.props b/Directory.Build.props
index 64931656..7a474b3d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -10,5 +10,8 @@
     <ResourceProviderTargetFramework>net6.0</ResourceProviderTargetFramework>
     <ToolsServiceTargetRuntimes>win-x64;win-x86;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64;osx.10.11-x64;osx-x64;linux-x64</ToolsServiceTargetRuntimes>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <!-- This is required for IDE0005 to fail the build https://github.com/dotnet/roslyn/issues/41640 -->
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 </Project>
diff --git a/src/Microsoft.InsightsGenerator/Workflow.cs b/src/Microsoft.InsightsGenerator/Workflow.cs
index 74448746..714c4e01 100644
--- a/src/Microsoft.InsightsGenerator/Workflow.cs
+++ b/src/Microsoft.InsightsGenerator/Workflow.cs
@@ -4,7 +4,6 @@
 //
 
 using System;
-using System.Collections.Concurrent;
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/src/Microsoft.Kusto.ServiceLayer/Connection/CancelTokenKey.cs b/src/Microsoft.Kusto.ServiceLayer/Connection/CancelTokenKey.cs
index 31cd987b..85e35a3d 100644
--- a/src/Microsoft.Kusto.ServiceLayer/Connection/CancelTokenKey.cs
+++ b/src/Microsoft.Kusto.ServiceLayer/Connection/CancelTokenKey.cs
@@ -4,9 +4,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.Kusto.ServiceLayer.Connection.Contracts;
 
 namespace Microsoft.Kusto.ServiceLayer.Connection
diff --git a/src/Microsoft.Kusto.ServiceLayer/Formatter/Impl/FormatOptions.cs b/src/Microsoft.Kusto.ServiceLayer/Formatter/Impl/FormatOptions.cs
index 82ff23ec..61c51720 100644
--- a/src/Microsoft.Kusto.ServiceLayer/Formatter/Impl/FormatOptions.cs
+++ b/src/Microsoft.Kusto.ServiceLayer/Formatter/Impl/FormatOptions.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using System.ComponentModel;
 
 namespace Microsoft.Kusto.ServiceLayer.Formatter
diff --git a/src/Microsoft.Kusto.ServiceLayer/LanguageServices/Contracts/SyntaxParse.cs b/src/Microsoft.Kusto.ServiceLayer/LanguageServices/Contracts/SyntaxParse.cs
index 3d52fdac..c024bae6 100644
--- a/src/Microsoft.Kusto.ServiceLayer/LanguageServices/Contracts/SyntaxParse.cs
+++ b/src/Microsoft.Kusto.ServiceLayer/LanguageServices/Contracts/SyntaxParse.cs
@@ -4,7 +4,6 @@
 //
 
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.Kusto.ServiceLayer.Workspace.Contracts;
 
 namespace Microsoft.Kusto.ServiceLayer.LanguageServices.Contracts
 {
diff --git a/src/Microsoft.Kusto.ServiceLayer/LanguageServices/InteractionMetrics.cs b/src/Microsoft.Kusto.ServiceLayer/LanguageServices/InteractionMetrics.cs
index aa085a01..63189271 100644
--- a/src/Microsoft.Kusto.ServiceLayer/LanguageServices/InteractionMetrics.cs
+++ b/src/Microsoft.Kusto.ServiceLayer/LanguageServices/InteractionMetrics.cs
@@ -7,7 +7,6 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.SqlTools.Utility;
 
 namespace Microsoft.Kusto.ServiceLayer
diff --git a/src/Microsoft.Kusto.ServiceLayer/ObjectExplorer/Contracts/CloseSessionRequest.cs b/src/Microsoft.Kusto.ServiceLayer/ObjectExplorer/Contracts/CloseSessionRequest.cs
index 4b3e98c4..5757e947 100644
--- a/src/Microsoft.Kusto.ServiceLayer/ObjectExplorer/Contracts/CloseSessionRequest.cs
+++ b/src/Microsoft.Kusto.ServiceLayer/ObjectExplorer/Contracts/CloseSessionRequest.cs
@@ -4,7 +4,6 @@
 //
 
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.Kusto.ServiceLayer.Connection.Contracts;
 
 namespace Microsoft.Kusto.ServiceLayer.ObjectExplorer.Contracts
 {
diff --git a/src/Microsoft.Kusto.ServiceLayer/ObjectExplorer/Contracts/FindNodesRequest.cs b/src/Microsoft.Kusto.ServiceLayer/ObjectExplorer/Contracts/FindNodesRequest.cs
index fa507470..8b748894 100644
--- a/src/Microsoft.Kusto.ServiceLayer/ObjectExplorer/Contracts/FindNodesRequest.cs
+++ b/src/Microsoft.Kusto.ServiceLayer/ObjectExplorer/Contracts/FindNodesRequest.cs
@@ -5,7 +5,6 @@
 
 using System.Collections.Generic;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.Kusto.ServiceLayer.Connection.Contracts;
 
 namespace Microsoft.Kusto.ServiceLayer.ObjectExplorer.Contracts
 {
diff --git a/src/Microsoft.Kusto.ServiceLayer/ObjectExplorer/Nodes/NodeFilter.cs b/src/Microsoft.Kusto.ServiceLayer/ObjectExplorer/Nodes/NodeFilter.cs
index 96f1c9dc..4a2bdd6f 100644
--- a/src/Microsoft.Kusto.ServiceLayer/ObjectExplorer/Nodes/NodeFilter.cs
+++ b/src/Microsoft.Kusto.ServiceLayer/ObjectExplorer/Nodes/NodeFilter.cs
@@ -4,7 +4,6 @@
 //
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
diff --git a/src/Microsoft.Kusto.ServiceLayer/ObjectExplorer/ObjectExplorerUtils.cs b/src/Microsoft.Kusto.ServiceLayer/ObjectExplorer/ObjectExplorerUtils.cs
index 941e45b1..2e08d8d6 100644
--- a/src/Microsoft.Kusto.ServiceLayer/ObjectExplorer/ObjectExplorerUtils.cs
+++ b/src/Microsoft.Kusto.ServiceLayer/ObjectExplorer/ObjectExplorerUtils.cs
@@ -6,7 +6,6 @@
 using System;
 using System.Threading;
 using Microsoft.Kusto.ServiceLayer.ObjectExplorer.Nodes;
-using Microsoft.Kusto.ServiceLayer.Utility;
 
 namespace Microsoft.Kusto.ServiceLayer.ObjectExplorer
 {
diff --git a/src/Microsoft.Kusto.ServiceLayer/ObjectExplorer/ValidForFlag.cs b/src/Microsoft.Kusto.ServiceLayer/ObjectExplorer/ValidForFlag.cs
index 220a11df..23d884b8 100644
--- a/src/Microsoft.Kusto.ServiceLayer/ObjectExplorer/ValidForFlag.cs
+++ b/src/Microsoft.Kusto.ServiceLayer/ObjectExplorer/ValidForFlag.cs
@@ -4,9 +4,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Microsoft.Kusto.ServiceLayer.ObjectExplorer
 {
diff --git a/src/Microsoft.Kusto.ServiceLayer/QueryExecution/Contracts/Serialization.cs b/src/Microsoft.Kusto.ServiceLayer/QueryExecution/Contracts/Serialization.cs
index aaf6277e..a8bcb800 100644
--- a/src/Microsoft.Kusto.ServiceLayer/QueryExecution/Contracts/Serialization.cs
+++ b/src/Microsoft.Kusto.ServiceLayer/QueryExecution/Contracts/Serialization.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Data;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
 using Microsoft.SqlTools.Utility;
 
diff --git a/src/Microsoft.Kusto.ServiceLayer/QueryExecution/DataStorage/StorageDataReader.cs b/src/Microsoft.Kusto.ServiceLayer/QueryExecution/DataStorage/StorageDataReader.cs
index 1b0a13e7..26a14755 100644
--- a/src/Microsoft.Kusto.ServiceLayer/QueryExecution/DataStorage/StorageDataReader.cs
+++ b/src/Microsoft.Kusto.ServiceLayer/QueryExecution/DataStorage/StorageDataReader.cs
@@ -6,15 +6,11 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.Common;
-using System.Data.SqlClient;
-using System.Data.SqlTypes;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Xml;
 using Microsoft.Kusto.ServiceLayer.QueryExecution.Contracts;
 using Microsoft.SqlTools.Utility;
 
diff --git a/src/Microsoft.Kusto.ServiceLayer/QueryExecution/SerializationService.cs b/src/Microsoft.Kusto.ServiceLayer/QueryExecution/SerializationService.cs
index 34192c2e..a1bb218a 100644
--- a/src/Microsoft.Kusto.ServiceLayer/QueryExecution/SerializationService.cs
+++ b/src/Microsoft.Kusto.ServiceLayer/QueryExecution/SerializationService.cs
@@ -6,7 +6,6 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Composition;
 using System.Diagnostics;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.Extensibility;
@@ -20,7 +19,7 @@ using Microsoft.SqlTools.Utility;
 
 namespace Microsoft.Kusto.ServiceLayer.QueryExecution
 {
-    
+
     public class SerializationService : HostedService<SerializationService>, IComposableService
     {
         private ConcurrentDictionary<string, DataSerializer> inProgressSerializations;
diff --git a/src/Microsoft.Kusto.ServiceLayer/Scripting/Contracts/ScriptingListObjectsRequest.cs b/src/Microsoft.Kusto.ServiceLayer/Scripting/Contracts/ScriptingListObjectsRequest.cs
index da353817..c18df7b9 100644
--- a/src/Microsoft.Kusto.ServiceLayer/Scripting/Contracts/ScriptingListObjectsRequest.cs
+++ b/src/Microsoft.Kusto.ServiceLayer/Scripting/Contracts/ScriptingListObjectsRequest.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Collections.Generic;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
 
 namespace Microsoft.Kusto.ServiceLayer.Scripting.Contracts
diff --git a/src/Microsoft.Kusto.ServiceLayer/Scripting/Contracts/ScriptingObject.cs b/src/Microsoft.Kusto.ServiceLayer/Scripting/Contracts/ScriptingObject.cs
index 98524139..a5fb73ea 100644
--- a/src/Microsoft.Kusto.ServiceLayer/Scripting/Contracts/ScriptingObject.cs
+++ b/src/Microsoft.Kusto.ServiceLayer/Scripting/Contracts/ScriptingObject.cs
@@ -4,7 +4,6 @@
 //
 
 using System;
-using System.Collections.Generic;
 
 namespace Microsoft.Kusto.ServiceLayer.Scripting.Contracts
 {
diff --git a/src/Microsoft.Kusto.ServiceLayer/Scripting/ScriptingExtensionMethods.cs b/src/Microsoft.Kusto.ServiceLayer/Scripting/ScriptingExtensionMethods.cs
index 49532f89..c2cde43c 100644
--- a/src/Microsoft.Kusto.ServiceLayer/Scripting/ScriptingExtensionMethods.cs
+++ b/src/Microsoft.Kusto.ServiceLayer/Scripting/ScriptingExtensionMethods.cs
@@ -3,11 +3,9 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.SqlServer.Management.Sdk.Sfc;
 using Microsoft.SqlServer.Management.SqlScriptPublish;
 using Microsoft.Kusto.ServiceLayer.Scripting.Contracts;
diff --git a/src/Microsoft.Kusto.ServiceLayer/Scripting/ScriptingOperation.cs b/src/Microsoft.Kusto.ServiceLayer/Scripting/ScriptingOperation.cs
index 1fc99df5..e321419c 100644
--- a/src/Microsoft.Kusto.ServiceLayer/Scripting/ScriptingOperation.cs
+++ b/src/Microsoft.Kusto.ServiceLayer/Scripting/ScriptingOperation.cs
@@ -6,7 +6,6 @@
 using System;
 using System.Diagnostics;
 using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.SqlTools.Utility;
 
 namespace Microsoft.Kusto.ServiceLayer.Scripting
diff --git a/src/Microsoft.Kusto.ServiceLayer/SqlContext/CompoundSqlToolsSettingsValues.cs b/src/Microsoft.Kusto.ServiceLayer/SqlContext/CompoundSqlToolsSettingsValues.cs
index 283fb8de..23748047 100644
--- a/src/Microsoft.Kusto.ServiceLayer/SqlContext/CompoundSqlToolsSettingsValues.cs
+++ b/src/Microsoft.Kusto.ServiceLayer/SqlContext/CompoundSqlToolsSettingsValues.cs
@@ -7,11 +7,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.SqlTools.Utility;
-using Newtonsoft.Json;
 
 namespace Microsoft.Kusto.ServiceLayer.SqlContext
 {
-    
+
     /// <summary>
     /// Handles backwards compatibility of settings by checking for settings in a priority list. If a settings
     /// group such as Intellisense is defined on a serialized setting it's used in the order of mssql, then sql, then
diff --git a/src/Microsoft.Kusto.ServiceLayer/SqlContext/SqlToolsSettings.cs b/src/Microsoft.Kusto.ServiceLayer/SqlContext/SqlToolsSettings.cs
index d7f10880..57addf68 100644
--- a/src/Microsoft.Kusto.ServiceLayer/SqlContext/SqlToolsSettings.cs
+++ b/src/Microsoft.Kusto.ServiceLayer/SqlContext/SqlToolsSettings.cs
@@ -3,10 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.SqlTools.Utility;
 using Newtonsoft.Json;
 
 namespace Microsoft.Kusto.ServiceLayer.SqlContext
diff --git a/src/Microsoft.Kusto.ServiceLayer/SqlContext/SqlToolsSettingsValues.cs b/src/Microsoft.Kusto.ServiceLayer/SqlContext/SqlToolsSettingsValues.cs
index 510f32dc..806e531e 100644
--- a/src/Microsoft.Kusto.ServiceLayer/SqlContext/SqlToolsSettingsValues.cs
+++ b/src/Microsoft.Kusto.ServiceLayer/SqlContext/SqlToolsSettingsValues.cs
@@ -3,10 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.SqlTools.Utility;
 using Newtonsoft.Json;
 
 namespace Microsoft.Kusto.ServiceLayer.SqlContext
diff --git a/src/Microsoft.Kusto.ServiceLayer/Utility/TaskExtensions.cs b/src/Microsoft.Kusto.ServiceLayer/Utility/TaskExtensions.cs
index 01b154b3..5f8f5328 100644
--- a/src/Microsoft.Kusto.ServiceLayer/Utility/TaskExtensions.cs
+++ b/src/Microsoft.Kusto.ServiceLayer/Utility/TaskExtensions.cs
@@ -6,7 +6,6 @@
 using System;
 using System.Diagnostics;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.Utility;
 
diff --git a/src/Microsoft.SqlTools.Credentials/Program.cs b/src/Microsoft.SqlTools.Credentials/Program.cs
index 359f09f0..c3963b7a 100644
--- a/src/Microsoft.SqlTools.Credentials/Program.cs
+++ b/src/Microsoft.SqlTools.Credentials/Program.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Diagnostics;
-using System.IO;
 using Microsoft.SqlTools.Credentials.Utility;
 using Microsoft.SqlTools.Hosting.Utility;
 using Microsoft.SqlTools.ServiceLayer.SqlContext;
diff --git a/src/Microsoft.SqlTools.Hosting/Extensibility/ExtensionServiceProvider.cs b/src/Microsoft.SqlTools.Hosting/Extensibility/ExtensionServiceProvider.cs
index 19f08fa0..6c3939d5 100644
--- a/src/Microsoft.SqlTools.Hosting/Extensibility/ExtensionServiceProvider.cs
+++ b/src/Microsoft.SqlTools.Hosting/Extensibility/ExtensionServiceProvider.cs
@@ -5,7 +5,6 @@
 
 using System;
 using System.Collections;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Composition.Convention;
 using System.Composition.Hosting;
diff --git a/src/Microsoft.SqlTools.Hosting/Extensibility/RegisteredServiceProvider.cs b/src/Microsoft.SqlTools.Hosting/Extensibility/RegisteredServiceProvider.cs
index 768f7ec8..6569b96f 100644
--- a/src/Microsoft.SqlTools.Hosting/Extensibility/RegisteredServiceProvider.cs
+++ b/src/Microsoft.SqlTools.Hosting/Extensibility/RegisteredServiceProvider.cs
@@ -8,7 +8,6 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Reflection;
 using Microsoft.SqlTools.Hosting;
 using Microsoft.SqlTools.Utility;
 
diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageReader.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageReader.cs
index 42eb9d7d..f7f171de 100644
--- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageReader.cs
+++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageReader.cs
@@ -8,7 +8,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.SqlTools.Hosting;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
 using Microsoft.SqlTools.Hosting.Protocol.Serializers;
 using Microsoft.SqlTools.Utility;
diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/RequestContext.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/RequestContext.cs
index 2207383b..3a8f8123 100644
--- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/RequestContext.cs
+++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/RequestContext.cs
@@ -7,7 +7,6 @@ using System;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
 using Error = Microsoft.SqlTools.Hosting.Contracts.Error;
-using Newtonsoft.Json.Linq;
 
 namespace Microsoft.SqlTools.Hosting.Protocol
 {
diff --git a/src/Microsoft.SqlTools.ResourceProvider.Core/AuthenticationService.cs b/src/Microsoft.SqlTools.ResourceProvider.Core/AuthenticationService.cs
index a17fcd01..e5fb9185 100644
--- a/src/Microsoft.SqlTools.ResourceProvider.Core/AuthenticationService.cs
+++ b/src/Microsoft.SqlTools.ResourceProvider.Core/AuthenticationService.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using System.Collections.Generic;
 using System.Composition;
 using System.Diagnostics;
@@ -11,11 +10,8 @@ using System.Threading.Tasks;
 using Microsoft.SqlTools.Extensibility;
 using Microsoft.SqlTools.Hosting;
 using Microsoft.SqlTools.Hosting.Protocol;
-using Microsoft.SqlTools.ResourceProvider.Core;
 using Microsoft.SqlTools.ResourceProvider.Core.Authentication;
 using Microsoft.SqlTools.ResourceProvider.Core.Contracts;
-using Microsoft.SqlTools.ResourceProvider.Core.Extensibility;
-using Microsoft.SqlTools.ResourceProvider.Core.Firewall;
 using Microsoft.SqlTools.Utility;
 
 namespace Microsoft.SqlTools.ResourceProvider.Core
diff --git a/src/Microsoft.SqlTools.ResourceProvider.Core/Common/ExceptionUtil.cs b/src/Microsoft.SqlTools.ResourceProvider.Core/Common/ExceptionUtil.cs
index ad6739c8..26b90b3d 100644
--- a/src/Microsoft.SqlTools.ResourceProvider.Core/Common/ExceptionUtil.cs
+++ b/src/Microsoft.SqlTools.ResourceProvider.Core/Common/ExceptionUtil.cs
@@ -5,7 +5,6 @@
 
 using System;
 using System.Data.Common;
-using Microsoft.Data.SqlClient;
 using System.Linq;
 
 namespace Microsoft.SqlTools.ResourceProvider.Core
diff --git a/src/Microsoft.SqlTools.ResourceProvider.Core/Contracts/AccountSecurityToken.cs b/src/Microsoft.SqlTools.ResourceProvider.Core/Contracts/AccountSecurityToken.cs
index 25bfbd96..7731083e 100644
--- a/src/Microsoft.SqlTools.ResourceProvider.Core/Contracts/AccountSecurityToken.cs
+++ b/src/Microsoft.SqlTools.ResourceProvider.Core/Contracts/AccountSecurityToken.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Collections.Generic;
-
 namespace Microsoft.SqlTools.ResourceProvider.Core.Contracts
 {
     /// <summary>
diff --git a/src/Microsoft.SqlTools.ResourceProvider.Core/Contracts/TokenReliantResponse.cs b/src/Microsoft.SqlTools.ResourceProvider.Core/Contracts/TokenReliantResponse.cs
index 1cd15ba2..30e636b8 100644
--- a/src/Microsoft.SqlTools.ResourceProvider.Core/Contracts/TokenReliantResponse.cs
+++ b/src/Microsoft.SqlTools.ResourceProvider.Core/Contracts/TokenReliantResponse.cs
@@ -3,9 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Collections.Generic;
-using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-
 namespace Microsoft.SqlTools.ResourceProvider.Core.Contracts
 {
     /// <summary>
diff --git a/src/Microsoft.SqlTools.ResourceProvider.Core/Discovery/IDatabaseDiscoveryProvider.cs b/src/Microsoft.SqlTools.ResourceProvider.Core/Discovery/IDatabaseDiscoveryProvider.cs
index 05600902..cf74b536 100644
--- a/src/Microsoft.SqlTools.ResourceProvider.Core/Discovery/IDatabaseDiscoveryProvider.cs
+++ b/src/Microsoft.SqlTools.ResourceProvider.Core/Discovery/IDatabaseDiscoveryProvider.cs
@@ -4,7 +4,6 @@
 //
 
 using System;
-using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.ResourceProvider.Core.Extensibility;
diff --git a/src/Microsoft.SqlTools.ResourceProvider.Core/Discovery/IServerDiscoveryProvider.cs b/src/Microsoft.SqlTools.ResourceProvider.Core/Discovery/IServerDiscoveryProvider.cs
index 06090465..94ee77d2 100644
--- a/src/Microsoft.SqlTools.ResourceProvider.Core/Discovery/IServerDiscoveryProvider.cs
+++ b/src/Microsoft.SqlTools.ResourceProvider.Core/Discovery/IServerDiscoveryProvider.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.ResourceProvider.Core.Extensibility;
 
diff --git a/src/Microsoft.SqlTools.ResourceProvider.Core/Extensibility/ExportableBase.cs b/src/Microsoft.SqlTools.ResourceProvider.Core/Extensibility/ExportableBase.cs
index 93eda94b..d5638fe5 100644
--- a/src/Microsoft.SqlTools.ResourceProvider.Core/Extensibility/ExportableBase.cs
+++ b/src/Microsoft.SqlTools.ResourceProvider.Core/Extensibility/ExportableBase.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Linq;
 using Microsoft.SqlTools.Extensibility;
 
 namespace Microsoft.SqlTools.ResourceProvider.Core.Extensibility
diff --git a/src/Microsoft.SqlTools.ResourceProvider.Core/Properties/AssemblyInfo.cs b/src/Microsoft.SqlTools.ResourceProvider.Core/Properties/AssemblyInfo.cs
index 03deec20..b7fd901c 100644
--- a/src/Microsoft.SqlTools.ResourceProvider.Core/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.SqlTools.ResourceProvider.Core/Properties/AssemblyInfo.cs
@@ -3,9 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 
 [assembly: InternalsVisibleTo("Microsoft.SqlTools.ServiceLayer.UnitTests")]
 [assembly: InternalsVisibleTo("Microsoft.SqlTools.ServiceLayer.IntegrationTests")]
diff --git a/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/AzureTenant.cs b/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/AzureTenant.cs
index 97b16064..9f8b5488 100644
--- a/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/AzureTenant.cs
+++ b/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/AzureTenant.cs
@@ -3,9 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
-using System.Collections.Generic;
-using Microsoft.SqlTools.ResourceProvider.Core;
 using Microsoft.SqlTools.ResourceProvider.Core.Authentication;
 
 namespace Microsoft.SqlTools.ResourceProvider.DefaultImpl
diff --git a/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/AzureUserAccount.cs b/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/AzureUserAccount.cs
index 11ebdff0..42e65bc9 100644
--- a/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/AzureUserAccount.cs
+++ b/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/AzureUserAccount.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using System.Collections.Generic;
 using Microsoft.SqlTools.ResourceProvider.Core;
 using Microsoft.SqlTools.ResourceProvider.Core.Authentication;
diff --git a/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/AzureUserAccountSubscriptionContext.cs b/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/AzureUserAccountSubscriptionContext.cs
index fed03df5..e91d5634 100644
--- a/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/AzureUserAccountSubscriptionContext.cs
+++ b/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/AzureUserAccountSubscriptionContext.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using Microsoft.Rest;
 using Microsoft.SqlTools.ResourceProvider.Core;
 using Microsoft.SqlTools.ResourceProvider.Core.Authentication;
diff --git a/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/SqlAzureResource.cs b/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/SqlAzureResource.cs
index 18829bae..f0cff5d8 100644
--- a/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/SqlAzureResource.cs
+++ b/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/SqlAzureResource.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using Microsoft.SqlTools.ResourceProvider.Core;
 using Models = Microsoft.Azure.Management.Sql.Models;
 
diff --git a/src/Microsoft.SqlTools.ResourceProvider/Program.cs b/src/Microsoft.SqlTools.ResourceProvider/Program.cs
index 9534cc20..3be39c14 100644
--- a/src/Microsoft.SqlTools.ResourceProvider/Program.cs
+++ b/src/Microsoft.SqlTools.ResourceProvider/Program.cs
@@ -5,7 +5,6 @@
 
 using System;
 using System.Diagnostics;
-using System.IO;
 using Microsoft.SqlTools.Hosting.Utility;
 using Microsoft.SqlTools.ServiceLayer.SqlContext;
 using Microsoft.SqlTools.Utility;
diff --git a/src/Microsoft.SqlTools.ResourceProvider/ResourceProviderHostLoader.cs b/src/Microsoft.SqlTools.ResourceProvider/ResourceProviderHostLoader.cs
index 5f3b62a5..8dc6aa30 100644
--- a/src/Microsoft.SqlTools.ResourceProvider/ResourceProviderHostLoader.cs
+++ b/src/Microsoft.SqlTools.ResourceProvider/ResourceProviderHostLoader.cs
@@ -4,14 +4,13 @@
 //
 
 using System.Collections.Generic;
-using System.Reflection;
 using Microsoft.SqlTools.Extensibility;
 using Microsoft.SqlTools.Hosting;
 using Microsoft.SqlTools.Hosting.Protocol;
 using Microsoft.SqlTools.ServiceLayer.SqlContext;
 using Microsoft.SqlTools.Utility;
 
-namespace  Microsoft.SqlTools.ResourceProvider
+namespace Microsoft.SqlTools.ResourceProvider
 {
     /// <summary>
     /// Provides support for starting up a service host. This is a common responsibility
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Admin/AdminService.cs b/src/Microsoft.SqlTools.ServiceLayer/Admin/AdminService.cs
index 6a774c94..b7cb374c 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Admin/AdminService.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Admin/AdminService.cs
@@ -6,7 +6,6 @@
 using System;
 using System.Collections.Concurrent;
 using System.Threading.Tasks;
-using System.Xml;
 using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlTools.Hosting.Protocol;
 using Microsoft.SqlTools.ServiceLayer.Admin.Contracts;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Admin/Contracts/DatabaseInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/Admin/Contracts/DatabaseInfo.cs
index cd40d0a1..b1bc8bcd 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Admin/Contracts/DatabaseInfo.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Admin/Contracts/DatabaseInfo.cs
@@ -3,10 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using System.Collections.Generic;
-using System.Globalization;
-using Microsoft.SqlTools.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.Admin.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/CreateDatabaseObjects.cs b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/CreateDatabaseObjects.cs
index 9fe2ed74..b665f8d7 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/CreateDatabaseObjects.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/CreateDatabaseObjects.cs
@@ -4,22 +4,15 @@
 //
 
 using System;
-using System.Collections;
-using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Resources;
 using System.Data;
 using System.IO;
-using System.Text;
 using Microsoft.SqlServer.Management.Common;
 using Microsoft.SqlServer.Management.Smo;
 using Smo = Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlServer.Management.Sdk.Sfc;
-using Microsoft.SqlServer.Management.Diagnostics;
-using System.Globalization;
-using Microsoft.Data.SqlClient;
 using System.Collections.Generic;
-using AzureEdition = Microsoft.SqlTools.ServiceLayer.Admin.AzureSqlDbHelper.AzureEdition;
 using Microsoft.SqlTools.ServiceLayer.Management;
 
 namespace Microsoft.SqlTools.ServiceLayer.Admin
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype100.cs b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype100.cs
index a3efb6f3..2b2f9d42 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype100.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype100.cs
@@ -9,7 +9,6 @@ using System.Resources;
 using Microsoft.SqlServer.Management.Common;
 using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlServer.Management.Sdk.Sfc;
-using Microsoft.SqlServer.Management.Diagnostics;
 using Microsoft.SqlTools.ServiceLayer.Management;
 
 namespace Microsoft.SqlTools.ServiceLayer.Admin
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype110.cs b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype110.cs
index 830ed761..2eabb5af 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype110.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype110.cs
@@ -4,7 +4,6 @@
 //
 
 using System.ComponentModel;
-using Microsoft.SqlServer.Management.Common;
 using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlServer.Management.Sdk.Sfc;
 using Microsoft.SqlTools.ServiceLayer.Management;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype80.cs b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype80.cs
index 821ace63..031f9461 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype80.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype80.cs
@@ -8,7 +8,6 @@ using System.Resources;
 using Microsoft.SqlServer.Management.Common;
 using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlServer.Management.Sdk.Sfc;
-using Microsoft.SqlServer.Management.Diagnostics;
 using System.Collections.Generic;
 using Microsoft.SqlTools.ServiceLayer.Management;
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype90.cs b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype90.cs
index e7860e3e..ade641fc 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype90.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype90.cs
@@ -8,7 +8,6 @@ using System.Resources;
 using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlServer.Management.Common;
 using Microsoft.SqlServer.Management.Sdk.Sfc;
-using Microsoft.SqlServer.Management.Diagnostics;
 using System.Collections.Generic;
 using Microsoft.SqlTools.ServiceLayer.Management;
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Common/AgentActions.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Common/AgentActions.cs
index 04cf4efa..ae1d5d98 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Common/AgentActions.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Common/AgentActions.cs
@@ -4,18 +4,13 @@
 //
 
 using System;
-using System.Collections;
 using System.Collections.Specialized;
-using System.ComponentModel;
 using System.Data;
 using System.Threading;
 using System.Xml;
 using Microsoft.SqlServer.Management.Sdk.Sfc;
 using Microsoft.SqlServer.Management.Common;
-using Microsoft.SqlServer.Management.Diagnostics;
-using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlServer.Management.Smo.Agent;
-using Microsoft.SqlTools.ServiceLayer.Admin;
 using Microsoft.SqlTools.ServiceLayer.Management;
 
 namespace Microsoft.SqlTools.ServiceLayer.Agent
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Common/LogAggregator.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Common/LogAggregator.cs
index f90e3f8e..100c3d05 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Common/LogAggregator.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Common/LogAggregator.cs
@@ -3,18 +3,13 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.SqlServer.Management.Sdk.Sfc;
 using System;
-using System.Threading;
-using System.Collections;
 using System.Collections.Generic;
-using Microsoft.SqlServer.Management.Diagnostics;
-using System.Runtime.CompilerServices;
 
 namespace Microsoft.SqlTools.ServiceLayer.Agent
 {
 
-#region LogSourceAggregation - ILogSource info built from multiple other sources
+    #region LogSourceAggregation - ILogSource info built from multiple other sources
     internal class LogSourceAggregation : ILogSource, ITypedColumns, IDisposable
     {
 #region Constants
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Common/LogInterfaces.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Common/LogInterfaces.cs
index 2fa300cc..1c488040 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Common/LogInterfaces.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Common/LogInterfaces.cs
@@ -3,14 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.SqlServer.Management.Sdk.Sfc;
-using System;
-using Microsoft.SqlServer.Management.Common;
-using System.Collections.Generic;
-using System.Collections;
-using Microsoft.SqlServer.Management.Diagnostics;
-using System.Collections.ObjectModel;
-
 namespace Microsoft.SqlTools.ServiceLayer.Agent
 {
     public class GridColumnType
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentAlertInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentAlertInfo.cs
index abaf2615..72c69ded 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentAlertInfo.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentAlertInfo.cs
@@ -4,8 +4,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using Microsoft.SqlTools.ServiceLayer.Agent;
 
 namespace Microsoft.SqlTools.ServiceLayer.Agent.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentJobHistoryInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentJobHistoryInfo.cs
index 0173dda3..307c9212 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentJobHistoryInfo.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentJobHistoryInfo.cs
@@ -4,10 +4,6 @@
 //
 
 using System;
-using System.Data;
-using System.Collections.Generic;
-using Microsoft.SqlServer.Management.Common;
-using Microsoft.SqlTools.ServiceLayer.Agent;
 
 namespace Microsoft.SqlTools.ServiceLayer.Agent.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentJobInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentJobInfo.cs
index e6fe1449..925ce8d8 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentJobInfo.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentJobInfo.cs
@@ -3,9 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Collections.Generic;
-using Microsoft.SqlTools.ServiceLayer.Agent;
-
 namespace Microsoft.SqlTools.ServiceLayer.Agent.Contracts
 {
     public enum JobCompletionActionCondition
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentJobStepInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentJobStepInfo.cs
index 8bf8a9f0..3d9dfd53 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentJobStepInfo.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentJobStepInfo.cs
@@ -4,9 +4,6 @@
 //
 
 using Microsoft.SqlServer.Management.Smo.Agent;
-using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Utility;
-using Microsoft.SqlTools.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.Agent.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentOperatorInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentOperatorInfo.cs
index 9c387690..853acc92 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentOperatorInfo.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentOperatorInfo.cs
@@ -4,8 +4,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using Microsoft.SqlTools.ServiceLayer.Agent;
 
 namespace Microsoft.SqlTools.ServiceLayer.Agent.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentProxyInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentProxyInfo.cs
index a8f9572a..7846d786 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentProxyInfo.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentProxyInfo.cs
@@ -3,10 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
-using System.Collections.Generic;
-using Microsoft.SqlTools.ServiceLayer.Agent;
-
 namespace Microsoft.SqlTools.ServiceLayer.Agent.Contracts
 {
     /// <summary>
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentScheduleInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentScheduleInfo.cs
index c3751f5f..c5bb4314 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentScheduleInfo.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Contracts/AgentScheduleInfo.cs
@@ -4,8 +4,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using Microsoft.SqlTools.ServiceLayer.Agent;
 
 namespace Microsoft.SqlTools.ServiceLayer.Agent.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobActions.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobActions.cs
index 89c03423..2041ff72 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobActions.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobActions.cs
@@ -3,9 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
-using Microsoft.SqlTools.ServiceLayer.Admin;
-using Microsoft.SqlTools.ServiceLayer.Agent.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Management;
 
 namespace Microsoft.SqlTools.ServiceLayer.Agent
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobActivityFilter.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobActivityFilter.cs
index caab3838..58e88cc9 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobActivityFilter.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobActivityFilter.cs
@@ -4,10 +4,7 @@
 //
 
 using System;
-using System.ComponentModel;
 using System.Text;
-using Microsoft.SqlServer.Management.Sdk.Sfc;
-using Microsoft.SqlServer.Management.Smo;
 
 namespace Microsoft.SqlTools.ServiceLayer.Agent
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobAlertData.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobAlertData.cs
index b59b80df..79c3ce9c 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobAlertData.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobAlertData.cs
@@ -4,15 +4,7 @@
 //
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using System.Globalization;
-
-using SMO = Microsoft.SqlServer.Management.Smo;
-using Microsoft.SqlServer.Management.Common;
 using Microsoft.SqlServer.Management.Sdk.Sfc;
-using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlServer.Management.Smo.Agent;
 
 namespace Microsoft.SqlTools.ServiceLayer.Agent
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobData.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobData.cs
index 65461506..df0a81c6 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobData.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobData.cs
@@ -4,7 +4,6 @@
 //
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Data;
 using System.Globalization;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobFetcher.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobFetcher.cs
index 8141f489..cce50026 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobFetcher.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobFetcher.cs
@@ -4,7 +4,6 @@
 //
 
 using System;
-using System.Text;
 using System.Data;
 using System.Globalization;
 using System.Collections.Generic;
@@ -12,8 +11,6 @@ using System.Collections.Generic;
 using SMO = Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlServer.Management.Common;
 using Microsoft.SqlServer.Management.Sdk.Sfc;
-using Microsoft.SqlServer.Management.Smo.Agent;
-using Microsoft.SqlTools.ServiceLayer.Agent.Contracts;
 
 namespace Microsoft.SqlTools.ServiceLayer.Agent
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobHelper.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobHelper.cs
index 178134c0..6eb869d8 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobHelper.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobHelper.cs
@@ -4,10 +4,7 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using Microsoft.SqlServer.Management.Common;
-using Microsoft.SqlServer.Management.Sdk.Sfc;
 using Microsoft.SqlServer.Management.Smo.Agent;
 using SMO = Microsoft.SqlServer.Management.Smo;
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobHistoryItem.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobHistoryItem.cs
index 11652608..7284123a 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobHistoryItem.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobHistoryItem.cs
@@ -8,14 +8,12 @@ using System.Collections.Generic;
 using System.Data;
 using Microsoft.Data.SqlClient;
 using Microsoft.SqlServer.Management.Common;
-using Microsoft.SqlServer.Management.Sdk.Sfc;
 using Microsoft.SqlServer.Management.Smo.Agent;
-using SMO = Microsoft.SqlServer.Management.Smo;
 
 
 namespace Microsoft.SqlTools.ServiceLayer.Agent
 {
-     /// <summary>
+    /// <summary>
     /// severity associated with a log entry (ILogEntry)
     //  these should be ordered least severe to most severe where possible.
     /// </summary>
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobNotificationsActions.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobNotificationsActions.cs
index c138aeb2..43a9e70a 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobNotificationsActions.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobNotificationsActions.cs
@@ -3,15 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
-using System.Collections;
-using System.Globalization;
-using Microsoft.SqlServer.Management.Smo;
-using Microsoft.SqlServer.Management.Common;
-using Microsoft.SqlServer.Management.Sdk.Sfc;
-using Microsoft.SqlServer.Management.Smo.Agent;
 using Microsoft.SqlTools.ServiceLayer.Management;
-using Microsoft.SqlTools.ServiceLayer.Admin;
 
 namespace Microsoft.SqlTools.ServiceLayer.Agent
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobStepData.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobStepData.cs
index d7b0dc6d..a1f4bba9 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobStepData.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobStepData.cs
@@ -5,7 +5,6 @@
 
 using System;
 using System.Collections;
-using System.Data;
 using Microsoft.SqlServer.Management.Common;
 using Microsoft.SqlServer.Management.Sdk.Sfc;
 using Microsoft.SqlServer.Management.Smo.Agent;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobStepSubSystems.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobStepSubSystems.cs
index 7e8299ed..5efc11f8 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobStepSubSystems.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobStepSubSystems.cs
@@ -7,10 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
-using System.Globalization;
 using System.Linq;
-using Microsoft.SqlServer.Management.Sdk.Sfc;
-using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlServer.Management.Smo.Agent;
 using Microsoft.SqlTools.ServiceLayer.Management;
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobStepsActions.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobStepsActions.cs
index 96a16ba5..f4ca8a91 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobStepsActions.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobStepsActions.cs
@@ -5,7 +5,6 @@
 
 using System;
 using Microsoft.SqlServer.Management.Smo.Agent;
-using Microsoft.SqlTools.ServiceLayer.Agent;
 using Microsoft.SqlTools.ServiceLayer.Agent.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Management;
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/LocalizableCategory.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/LocalizableCategory.cs
index ad66c9e7..f314ffa5 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/LocalizableCategory.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/LocalizableCategory.cs
@@ -4,15 +4,7 @@
 //
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using System.Globalization;
-using Microsoft.SqlServer.Management.Common;
-using Microsoft.SqlServer.Management.Diagnostics;
-using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlServer.Management.Smo.Agent;
-using SMO = Microsoft.SqlServer.Management.Smo;
 
 namespace Microsoft.SqlTools.ServiceLayer.Agent
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/ManageSchedulesControl.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/ManageSchedulesControl.cs
index 80a6c488..d5d8b6f9 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/ManageSchedulesControl.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/ManageSchedulesControl.cs
@@ -4,16 +4,8 @@
 //
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlServer.Management.Smo.Agent;
-using Microsoft.SqlServer.Management.Diagnostics;
-using Microsoft.SqlTools.ServiceLayer.Admin;
 using Microsoft.SqlTools.ServiceLayer.Management;
 
 namespace Microsoft.SqlTools.ServiceLayer.Agent
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/MsaJobTargetServer.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/MsaJobTargetServer.cs
index 88ab1cc3..172d3a18 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/MsaJobTargetServer.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/MsaJobTargetServer.cs
@@ -4,16 +4,6 @@
 //
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using System.Globalization;
-using Microsoft.SqlServer.Management.Common;
-using Microsoft.SqlServer.Management.Sdk.Sfc;
-using Microsoft.SqlServer.Management.Smo;
-using Microsoft.SqlServer.Management.Smo.Agent;
-using Microsoft.SqlServer.Management.Diagnostics;
-using SMO = Microsoft.SqlServer.Management.Smo;
 
 namespace Microsoft.SqlTools.ServiceLayer.Agent
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/Schedule.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/Schedule.cs
index b305011d..68b14d43 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/Schedule.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/Schedule.cs
@@ -4,19 +4,11 @@
 //
 
 using System;
-using System.Drawing;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Data;
 using System.Xml;
-using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlServer.Management.Smo.Agent;
-using Microsoft.SqlServer.Management.Diagnostics;
 using Microsoft.SqlServer.Management.Sdk.Sfc;
-using Microsoft.SqlServer.Management.Common;
 using Microsoft.SqlTools.ServiceLayer.Management;
-using Microsoft.SqlTools.ServiceLayer.Admin;
 
 namespace Microsoft.SqlTools.ServiceLayer.Agent
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/ScheduleData.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/ScheduleData.cs
index f992ec63..93c9230b 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/ScheduleData.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/ScheduleData.cs
@@ -11,9 +11,7 @@ using System.Globalization;
 using System.Text;
 using System.Text.RegularExpressions;
 using Microsoft.SqlServer.Management.Common;
-using Microsoft.SqlServer.Management.Diagnostics;
 using Microsoft.SqlServer.Management.Sdk.Sfc;
-using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlServer.Management.Smo.Agent;
 using Microsoft.SqlTools.ServiceLayer.Management;
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/AzureFunctions/AzureFunctionsUtils.cs b/src/Microsoft.SqlTools.ServiceLayer/AzureFunctions/AzureFunctionsUtils.cs
index 55036467..3e7ff34e 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/AzureFunctions/AzureFunctionsUtils.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/AzureFunctions/AzureFunctionsUtils.cs
@@ -7,8 +7,6 @@ using Microsoft.CodeAnalysis.CSharp.Syntax;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Microsoft.SqlTools.ServiceLayer.AzureFunctions
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/AzureFunctions/Contracts/AddSqlBindingRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/AzureFunctions/Contracts/AddSqlBindingRequest.cs
index 88171e66..7afa6caa 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/AzureFunctions/Contracts/AddSqlBindingRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/AzureFunctions/Contracts/AddSqlBindingRequest.cs
@@ -2,9 +2,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
-using System.Collections.Generic;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.SchemaCompare.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.AzureFunctions.Contracts
diff --git a/src/Microsoft.SqlTools.ServiceLayer/AzureFunctions/Contracts/GetAzureFunctionsRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/AzureFunctions/Contracts/GetAzureFunctionsRequest.cs
index cebf32ca..610a5d6f 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/AzureFunctions/Contracts/GetAzureFunctionsRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/AzureFunctions/Contracts/GetAzureFunctionsRequest.cs
@@ -2,9 +2,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
-using System.Collections.Generic;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.SchemaCompare.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.AzureFunctions.Contracts
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Cms/CmsService.cs b/src/Microsoft.SqlTools.ServiceLayer/Cms/CmsService.cs
index 5d55a2ed..a473d7d4 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Cms/CmsService.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Cms/CmsService.cs
@@ -13,7 +13,6 @@ using Microsoft.SqlTools.ServiceLayer.Hosting;
 using Microsoft.SqlTools.Utility;
 using System;
 using System.Collections.Generic;
-using System.Data.Common;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Cms/Contracts/RegisteredServerRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/Cms/Contracts/RegisteredServerRequest.cs
index 54c21ac2..ba467814 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Cms/Contracts/RegisteredServerRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Cms/Contracts/RegisteredServerRequest.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
 
 namespace Microsoft.SqlTools.ServiceLayer.Cms.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/CancelTokenKey.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/CancelTokenKey.cs
index c73becbf..b91ba2a5 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Connection/CancelTokenKey.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/CancelTokenKey.cs
@@ -4,9 +4,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
 
 namespace Microsoft.SqlTools.ServiceLayer.Connection
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectionDetails.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectionDetails.cs
index 30389b8a..d300d7cd 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectionDetails.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectionDetails.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.SqlTools.ServiceLayer.Utility;
 using Microsoft.SqlTools.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.Connection.Contracts
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/DacFxRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/DacFxRequest.cs
index f5a1d56e..7acd533b 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/DacFxRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/DacFxRequest.cs
@@ -2,7 +2,6 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
-using Microsoft.SqlTools.Hosting.Protocol.Contracts;
 using Microsoft.SqlTools.ServiceLayer.TaskServices;
 using Microsoft.SqlTools.ServiceLayer.Utility;
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/DeployRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/DeployRequest.cs
index 58d2a54f..65f5fbb2 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/DeployRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/DeployRequest.cs
@@ -4,7 +4,6 @@
 //
 using System.Collections.Generic;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.SchemaCompare.Contracts;
 
 namespace Microsoft.SqlTools.ServiceLayer.DacFx.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/DeploymentOptions.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/DeploymentOptions.cs
index da0b65be..13027f3e 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/DeploymentOptions.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/DeploymentOptions.cs
@@ -2,7 +2,6 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
-using System;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/ExportRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/ExportRequest.cs
index c78e0149..0a77b3d5 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/ExportRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/ExportRequest.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.TaskServices;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.DacFx.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/ExtractRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/ExtractRequest.cs
index 51f5163e..90bfe7d4 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/ExtractRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/ExtractRequest.cs
@@ -2,11 +2,8 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
-using System;
 using Microsoft.SqlServer.Dac;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.TaskServices;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.DacFx.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/GenerateDeployPlanRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/GenerateDeployPlanRequest.cs
index 56d914bc..c9e87b81 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/GenerateDeployPlanRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/GenerateDeployPlanRequest.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.TaskServices;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.DacFx.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/GenerateDeployScriptRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/GenerateDeployScriptRequest.cs
index 367eda80..9b918574 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/GenerateDeployScriptRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/GenerateDeployScriptRequest.cs
@@ -4,7 +4,6 @@
 //
 using System.Collections.Generic;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.SchemaCompare.Contracts;
 
 namespace Microsoft.SqlTools.ServiceLayer.DacFx.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/GetDefaultPublishOptionsRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/GetDefaultPublishOptionsRequest.cs
index ab68f111..77531d73 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/GetDefaultPublishOptionsRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/GetDefaultPublishOptionsRequest.cs
@@ -2,10 +2,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
-using System.Collections.Generic;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.SchemaCompare.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.DacFx.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/GetOptionsFromProfileRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/GetOptionsFromProfileRequest.cs
index 809b11e6..b01262f1 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/GetOptionsFromProfileRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/GetOptionsFromProfileRequest.cs
@@ -2,9 +2,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
-using System.Collections.Generic;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.SchemaCompare.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.DacFx.Contracts
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/ImportRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/ImportRequest.cs
index 69c83f69..6710390c 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/ImportRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/ImportRequest.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.TaskServices;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.DacFx.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/ValidateStreamingJobRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/ValidateStreamingJobRequest.cs
index b35ae57b..e71f65e5 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/ValidateStreamingJobRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/Contracts/ValidateStreamingJobRequest.cs
@@ -2,9 +2,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
-using System.Collections.Generic;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.SchemaCompare.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.DacFx.Contracts
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/DacFxOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/DacFxOperation.cs
index 9f81f541..4467c3f9 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/DacFxOperation.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/DacFxOperation.cs
@@ -8,7 +8,6 @@ using Microsoft.SqlTools.ServiceLayer.TaskServices;
 using Microsoft.SqlTools.ServiceLayer.Utility;
 using Microsoft.SqlTools.Utility;
 using System;
-using Microsoft.Data.SqlClient;
 using System.Diagnostics;
 using System.Threading;
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/ExportOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/ExportOperation.cs
index 5ac135c1..2d9c1e25 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/ExportOperation.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/ExportOperation.cs
@@ -2,14 +2,9 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
-using Microsoft.SqlServer.Dac;
 using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.DacFx.Contracts;
-using Microsoft.SqlTools.ServiceLayer.TaskServices;
 using Microsoft.SqlTools.Utility;
-using System;
-using Microsoft.Data.SqlClient;
-using System.Diagnostics;
 
 namespace Microsoft.SqlTools.ServiceLayer.DacFx
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/ExtractOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/ExtractOperation.cs
index 75afd735..59222fc5 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/ExtractOperation.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/ExtractOperation.cs
@@ -5,12 +5,8 @@
 using Microsoft.SqlServer.Dac;
 using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.DacFx.Contracts;
-using Microsoft.SqlTools.ServiceLayer.TaskServices;
 using Microsoft.SqlTools.Utility;
 using System;
-using Microsoft.Data.SqlClient;
-using System.Diagnostics;
-using System.Globalization;
 
 namespace Microsoft.SqlTools.ServiceLayer.DacFx
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/GenerateDeployPlanOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/GenerateDeployPlanOperation.cs
index 62326d53..429c2664 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/GenerateDeployPlanOperation.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/GenerateDeployPlanOperation.cs
@@ -5,11 +5,7 @@
 using Microsoft.SqlServer.Dac;
 using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.DacFx.Contracts;
-using Microsoft.SqlTools.ServiceLayer.TaskServices;
 using Microsoft.SqlTools.Utility;
-using System;
-using Microsoft.Data.SqlClient;
-using System.Diagnostics;
 
 namespace Microsoft.SqlTools.ServiceLayer.DacFx
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/GenerateDeployScriptOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/GenerateDeployScriptOperation.cs
index f723d15b..5089168f 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/GenerateDeployScriptOperation.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/GenerateDeployScriptOperation.cs
@@ -2,9 +2,6 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
-using System;
-using Microsoft.Data.SqlClient;
-using System.Diagnostics;
 using System.IO;
 using Microsoft.SqlServer.Dac;
 using Microsoft.SqlTools.ServiceLayer.Connection;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/ImportOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/ImportOperation.cs
index 08c69b6e..241adb84 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/ImportOperation.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/ImportOperation.cs
@@ -5,11 +5,7 @@
 using Microsoft.SqlServer.Dac;
 using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.DacFx.Contracts;
-using Microsoft.SqlTools.ServiceLayer.TaskServices;
 using Microsoft.SqlTools.Utility;
-using System;
-using Microsoft.Data.SqlClient;
-using System.Diagnostics;
 
 namespace Microsoft.SqlTools.ServiceLayer.DacFx
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DacFx/ValidateStreamingJobOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/DacFx/ValidateStreamingJobOperation.cs
index 3b95792d..3ea2027d 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DacFx/ValidateStreamingJobOperation.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DacFx/ValidateStreamingJobOperation.cs
@@ -7,7 +7,6 @@ extern alias ASAScriptDom;
 
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 using Microsoft.SqlServer.Dac.Model;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/BackupOperation/IBackupOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/BackupOperation/IBackupOperation.cs
index 20c19fe0..04710ee3 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/BackupOperation/IBackupOperation.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/BackupOperation/IBackupOperation.cs
@@ -2,8 +2,6 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
-using Microsoft.SqlServer.Management.Smo;
-using Microsoft.SqlTools.ServiceLayer.Admin;
 using Microsoft.SqlTools.ServiceLayer.DisasterRecovery.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Management;
 using Microsoft.SqlTools.ServiceLayer.TaskServices;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/CommonUtilities.cs b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/CommonUtilities.cs
index aac32e0f..7f225087 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/CommonUtilities.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/CommonUtilities.cs
@@ -11,7 +11,6 @@ using Microsoft.SqlServer.Management.Common;
 using Microsoft.SqlServer.Management.Sdk.Sfc;
 using Microsoft.SqlServer.Management.Smo;
 using SMO = Microsoft.SqlServer.Management.Smo;
-using Microsoft.SqlTools.ServiceLayer.Admin;
 using Microsoft.SqlTools.ServiceLayer.Management;
 
 namespace Microsoft.SqlTools.ServiceLayer.DisasterRecovery
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/DisasterRecoveryConstants.cs b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/DisasterRecoveryConstants.cs
index 195c38d2..86a85ee0 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/DisasterRecoveryConstants.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/DisasterRecoveryConstants.cs
@@ -3,11 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
 namespace Microsoft.SqlTools.ServiceLayer.DisasterRecovery
 {
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/DisasterRecoveryException.cs b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/DisasterRecoveryException.cs
index cd7f37dc..64f11a1a 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/DisasterRecoveryException.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/DisasterRecoveryException.cs
@@ -4,8 +4,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Microsoft.SqlTools.ServiceLayer.DisasterRecovery
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseHelper.cs b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseHelper.cs
index 7dfc55e4..1232fa57 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseHelper.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseHelper.cs
@@ -5,12 +5,9 @@
 
 using System;
 using System.Linq;
-using System.Data.Common;
-using Microsoft.Data.SqlClient;
 using Microsoft.SqlServer.Management.Common;
 using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlTools.ServiceLayer.Connection;
-using Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection;
 using Microsoft.SqlTools.ServiceLayer.DisasterRecovery.Contracts;
 using Microsoft.SqlTools.Utility;
 using System.Collections.Concurrent;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreOptionFactory.cs b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreOptionFactory.cs
index 508af7c3..ccb42c17 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreOptionFactory.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreOptionFactory.cs
@@ -6,10 +6,8 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlTools.ServiceLayer.DisasterRecovery.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 using Microsoft.SqlTools.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.DisasterRecovery.RestoreOperation
diff --git a/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditRow.cs b/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditRow.cs
index 4ced0f17..8a621009 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditRow.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/EditData/Contracts/EditRow.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
-
 namespace Microsoft.SqlTools.ServiceLayer.EditData.Contracts
 {
     /// <summary>
diff --git a/src/Microsoft.SqlTools.ServiceLayer/EditData/EditColumnMetadata.cs b/src/Microsoft.SqlTools.ServiceLayer/EditData/EditColumnMetadata.cs
index 71a3bce9..e34f94af 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/EditData/EditColumnMetadata.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/EditData/EditColumnMetadata.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Data;
 using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
 using Microsoft.SqlTools.Utility;
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/EditData/UpdateManagement/RowDelete.cs b/src/Microsoft.SqlTools.ServiceLayer/EditData/UpdateManagement/RowDelete.cs
index 2b074348..b7ba3d0d 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/EditData/UpdateManagement/RowDelete.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/EditData/UpdateManagement/RowDelete.cs
@@ -5,7 +5,6 @@
 
 using System;
 using System.Data.Common;
-using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/FileBrowser/FileBrowserBase.cs b/src/Microsoft.SqlTools.ServiceLayer/FileBrowser/FileBrowserBase.cs
index dd4be99f..147b9a6e 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/FileBrowser/FileBrowserBase.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/FileBrowser/FileBrowserBase.cs
@@ -7,10 +7,8 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Globalization;
-using System.Linq;
 using Microsoft.SqlServer.Management.Common;
 using Microsoft.SqlServer.Management.Sdk.Sfc;
-using Microsoft.Data.SqlClient;
 
 namespace Microsoft.SqlTools.ServiceLayer.FileBrowser
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/FileBrowser/FileBrowserService.cs b/src/Microsoft.SqlTools.ServiceLayer/FileBrowser/FileBrowserService.cs
index 9d2420b6..5994ddd1 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/FileBrowser/FileBrowserService.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/FileBrowser/FileBrowserService.cs
@@ -5,7 +5,6 @@
 
 using System;
 using System.Collections.Concurrent;
-using Microsoft.Data.SqlClient;
 using System.Diagnostics;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.Hosting.Protocol;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/FormatOptions.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/FormatOptions.cs
index 3071c066..e414e231 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/FormatOptions.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/FormatOptions.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using System.ComponentModel;
 
 namespace Microsoft.SqlTools.ServiceLayer.Formatter
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/NoOpFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/NoOpFormatter.cs
index 0b3f319d..c3448afa 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/NoOpFormatter.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/NoOpFormatter.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
-using System.Composition;
 using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom;
 
 namespace Microsoft.SqlTools.ServiceLayer.Formatter
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/PaddedSpaceSeparatedListFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/PaddedSpaceSeparatedListFormatter.cs
index 0a3933d0..64d70fda 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/PaddedSpaceSeparatedListFormatter.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/PaddedSpaceSeparatedListFormatter.cs
@@ -5,7 +5,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Composition;
 using System.Diagnostics;
 using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom;
 using Microsoft.SqlTools.Utility;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SpaceSeparatedListFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SpaceSeparatedListFormatter.cs
index 56fcbf67..afc86308 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SpaceSeparatedListFormatter.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SpaceSeparatedListFormatter.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Composition;
 using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom;
 
 namespace Microsoft.SqlTools.ServiceLayer.Formatter
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlBinaryBooleanExpressionFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlBinaryBooleanExpressionFormatter.cs
index bff5778a..4fbe4cc0 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlBinaryBooleanExpressionFormatter.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlBinaryBooleanExpressionFormatter.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using System.Composition;
 using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom;
 using Microsoft.SqlTools.Utility;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlCommonTableExpressionFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlCommonTableExpressionFormatter.cs
index f05efb88..cbea5653 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlCommonTableExpressionFormatter.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlCommonTableExpressionFormatter.cs
@@ -3,10 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Collections.Generic;
 using System.Composition;
-using System.Diagnostics;
-using Babel.ParserGenerator;
 using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom;
 
 namespace Microsoft.SqlTools.ServiceLayer.Formatter
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlCompoundStatementFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlCompoundStatementFormatter.cs
index 13fb9b25..e14d8986 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlCompoundStatementFormatter.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlCompoundStatementFormatter.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using System.Composition;
 using Babel.ParserGenerator;
 using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlCreateTableStatementFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlCreateTableStatementFormatter.cs
index 0c8cee1e..2dd64da6 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlCreateTableStatementFormatter.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlCreateTableStatementFormatter.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using System.Composition;
 using System.Diagnostics;
 using Babel.ParserGenerator;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlInsertSpecificationFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlInsertSpecificationFormatter.cs
index d75d8078..7e82df88 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlInsertSpecificationFormatter.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlInsertSpecificationFormatter.cs
@@ -3,11 +3,9 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using System.Collections.Generic;
 using System.Composition;
 using System.Diagnostics;
-using System.Globalization;
 using Babel.ParserGenerator;
 using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom;
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlProcedureDefinitionFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlProcedureDefinitionFormatter.cs
index 0fd862a5..06683fd0 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlProcedureDefinitionFormatter.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlProcedureDefinitionFormatter.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using System.Composition;
 using Babel.ParserGenerator;
 using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlSelectSpecificationFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlSelectSpecificationFormatter.cs
index a70f85c3..658f0702 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlSelectSpecificationFormatter.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlSelectSpecificationFormatter.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using System.Composition;
 using System.Diagnostics;
 using System.Globalization;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlViewDefinitionFormatter.cs b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlViewDefinitionFormatter.cs
index cd40334a..864515c0 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlViewDefinitionFormatter.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Formatter/Impl/SqlViewDefinitionFormatter.cs
@@ -4,11 +4,9 @@
 //
 
 
-using System;
 using System.Collections.Generic;
 using System.Composition;
 using System.Diagnostics;
-using System.Globalization;
 using System.Linq;
 using Babel.ParserGenerator;
 using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageExtensibility/Contracts/ExternalLanguageModel.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageExtensibility/Contracts/ExternalLanguageModel.cs
index 49870c25..0cf3a161 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/LanguageExtensibility/Contracts/ExternalLanguageModel.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageExtensibility/Contracts/ExternalLanguageModel.cs
@@ -5,7 +5,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 
 namespace Microsoft.SqlTools.ServiceLayer.LanguageExtensibility.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteHelper.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteHelper.cs
index 1dda2929..660e9a45 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteHelper.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteHelper.cs
@@ -6,20 +6,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
-using Microsoft.SqlServer.Management.SqlParser.Binder;
 using Microsoft.SqlServer.Management.SqlParser.Intellisense;
 using Microsoft.SqlServer.Management.SqlParser.Metadata;
-using Microsoft.SqlServer.Management.SqlParser.MetadataProvider;
 using Microsoft.SqlServer.Management.SqlParser.Parser;
 using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom;
-using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.LanguageServices.Completion;
 using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts;
-using Microsoft.SqlTools.ServiceLayer.SqlContext;
 using Microsoft.SqlTools.ServiceLayer.Management;
 using Microsoft.SqlTools.Utility;
-using Microsoft.SqlTools.ServiceLayer.Workspace;
 using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts;
 using Range = Microsoft.SqlTools.ServiceLayer.Workspace.Contracts.Range;
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Completion/AutoCompletionResult.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Completion/AutoCompletionResult.cs
index b0678781..1193627f 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Completion/AutoCompletionResult.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Completion/AutoCompletionResult.cs
@@ -3,9 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Collections.Generic;
 using System.Diagnostics;
-using Microsoft.SqlServer.Management.SqlParser.Intellisense;
 using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts;
 
 namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Completion
diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Completion/Extension/CompletionExtensionParams.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Completion/Extension/CompletionExtensionParams.cs
index c6093eb4..5b86264a 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Completion/Extension/CompletionExtensionParams.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Completion/Extension/CompletionExtensionParams.cs
@@ -5,7 +5,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Completion.Extension
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/ConnectedBindingQueue.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/ConnectedBindingQueue.cs
index 73f0801f..2c34d105 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/ConnectedBindingQueue.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/ConnectedBindingQueue.cs
@@ -4,7 +4,6 @@
 //
 
 using System;
-using Microsoft.Data.SqlClient;
 using Microsoft.SqlServer.Management.Common;
 using Microsoft.SqlServer.Management.SmoMetadataProvider;
 using Microsoft.SqlServer.Management.SqlParser.Binder;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/SyntaxParse.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/SyntaxParse.cs
index 7d26c4d1..0769d490 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/SyntaxParse.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/Contracts/SyntaxParse.cs
@@ -4,7 +4,6 @@
 //
 
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts;
 
 namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/DiagnosticsHelper.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/DiagnosticsHelper.cs
index 164b988a..32ec2bb0 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/DiagnosticsHelper.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/DiagnosticsHelper.cs
@@ -4,7 +4,6 @@
 //
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.Hosting.Protocol;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/InteractionMetrics.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/InteractionMetrics.cs
index 829b3f9f..38ff2fbb 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/InteractionMetrics.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/InteractionMetrics.cs
@@ -7,7 +7,6 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.SqlTools.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/BrowseFolderHelper.cs b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/BrowseFolderHelper.cs
index 860b0e01..307faa8f 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/BrowseFolderHelper.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/BrowseFolderHelper.cs
@@ -4,15 +4,12 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.IO;
 using System.Data;
 using System.Text.RegularExpressions;
 using Microsoft.SqlServer.Management.Sdk.Sfc;
 using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlServer.Management.Common;
-using Microsoft.SqlServer.Management.Diagnostics;
 
 namespace Microsoft.SqlTools.ServiceLayer.Management
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/DbSize.cs b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/DbSize.cs
index 64d62538..b7051c5b 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/DbSize.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/DbSize.cs
@@ -4,10 +4,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.SqlServer.Management.Common;
 
 namespace Microsoft.SqlTools.ServiceLayer.Management
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/ExecutionHandler.cs b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/ExecutionHandler.cs
index 33e20005..acf36199 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/ExecutionHandler.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/ExecutionHandler.cs
@@ -4,10 +4,7 @@
 //
 
 using System;
-using System.Collections;
 using System.Text;
-using Microsoft.SqlServer.Management.Diagnostics;
-using Microsoft.SqlTools.ServiceLayer.Agent;
 
 namespace Microsoft.SqlTools.ServiceLayer.Management
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/ExecutionMode.cs b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/ExecutionMode.cs
index b9bd4176..6ea9f4b0 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/ExecutionMode.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/ExecutionMode.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
-
 namespace Microsoft.SqlTools.ServiceLayer.Management
 {
     /// <summary>
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/IExecutionAwareSqlControlCollection.cs b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/IExecutionAwareSqlControlCollection.cs
index 2da84d28..5b6a6e35 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/IExecutionAwareSqlControlCollection.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/IExecutionAwareSqlControlCollection.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
-
 namespace Microsoft.SqlTools.ServiceLayer.Management
 {
     public class PreProcessExecutionInfo
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/IManagedConnection.cs b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/IManagedConnection.cs
index ff2b79be..35d32df8 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/IManagedConnection.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/IManagedConnection.cs
@@ -6,7 +6,6 @@
 using System;
 using System.Collections;
 using Microsoft.SqlServer.Management.Common;
-using Microsoft.SqlServer.Management.Diagnostics;
 
 namespace Microsoft.SqlTools.ServiceLayer.Management
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/IProgressItem.cs b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/IProgressItem.cs
index 5a36f69d..1c2556ee 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/IProgressItem.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/IProgressItem.cs
@@ -3,11 +3,9 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
-
 namespace Microsoft.SqlTools.ServiceLayer.Management
 {
-#region interfaces
+    #region interfaces
     /// <summary>
     /// Interface that supports the delegation of individual actions in the progress dialog
     /// to individual classes.
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/ISqlControlCollection.cs b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/ISqlControlCollection.cs
index 2f36c0d4..b4e4e96c 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/ISqlControlCollection.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/ISqlControlCollection.cs
@@ -3,14 +3,12 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
-
 namespace Microsoft.SqlTools.ServiceLayer.Management
 {
-	/// <summary>
-	/// defines notion of sitable object
-	/// </summary>
-	public interface IObjectWithSite
+    /// <summary>
+    /// defines notion of sitable object
+    /// </summary>
+    public interface IObjectWithSite
 	{
 	    void SetSite(System.IServiceProvider sp);
     }
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/ManagementActionBase.cs b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/ManagementActionBase.cs
index 08a54d72..c2de9201 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/ManagementActionBase.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/ManagementActionBase.cs
@@ -4,19 +4,10 @@
 //
 
 using System;
-using System.Collections;
 using System.Collections.Specialized;
-using System.Data;
-using System.Diagnostics;
-using System.IO;
-using System.Threading;
 using System.Text;
-using System.Xml;
 using Microsoft.SqlServer.Management.Common;
-using Microsoft.SqlServer.Management.Diagnostics;
 using Microsoft.SqlServer.Management.Smo;
-using Microsoft.SqlTools.ServiceLayer.Admin;
-using Microsoft.SqlTools.ServiceLayer.Agent;
 
 namespace Microsoft.SqlTools.ServiceLayer.Management
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/ProgressReportCommon.cs b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/ProgressReportCommon.cs
index 5c6f75d4..4fecba3d 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/ProgressReportCommon.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/ProgressReportCommon.cs
@@ -4,16 +4,14 @@
 //
 
 using System;
-using System.Drawing;
 using System.Threading;
-using System.Runtime.InteropServices;
 
 namespace Microsoft.SqlTools.ServiceLayer.Management
 {
-	/// <summary>
-	/// Enumeration for status of individual actions
-	/// </summary>
-	public enum ProgressStatus
+    /// <summary>
+    /// Enumeration for status of individual actions
+    /// </summary>
+    public enum ProgressStatus
 	{
 		Invalid = -1,
 		NotStarted,			// Not started
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/RunType.cs b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/RunType.cs
index cf780b1a..b80fd5fd 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/RunType.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/RunType.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
-
 namespace Microsoft.SqlTools.ServiceLayer.Management
 {
     /// <summary>
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/SharedConnectionUtil.cs b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/SharedConnectionUtil.cs
index 56f1fccc..af7e932c 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/SharedConnectionUtil.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/SharedConnectionUtil.cs
@@ -7,7 +7,6 @@ using System;
 //using Microsoft.SqlServer.Management.AzureCredential;
 using Microsoft.SqlServer.Management.Common;
 //using Microsoft.SqlServer.Management.Smo.RegSvrEnum;
-using SFC = Microsoft.SqlServer.Management.Sdk.Sfc;
 //using Microsoft.SqlServer.StorageClient;
 //using Microsoft.SqlServer.Management.SqlMgmt;
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/Utils.cs b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/Utils.cs
index 385b11b6..498b0855 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Management/Common/Utils.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Management/Common/Utils.cs
@@ -4,17 +4,10 @@
 //
 
 using System;
-using System.Collections;
 using Microsoft.Data.SqlClient;
 using System.Globalization;
-using System.IO;
-using System.Reflection;
 using System.Text;
-using System.Threading;
-using System.Xml;
 using Microsoft.SqlServer.Management.Common;
-using Microsoft.SqlServer.Management.Diagnostics;
-using Microsoft.SqlServer.Management.Sdk.Sfc;
 using SMO = Microsoft.SqlServer.Management.Smo;
 
 namespace Microsoft.SqlTools.ServiceLayer.Management
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Metadata/Contracts/ColumnMetadata.cs b/src/Microsoft.SqlTools.ServiceLayer/Metadata/Contracts/ColumnMetadata.cs
index c3a7f553..ad2926b1 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Metadata/Contracts/ColumnMetadata.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Metadata/Contracts/ColumnMetadata.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Data;
 using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
 using Microsoft.SqlTools.Utility;
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Migration/Contracts/ImpactedObjectInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/Migration/Contracts/ImpactedObjectInfo.cs
index 1d0aa8b1..1aab472c 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Migration/Contracts/ImpactedObjectInfo.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Migration/Contracts/ImpactedObjectInfo.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.SqlServer.Management.Assessment;
-
 namespace Microsoft.SqlTools.ServiceLayer.Migration.Contracts
 {
     /// <summary>
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Migration/Contracts/MigrationAssessmentInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/Migration/Contracts/MigrationAssessmentInfo.cs
index 4900af73..6f66b6e3 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Migration/Contracts/MigrationAssessmentInfo.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Migration/Contracts/MigrationAssessmentInfo.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.SqlServer.Management.Assessment;
-
 namespace Microsoft.SqlTools.ServiceLayer.Migration.Contracts
 {
     /// <summary>
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ModelManagement/Contracts/ModelRequestBase.cs b/src/Microsoft.SqlTools.ServiceLayer/ModelManagement/Contracts/ModelRequestBase.cs
index 95e90a22..5aee122b 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ModelManagement/Contracts/ModelRequestBase.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ModelManagement/Contracts/ModelRequestBase.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.SqlTools.ServiceLayer.Utility;
-
 namespace Microsoft.SqlTools.ServiceLayer.ModelManagement.Contracts
 {
     public class ModelRequestBase
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ModelManagement/Contracts/VerifyModelTableRequestParams.cs b/src/Microsoft.SqlTools.ServiceLayer/ModelManagement/Contracts/VerifyModelTableRequestParams.cs
index a1fa0894..6c870d2e 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ModelManagement/Contracts/VerifyModelTableRequestParams.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ModelManagement/Contracts/VerifyModelTableRequestParams.cs
@@ -4,7 +4,6 @@
 //
 
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using System.Collections.Generic;
 
 namespace Microsoft.SqlTools.ServiceLayer.ModelManagement.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Contracts/CloseSessionRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Contracts/CloseSessionRequest.cs
index da7a64eb..50c86f92 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Contracts/CloseSessionRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Contracts/CloseSessionRequest.cs
@@ -4,7 +4,6 @@
 //
 
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
 
 namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Contracts/FindNodesRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Contracts/FindNodesRequest.cs
index 8aed733c..014a5273 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Contracts/FindNodesRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Contracts/FindNodesRequest.cs
@@ -5,7 +5,6 @@
 
 using System.Collections.Generic;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
 
 namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Nodes/NodeFilter.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Nodes/NodeFilter.cs
index 255e60b2..192fd2e9 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Nodes/NodeFilter.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Nodes/NodeFilter.cs
@@ -4,7 +4,6 @@
 //
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Nodes/TreeNodeWithContext.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Nodes/TreeNodeWithContext.cs
index 80c8b5e1..888bd130 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Nodes/TreeNodeWithContext.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/Nodes/TreeNodeWithContext.cs
@@ -3,11 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
 namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Nodes
 {
     public class TreeNodeWithContext
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/ObjectExplorerService.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/ObjectExplorerService.cs
index 7ba674ea..c20166c0 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/ObjectExplorerService.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/ObjectExplorerService.cs
@@ -9,7 +9,6 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Composition;
 using System.Diagnostics;
-using System.Globalization;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/ObjectExplorerUtils.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/ObjectExplorerUtils.cs
index 30c66503..dd01a39a 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/ObjectExplorerUtils.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/ObjectExplorerUtils.cs
@@ -6,7 +6,6 @@
 using System;
 using System.Threading;
 using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Nodes;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/ServerNode.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/ServerNode.cs
index 9207cdfe..20abb50c 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/ServerNode.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/ServerNode.cs
@@ -4,17 +4,12 @@
 //
 
 using System;
-using System.Data.Common;
-using Microsoft.Data.SqlClient;
 using System.Diagnostics;
 using System.Globalization;
-using System.Linq;
 using Microsoft.SqlServer.Management.Common;
 using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlTools.Extensibility;
-using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection;
 using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Nodes;
 using Microsoft.SqlTools.ServiceLayer.Utility;
 using Microsoft.SqlTools.Utility;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoTreeNode.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoTreeNode.cs
index 7c2e076c..2711691a 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoTreeNode.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoTreeNode.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Globalization;
-using Microsoft.SqlServer.Management.Sdk.Sfc;
 using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Nodes;
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoWrapper.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoWrapper.cs
index a0d34910..7adf74e3 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoWrapper.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoWrapper.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.Data.SqlClient;
 using Microsoft.SqlServer.Management.Common;
 using Microsoft.SqlServer.Management.Smo;
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/ValidForFlag.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/ValidForFlag.cs
index 75d91a6b..f74656bd 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/ValidForFlag.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/ValidForFlag.cs
@@ -4,9 +4,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/CreateXEventSessionRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/CreateXEventSessionRequest.cs
index 3d0c29c3..62847db6 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/CreateXEventSessionRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/CreateXEventSessionRequest.cs
@@ -4,7 +4,6 @@
 //
 
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 using Microsoft.SqlTools.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.Profiler.Contracts
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/DisconnectSessionRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/DisconnectSessionRequest.cs
index 8721fcfb..7f54f89f 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/DisconnectSessionRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/DisconnectSessionRequest.cs
@@ -4,9 +4,7 @@
 //
 
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 using Microsoft.SqlTools.Utility;
-using System;
 
 namespace Microsoft.SqlTools.ServiceLayer.Profiler.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/GetXEventSessionsRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/GetXEventSessionsRequest.cs
index 4f082be9..07042204 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/GetXEventSessionsRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/GetXEventSessionsRequest.cs
@@ -5,7 +5,6 @@
 
 using System.Collections.Generic;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 using Microsoft.SqlTools.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.Profiler.Contracts
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/PauseProfilingRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/PauseProfilingRequest.cs
index c3f0d1f6..b631c492 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/PauseProfilingRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/PauseProfilingRequest.cs
@@ -4,7 +4,6 @@
 //
 
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 using Microsoft.SqlTools.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.Profiler.Contracts
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/ProfilerEventsAvailableNotification.cs b/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/ProfilerEventsAvailableNotification.cs
index a244af58..04a086f1 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/ProfilerEventsAvailableNotification.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/ProfilerEventsAvailableNotification.cs
@@ -5,7 +5,6 @@
 
 using System.Collections.Generic;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.Profiler.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/ProfilerSessionCreatedNotification.cs b/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/ProfilerSessionCreatedNotification.cs
index 83146a78..b2c80df3 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/ProfilerSessionCreatedNotification.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/ProfilerSessionCreatedNotification.cs
@@ -3,9 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Collections.Generic;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.Profiler.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/ProfilerSessionStoppedNotification.cs b/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/ProfilerSessionStoppedNotification.cs
index 55ec5efc..92adbd36 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/ProfilerSessionStoppedNotification.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/ProfilerSessionStoppedNotification.cs
@@ -3,9 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Collections.Generic;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.Profiler.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/ProfilerSessionTemplate.cs b/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/ProfilerSessionTemplate.cs
index 94c4ec01..18b0c6dc 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/ProfilerSessionTemplate.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/ProfilerSessionTemplate.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Collections.Generic;
-
 namespace Microsoft.SqlTools.ServiceLayer.Profiler.Contracts
 {
     /// <summary>
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/StartProfilingRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/StartProfilingRequest.cs
index 14125cdf..2deb78f8 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/StartProfilingRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/StartProfilingRequest.cs
@@ -4,7 +4,6 @@
 //
 
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 using Microsoft.SqlTools.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.Profiler.Contracts
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/StopProfilingRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/StopProfilingRequest.cs
index da652675..28eb4e17 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/StopProfilingRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Profiler/Contracts/StopProfilingRequest.cs
@@ -4,7 +4,6 @@
 //
 
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.Profiler.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Profiler/IProfilerSessionMonitor.cs b/src/Microsoft.SqlTools.ServiceLayer/Profiler/IProfilerSessionMonitor.cs
index 4fd5a6d3..a8a71e53 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Profiler/IProfilerSessionMonitor.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Profiler/IProfilerSessionMonitor.cs
@@ -3,15 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
-using System.Collections.Generic;
-using Microsoft.Data.SqlClient;
-using System.Linq;
-using System.Xml;
-using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
-using Microsoft.SqlServer.Management.Sdk.Sfc;
-using Microsoft.SqlServer.Management.XEvent;
-
 namespace Microsoft.SqlTools.ServiceLayer.Profiler
 {
     /// <summary>
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Profiler/IXEventSessionFactory.cs b/src/Microsoft.SqlTools.ServiceLayer/Profiler/IXEventSessionFactory.cs
index a7918326..023f316e 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Profiler/IXEventSessionFactory.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Profiler/IXEventSessionFactory.cs
@@ -4,8 +4,6 @@
 //
 
 
-using Microsoft.SqlServer.Management.Sdk.Sfc;
-using Microsoft.SqlServer.Management.XEvent;
 using Microsoft.SqlTools.ServiceLayer.Connection;
 
 namespace Microsoft.SqlTools.ServiceLayer.Profiler
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Profiler/ProfilerService.cs b/src/Microsoft.SqlTools.ServiceLayer/Profiler/ProfilerService.cs
index dc659fbc..ecea4459 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Profiler/ProfilerService.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Profiler/ProfilerService.cs
@@ -4,28 +4,18 @@
 //
 
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Collections.Specialized;
-using Microsoft.Data.SqlClient;
-using System.Diagnostics;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Xml;
 using Microsoft.SqlServer.Management.Sdk.Sfc;
-using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlServer.Management.XEvent;
 using Microsoft.SqlServer.Management.XEventDbScoped;
 using Microsoft.SqlTools.Hosting.Protocol;
-using Microsoft.SqlTools.Hosting.Protocol.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Connection;
-using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Hosting;
 using Microsoft.SqlTools.ServiceLayer.Profiler.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Utility;
-using Microsoft.SqlTools.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.Profiler
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Profiler/ProfilerSession.cs b/src/Microsoft.SqlTools.ServiceLayer/Profiler/ProfilerSession.cs
index 5835cd3b..1465d4da 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Profiler/ProfilerSession.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Profiler/ProfilerSession.cs
@@ -6,7 +6,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.SqlServer.Management.XEvent;
 using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.Profiler.Contracts;
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Profiler/ProfilerSessionMonitor.cs b/src/Microsoft.SqlTools.ServiceLayer/Profiler/ProfilerSessionMonitor.cs
index 49a411b0..b2726872 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Profiler/ProfilerSessionMonitor.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Profiler/ProfilerSessionMonitor.cs
@@ -4,17 +4,13 @@
 //
 
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
-using Microsoft.Data.SqlClient;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Xml;
-using Microsoft.SqlServer.Management.Sdk.Sfc;
 using Microsoft.SqlServer.Management.XEvent;
-using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Profiler.Contracts;
 using Microsoft.SqlTools.Utility;
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Profiler/XEventSession.cs b/src/Microsoft.SqlTools.ServiceLayer/Profiler/XEventSession.cs
index b1a3903c..19e3b6fa 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Profiler/XEventSession.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Profiler/XEventSession.cs
@@ -5,8 +5,6 @@
 
 using System.Linq;
 using Microsoft.SqlServer.Management.XEvent;
-using Microsoft.SqlTools.ServiceLayer.Connection;
-using Microsoft.SqlTools.ServiceLayer.Profiler.Contracts;
 
 namespace Microsoft.SqlTools.ServiceLayer.Profiler
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs
index 43bbab74..ddfc61d5 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs
@@ -17,7 +17,6 @@ using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
 using Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage;
 using Microsoft.SqlTools.Utility;
 using System.Globalization;
-using System.Collections.ObjectModel;
 using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.BatchParser;
 using Microsoft.SqlTools.ServiceLayer.AutoParameterizaition;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/DbColumnWrapper.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/DbColumnWrapper.cs
index 8bdb2498..3758cf7d 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/DbColumnWrapper.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/DbColumnWrapper.cs
@@ -4,7 +4,6 @@
 //
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/Serialization.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/Serialization.cs
index 964dd5b5..3ab5d301 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/Serialization.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/Serialization.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Data;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
 using Microsoft.SqlTools.Utility;
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/SchemaCompare/Contracts/SchemaCompareGenerateScriptRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/SchemaCompare/Contracts/SchemaCompareGenerateScriptRequest.cs
index 25348870..f6868ec8 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/SchemaCompare/Contracts/SchemaCompareGenerateScriptRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/SchemaCompare/Contracts/SchemaCompareGenerateScriptRequest.cs
@@ -2,11 +2,8 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
-using Microsoft.SqlServer.Dac.Compare;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.TaskServices;
 using Microsoft.SqlTools.ServiceLayer.Utility;
-using System.Collections.Generic;
 
 namespace Microsoft.SqlTools.ServiceLayer.SchemaCompare.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/SchemaCompare/SchemaCompareGenerateScriptOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/SchemaCompare/SchemaCompareGenerateScriptOperation.cs
index dfd36d2e..a6c51108 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/SchemaCompare/SchemaCompareGenerateScriptOperation.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/SchemaCompare/SchemaCompareGenerateScriptOperation.cs
@@ -2,15 +2,12 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
-using Microsoft.SqlServer.Dac;
 using Microsoft.SqlServer.Dac.Compare;
-using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.SchemaCompare.Contracts;
 using Microsoft.SqlTools.ServiceLayer.TaskServices;
 using Microsoft.SqlTools.Utility;
 using System;
 using System.Diagnostics;
-using System.IO;
 using System.Threading;
 
 namespace Microsoft.SqlTools.ServiceLayer.SchemaCompare
diff --git a/src/Microsoft.SqlTools.ServiceLayer/SchemaCompare/SchemaCompareSaveScmpOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/SchemaCompare/SchemaCompareSaveScmpOperation.cs
index 9ce53029..f37c5729 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/SchemaCompare/SchemaCompareSaveScmpOperation.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/SchemaCompare/SchemaCompareSaveScmpOperation.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 using Microsoft.SqlServer.Dac.Compare;
-using Microsoft.SqlServer.Dac.Model;
 using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.SchemaCompare.Contracts;
 using Microsoft.SqlTools.ServiceLayer.TaskServices;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Scripting/Contracts/ScriptingListObjectsRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/Scripting/Contracts/ScriptingListObjectsRequest.cs
index 2c5f75d4..3cae42ff 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Scripting/Contracts/ScriptingListObjectsRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Scripting/Contracts/ScriptingListObjectsRequest.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Collections.Generic;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
 
 namespace Microsoft.SqlTools.ServiceLayer.Scripting.Contracts
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Scripting/Scripter.cs b/src/Microsoft.SqlTools.ServiceLayer/Scripting/Scripter.cs
index 07fa30ae..acb7507c 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Scripting/Scripter.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Scripting/Scripter.cs
@@ -3,18 +3,13 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.Specialized;
 using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlServer.Management.SqlParser.Intellisense;
-using Microsoft.SqlTools.Utility;
-using  Microsoft.SqlServer.Management.Common;
+using Microsoft.SqlServer.Management.Common;
 
 namespace Microsoft.SqlTools.ServiceLayer.Scripting
 {
-	internal partial class Scripter
+    internal partial class Scripter
     {
 		private void Initialize()
         {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptingExtensionMethods.cs b/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptingExtensionMethods.cs
index 7e4f6197..eb26b7ec 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptingExtensionMethods.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptingExtensionMethods.cs
@@ -3,12 +3,10 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using Microsoft.SqlServer.Management.Sdk.Sfc;
 using Microsoft.SqlServer.Management.SqlScriptPublish;
 using Microsoft.SqlTools.ServiceLayer.Scripting.Contracts;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptingListObjectsOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptingListObjectsOperation.cs
index fd315148..94fa3d99 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptingListObjectsOperation.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptingListObjectsOperation.cs
@@ -6,17 +6,9 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.Data.SqlClient;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.SqlServer.Management.Sdk.Sfc;
 using Microsoft.SqlServer.Management.SqlScriptPublish;
-using Microsoft.SqlTools.Hosting.Protocol;
 using Microsoft.SqlTools.ServiceLayer.Scripting.Contracts;
 using Microsoft.SqlTools.Utility;
-using Microsoft.SqlTools.Hosting.Protocol.Contracts;
 using System.Diagnostics;
 
 namespace Microsoft.SqlTools.ServiceLayer.Scripting
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptingOperation.cs b/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptingOperation.cs
index b852f5e3..71ac7abe 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptingOperation.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Scripting/ScriptingOperation.cs
@@ -6,7 +6,6 @@
 using System;
 using System.Diagnostics;
 using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.SqlTools.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.Scripting
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Security/Contracts/CredentialInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/Security/Contracts/CredentialInfo.cs
index b86acc18..09411c64 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Security/Contracts/CredentialInfo.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Security/Contracts/CredentialInfo.cs
@@ -4,8 +4,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using Microsoft.SqlTools.ServiceLayer.Agent;
 
 namespace Microsoft.SqlTools.ServiceLayer.Security.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Security/CredentialActions.cs b/src/Microsoft.SqlTools.ServiceLayer/Security/CredentialActions.cs
index f89b6d2f..b83d3a89 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Security/CredentialActions.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Security/CredentialActions.cs
@@ -3,11 +3,10 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using Microsoft.SqlTools.ServiceLayer.Management;
 using Microsoft.SqlTools.ServiceLayer.Security.Contracts;
 
-namespace  Microsoft.SqlTools.ServiceLayer.Security
+namespace Microsoft.SqlTools.ServiceLayer.Security
 {
     internal class CredentialActions : ManagementActionBase
     {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Security/CredentialData.cs b/src/Microsoft.SqlTools.ServiceLayer/Security/CredentialData.cs
index ed0805a1..acba52c5 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Security/CredentialData.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Security/CredentialData.cs
@@ -4,12 +4,7 @@
 //
 
 using System;
-using System.Collections.Generic;
-using Microsoft.Data.SqlClient;
 using System.Security;
-using System.Text;
-using Microsoft.SqlServer.Management.Common;
-using Microsoft.SqlServer.Management.Diagnostics;
 using Microsoft.SqlServer.Management.Sdk.Sfc;
 using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlTools.ServiceLayer.Management;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Security/SecurityService.cs b/src/Microsoft.SqlTools.ServiceLayer/Security/SecurityService.cs
index 7f236f5a..9d4f6f68 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Security/SecurityService.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Security/SecurityService.cs
@@ -6,7 +6,6 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.Hosting.Protocol;
-using Microsoft.SqlTools.ServiceLayer.Admin;
 using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.Hosting;
 using Microsoft.SqlTools.ServiceLayer.Management;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Comparison/SkeletonNode.cs b/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Comparison/SkeletonNode.cs
index 92af43aa..e2f1442c 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Comparison/SkeletonNode.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Comparison/SkeletonNode.cs
@@ -3,11 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 
 namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph.Comparison
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/INodeBuilder.cs b/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/INodeBuilder.cs
index 4ddbb134..2d66505e 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/INodeBuilder.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/INodeBuilder.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
-
 namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
 {
     /// <summary>
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanService.cs b/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanService.cs
index 66607e79..79b30c10 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanService.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanService.cs
@@ -4,11 +4,7 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
 using Microsoft.SqlTools.Hosting.Protocol;
-using Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph;
 using Microsoft.SqlTools.ServiceLayer.Hosting;
 
 namespace Microsoft.SqlTools.ServiceLayer.ShowPlan
diff --git a/src/Microsoft.SqlTools.ServiceLayer/SqlAssessment/Contracts/InvokeRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/SqlAssessment/Contracts/InvokeRequest.cs
index ede6a0ae..4a2b1d89 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/SqlAssessment/Contracts/InvokeRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/SqlAssessment/Contracts/InvokeRequest.cs
@@ -5,7 +5,6 @@
 
 using System;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.SqlAssessment.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/SqlContext/CompoundSqlToolsSettingsValues.cs b/src/Microsoft.SqlTools.ServiceLayer/SqlContext/CompoundSqlToolsSettingsValues.cs
index bc632fb5..7c62c49c 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/SqlContext/CompoundSqlToolsSettingsValues.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/SqlContext/CompoundSqlToolsSettingsValues.cs
@@ -7,11 +7,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.SqlTools.Utility;
-using Newtonsoft.Json;
 
 namespace Microsoft.SqlTools.ServiceLayer.SqlContext
 {
-    
+
     /// <summary>
     /// Handles backwards compatibility of settings by checking for settings in a priority list. If a settings
     /// group such as Intellisense is defined on a serialized setting it's used in the order of mssql, then sql, then
diff --git a/src/Microsoft.SqlTools.ServiceLayer/SqlContext/SqlToolsSettings.cs b/src/Microsoft.SqlTools.ServiceLayer/SqlContext/SqlToolsSettings.cs
index 2d7ebdc3..77768987 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/SqlContext/SqlToolsSettings.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/SqlContext/SqlToolsSettings.cs
@@ -3,10 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.SqlTools.Utility;
 using Newtonsoft.Json;
 
 namespace Microsoft.SqlTools.ServiceLayer.SqlContext
diff --git a/src/Microsoft.SqlTools.ServiceLayer/SqlContext/SqlToolsSettingsValues.cs b/src/Microsoft.SqlTools.ServiceLayer/SqlContext/SqlToolsSettingsValues.cs
index 00f11dba..ce92841f 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/SqlContext/SqlToolsSettingsValues.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/SqlContext/SqlToolsSettingsValues.cs
@@ -3,10 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.SqlTools.Utility;
 using Newtonsoft.Json;
 
 namespace Microsoft.SqlTools.ServiceLayer.SqlContext
diff --git a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Components/TableProperties.cs b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Components/TableProperties.cs
index a70f697c..5c608570 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Components/TableProperties.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Components/TableProperties.cs
@@ -3,10 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using Newtonsoft.Json;
 namespace Microsoft.SqlTools.ServiceLayer.TableDesigner.Contracts
 {
     /// <summary>
diff --git a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/GeneratePreviewReportRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/GeneratePreviewReportRequest.cs
index 977da090..00cadf35 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/GeneratePreviewReportRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/GeneratePreviewReportRequest.cs
@@ -4,7 +4,6 @@
 //
 
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.TableDesigner.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/GenerateScriptRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/GenerateScriptRequest.cs
index bfdf2297..ae7b7730 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/GenerateScriptRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/GenerateScriptRequest.cs
@@ -4,7 +4,6 @@
 //
 
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.Utility;
 
 namespace Microsoft.SqlTools.ServiceLayer.TableDesigner.Contracts
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/TableChangeInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/TableChangeInfo.cs
index 8e901713..7a099c80 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/TableChangeInfo.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/TableChangeInfo.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/CheckConstraintViewModel.cs b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/CheckConstraintViewModel.cs
index 1be45252..4defd229 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/CheckConstraintViewModel.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/CheckConstraintViewModel.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Newtonsoft.Json;
-
 namespace Microsoft.SqlTools.ServiceLayer.TableDesigner.Contracts
 {
     /// <summary>
diff --git a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/ForeignKeyViewModel.cs b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/ForeignKeyViewModel.cs
index 281c7911..1ec7494e 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/ForeignKeyViewModel.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/ForeignKeyViewModel.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Newtonsoft.Json;
-
 namespace Microsoft.SqlTools.ServiceLayer.TableDesigner.Contracts
 {
     /// <summary>
diff --git a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/IndexViewModel.cs b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/IndexViewModel.cs
index bee2300e..8b9a5844 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/IndexViewModel.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/IndexViewModel.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Newtonsoft.Json;
-
 namespace Microsoft.SqlTools.ServiceLayer.TableDesigner.Contracts
 {
     /// <summary>
diff --git a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/TableColumnViewModel.cs b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/TableColumnViewModel.cs
index b8b38753..8abe7c72 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/TableColumnViewModel.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/TableColumnViewModel.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Newtonsoft.Json;
-
 namespace Microsoft.SqlTools.ServiceLayer.TableDesigner.Contracts
 {
     /// <summary>
diff --git a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/TableViewModel.cs b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/TableViewModel.cs
index 2f167879..5ecada6a 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/TableViewModel.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/TableViewModel.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Newtonsoft.Json;
-
 namespace Microsoft.SqlTools.ServiceLayer.TableDesigner.Contracts
 {
     /// <summary>
diff --git a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/DesignerPathUtils.cs b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/DesignerPathUtils.cs
index 4a193be5..b2ae7eb8 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/DesignerPathUtils.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/DesignerPathUtils.cs
@@ -4,7 +4,6 @@
 //
 
 using System;
-using System.Collections;
 using System.Linq;
 using Microsoft.SqlTools.ServiceLayer.TableDesigner.Contracts;
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Utility/TaskExtensions.cs b/src/Microsoft.SqlTools.ServiceLayer/Utility/TaskExtensions.cs
index 1afc27bf..be796925 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Utility/TaskExtensions.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Utility/TaskExtensions.cs
@@ -6,7 +6,6 @@
 using System;
 using System.Diagnostics;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.Utility;
 
diff --git a/test/Microsoft.InsightsGenerator.UnitTests/WorkflowTests.cs b/test/Microsoft.InsightsGenerator.UnitTests/WorkflowTests.cs
index 2697e4eb..cf48af67 100644
--- a/test/Microsoft.InsightsGenerator.UnitTests/WorkflowTests.cs
+++ b/test/Microsoft.InsightsGenerator.UnitTests/WorkflowTests.cs
@@ -5,7 +5,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
 using Xunit;
 
 namespace Microsoft.InsightsGenerator.UnitTests
diff --git a/test/Microsoft.Kusto.ServiceLayer.UnitTests/LanguageServices/ConnectedBindingQueueTests.cs b/test/Microsoft.Kusto.ServiceLayer.UnitTests/LanguageServices/ConnectedBindingQueueTests.cs
index 5bd7da67..49559c5c 100644
--- a/test/Microsoft.Kusto.ServiceLayer.UnitTests/LanguageServices/ConnectedBindingQueueTests.cs
+++ b/test/Microsoft.Kusto.ServiceLayer.UnitTests/LanguageServices/ConnectedBindingQueueTests.cs
@@ -9,8 +9,6 @@ using Microsoft.Kusto.ServiceLayer.Connection;
 using Microsoft.Kusto.ServiceLayer.Connection.Contracts;
 using Microsoft.Kusto.ServiceLayer.DataSource;
 using Microsoft.Kusto.ServiceLayer.LanguageServices;
-using Microsoft.SqlServer.Management.Common;
-using Microsoft.SqlServer.Management.SqlParser.MetadataProvider;
 using Moq;
 using NUnit.Framework;
 
diff --git a/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/BatchParser/TestVariableResolver.cs b/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/BatchParser/TestVariableResolver.cs
index 2be34803..3e4ff2d9 100644
--- a/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/BatchParser/TestVariableResolver.cs
+++ b/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/BatchParser/TestVariableResolver.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
-using System.Collections.Generic;
 using System.Text;
 using Microsoft.SqlTools.ServiceLayer.BatchParser;
 using Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode;
diff --git a/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/TSQLExecutionEngine/TestExecutor.cs b/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/TSQLExecutionEngine/TestExecutor.cs
index cbaff188..2dcb4888 100644
--- a/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/TSQLExecutionEngine/TestExecutor.cs
+++ b/test/Microsoft.SqlTools.ManagedBatchParser.IntegrationTests/TSQLExecutionEngine/TestExecutor.cs
@@ -9,7 +9,6 @@ using Microsoft.Data.SqlClient;
 using System.Threading;
 using Microsoft.SqlTools.ServiceLayer.BatchParser.ExecutionEngineCode;
 using Microsoft.SqlTools.Utility;
-using System.Runtime.CompilerServices;
 
 namespace Microsoft.SqlTools.ManagedBatchParser.IntegrationTests.TSQLExecutionEngine
 {
diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Admin/DatabaseAdminTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Admin/DatabaseAdminTests.cs
index 7f00b52e..a62d13e4 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Admin/DatabaseAdminTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Admin/DatabaseAdminTests.cs
@@ -3,14 +3,9 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.ServiceLayer.IntegrationTests.Utility;
-using Microsoft.SqlTools.ServiceLayer.LanguageServices;
-using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Test.Common;
 using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts;
-using NUnit.Framework;
 using Moq;
 using Microsoft.SqlTools.Hosting.Protocol;
 using Microsoft.SqlTools.ServiceLayer.Admin.Contracts;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Agent/AgentJobStepTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Agent/AgentJobStepTests.cs
index 7b24064e..deae3642 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Agent/AgentJobStepTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Agent/AgentJobStepTests.cs
@@ -3,15 +3,10 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using System.Threading.Tasks;
-using Microsoft.SqlTools.Hosting.Protocol;
 using Microsoft.SqlTools.ServiceLayer.Agent;
-using Microsoft.SqlTools.ServiceLayer.Agent.Contracts;
 using Microsoft.SqlTools.ServiceLayer.IntegrationTests.Utility;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
-using Microsoft.SqlTools.ServiceLayer.Utility;
-using Moq;
 using NUnit.Framework;
 
 namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.Agent
diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Agent/AgentJobTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Agent/AgentJobTests.cs
index 848910fc..23c23ac0 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Agent/AgentJobTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Agent/AgentJobTests.cs
@@ -3,14 +3,12 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.Hosting.Protocol;
 using Microsoft.SqlTools.ServiceLayer.Agent;
 using Microsoft.SqlTools.ServiceLayer.Agent.Contracts;
 using Microsoft.SqlTools.ServiceLayer.IntegrationTests.Utility;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 using Moq;
 using NUnit.Framework;
 
diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Agent/AgentProxyTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Agent/AgentProxyTests.cs
index 348cd8d3..ebba2554 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Agent/AgentProxyTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Agent/AgentProxyTests.cs
@@ -9,13 +9,9 @@ using Microsoft.SqlTools.ServiceLayer.Agent;
 using Microsoft.SqlTools.ServiceLayer.Agent.Contracts;
 using Microsoft.SqlTools.ServiceLayer.IntegrationTests.Security;
 using Microsoft.SqlTools.ServiceLayer.IntegrationTests.Utility;
-using Microsoft.SqlTools.ServiceLayer.Security;
-using Microsoft.SqlTools.ServiceLayer.Security.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 using Moq;
 using NUnit.Framework;
-using static Microsoft.SqlTools.ServiceLayer.IntegrationTests.Utility.LiveConnectionHelper;
 
 namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.Agent
 {
diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Agent/AgentScheduleTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Agent/AgentScheduleTests.cs
index 7c7bbb92..78b4778c 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Agent/AgentScheduleTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Agent/AgentScheduleTests.cs
@@ -9,10 +9,8 @@ using Microsoft.SqlTools.ServiceLayer.Agent;
 using Microsoft.SqlTools.ServiceLayer.Agent.Contracts;
 using Microsoft.SqlTools.ServiceLayer.IntegrationTests.Utility;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 using Moq;
 using NUnit.Framework;
-using static Microsoft.SqlTools.ServiceLayer.IntegrationTests.Utility.LiveConnectionHelper;
 
 namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.Agent
 {
diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Agent/AgentServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Agent/AgentServiceTests.cs
index 6094e8a8..1c604951 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Agent/AgentServiceTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Agent/AgentServiceTests.cs
@@ -7,7 +7,6 @@ using System.Threading.Tasks;
 using Microsoft.SqlTools.Hosting.Protocol;
 using Microsoft.SqlTools.ServiceLayer.Agent;
 using Microsoft.SqlTools.ServiceLayer.Agent.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.IntegrationTests.Utility;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
 using Microsoft.SqlTools.ServiceLayer.Utility;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/AzureFunctions/AzureFunctionsServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/AzureFunctions/AzureFunctionsServiceTests.cs
index fa9fc730..f2d99d3b 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/AzureFunctions/AzureFunctionsServiceTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/AzureFunctions/AzureFunctionsServiceTests.cs
@@ -3,15 +3,12 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.SqlTools.Hosting.Protocol;
 using Microsoft.SqlTools.ServiceLayer.AzureFunctions;
 using Microsoft.SqlTools.ServiceLayer.AzureFunctions.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Utility;
-using Moq;
 using NUnit.Framework;
 using System;
 using System.IO;
-using System.Threading.Tasks;
 
 namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.AzureFunctions
 {
diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DacFx/DacFxServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DacFx/DacFxServiceTests.cs
index c3404e95..09fa0a70 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DacFx/DacFxServiceTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/DacFx/DacFxServiceTests.cs
@@ -14,7 +14,6 @@ using Microsoft.SqlTools.ServiceLayer.Connection.ReliableConnection;
 using Microsoft.SqlTools.ServiceLayer.DacFx;
 using Microsoft.SqlTools.ServiceLayer.DacFx.Contracts;
 using Microsoft.SqlTools.ServiceLayer.IntegrationTests.Utility;
-using Microsoft.SqlTools.ServiceLayer.SchemaCompare.Contracts;
 using Microsoft.SqlTools.ServiceLayer.TaskServices;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
 using NUnit.Framework;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Migration/MigrationServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Migration/MigrationServiceTests.cs
index c1f8b971..11ad25b4 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Migration/MigrationServiceTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Migration/MigrationServiceTests.cs
@@ -7,7 +7,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.Hosting.Protocol;
 using Microsoft.SqlTools.ServiceLayer.IntegrationTests.Utility;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Profiler/ProfilerServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Profiler/ProfilerServiceTests.cs
index f54c7686..a01da8ec 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Profiler/ProfilerServiceTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Profiler/ProfilerServiceTests.cs
@@ -4,15 +4,9 @@
 //
 
 using System;
-using System.Collections.Generic;
-using Microsoft.Data.SqlClient;
-using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.SqlServer.Management.Smo;
-using Microsoft.SqlServer.Management.XEvent;
 using Microsoft.SqlTools.Hosting.Protocol;
-using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.IntegrationTests.Utility;
 using Microsoft.SqlTools.ServiceLayer.Profiler;
 using Microsoft.SqlTools.ServiceLayer.Profiler.Contracts;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/QueryExecution/DataTypeTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/QueryExecution/DataTypeTests.cs
index 955be2ca..e31abfc8 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/QueryExecution/DataTypeTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/QueryExecution/DataTypeTests.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.IntegrationTests.Utility;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/QueryExecution/ExecuteTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/QueryExecution/ExecuteTests.cs
index 69df4248..ae97d172 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/QueryExecution/ExecuteTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/QueryExecution/ExecuteTests.cs
@@ -1,117 +1,115 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
-
-using System;
-using System.Collections.Concurrent;
-using System.Data.Common;
-using System.Linq;
-using Microsoft.SqlTools.ServiceLayer.Connection;
-using Microsoft.SqlTools.ServiceLayer.IntegrationTests.Utility;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution;
-using Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage;
-using Microsoft.SqlTools.ServiceLayer.SqlContext;
-using Microsoft.SqlTools.ServiceLayer.Test.Common;
-using NUnit.Framework;
-
-namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.QueryExecution
-{
-    public class ExecuteTests
-    {
-        [Test]
-        public void RollbackTransactionFailsWithoutBeginTransaction()
-        {
-            const string refactorText = "ROLLBACK TRANSACTION";
-
-            // Given a connection to a live database
-            var result = LiveConnectionHelper.InitLiveConnectionInfo();
-            ConnectionInfo connInfo = result.ConnectionInfo;
-            var fileStreamFactory = MemoryFileSystem.GetFileStreamFactory();
-
-            // If I run a "ROLLBACK TRANSACTION" query
-            Query query = new Query(refactorText, connInfo, new QueryExecutionSettings(), fileStreamFactory);
-            query.Execute();
-            query.ExecutionTask.Wait();
-
-            // There should be an error
-            Assert.True(query.Batches[0].HasError);
-        }
-
-        [Test]
-        public void TransactionsSucceedAcrossQueries()
-        {
-            const string beginText = "BEGIN TRANSACTION";
-            const string rollbackText = "ROLLBACK TRANSACTION";
-
-            // Given a connection to a live database
-            var result = LiveConnectionHelper.InitLiveConnectionInfo();
-            ConnectionInfo connInfo = result.ConnectionInfo;
-            var fileStreamFactory = MemoryFileSystem.GetFileStreamFactory();
-
-            // If I run a "BEGIN TRANSACTION" query
-            CreateAndExecuteQuery(beginText, connInfo, fileStreamFactory);
-
-            // Then I run a "ROLLBACK TRANSACTION" query, there should be no errors
-            Query rollbackQuery = CreateAndExecuteQuery(rollbackText, connInfo, fileStreamFactory);
-            Assert.False(rollbackQuery.Batches[0].HasError);
-        }
-
-        [Test]
-        public void TempTablesPersistAcrossQueries()
-        {
-            const string createTempText = "CREATE TABLE #someTempTable (id int)";
-            const string insertTempText = "INSERT INTO #someTempTable VALUES(1)";
-
-            // Given a connection to a live database
-            var result = LiveConnectionHelper.InitLiveConnectionInfo();
-            ConnectionInfo connInfo = result.ConnectionInfo;
-            var fileStreamFactory = MemoryFileSystem.GetFileStreamFactory(new ConcurrentDictionary<string, byte[]>());
-
-            // If I run a query creating a temp table
-            CreateAndExecuteQuery(createTempText, connInfo, fileStreamFactory);
-
-            // Then I run a different query using that temp table, there should be no errors
-            Query insertTempQuery = CreateAndExecuteQuery(insertTempText, connInfo, fileStreamFactory);
-            Assert.False(insertTempQuery.Batches[0].HasError);
-        }
-
-        [Test]
-        public void DatabaseChangesWhenCallingUseDatabase()
-        {
-            const string master = "master";
-            const string tempdb = "tempdb";
-            const string useQuery = "USE {0}";
-
-            // Given a connection to a live database
-            var result = LiveConnectionHelper.InitLiveConnectionInfo();
-            ConnectionInfo connInfo = result.ConnectionInfo;
-            DbConnection connection;
-            connInfo.TryGetConnection(ConnectionType.Default, out connection);
-
-            var fileStreamFactory = MemoryFileSystem.GetFileStreamFactory(new ConcurrentDictionary<string, byte[]>());
-
-            // If I use master, the current database should be master
-            CreateAndExecuteQuery(string.Format(useQuery, master), connInfo, fileStreamFactory);
-            Assert.AreEqual(master, connInfo.ConnectionDetails.DatabaseName);
-
-            // If I use tempdb, the current database should be tempdb
-            CreateAndExecuteQuery(string.Format(useQuery, tempdb), connInfo, fileStreamFactory);
-            Assert.AreEqual(tempdb, connInfo.ConnectionDetails.DatabaseName);
-
-            // If I switch back to master, the current database should be master
-            CreateAndExecuteQuery(string.Format(useQuery, master), connInfo, fileStreamFactory);
-            Assert.AreEqual(master, connInfo.ConnectionDetails.DatabaseName);
-        }
-
-        public static Query CreateAndExecuteQuery(string queryText, ConnectionInfo connectionInfo, IFileStreamFactory fileStreamFactory, bool IsSqlCmd = false)
-        {
-            var settings = new QueryExecutionSettings() { IsSqlCmdMode = IsSqlCmd };
-            Query query = new Query(queryText, connectionInfo, settings, fileStreamFactory);
-            query.Execute();
-            query.ExecutionTask.Wait();
-            return query;
-        }
-
-    }
-}
+//
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//
+
+using System.Collections.Concurrent;
+using System.Data.Common;
+using Microsoft.SqlTools.ServiceLayer.Connection;
+using Microsoft.SqlTools.ServiceLayer.IntegrationTests.Utility;
+using Microsoft.SqlTools.ServiceLayer.QueryExecution;
+using Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage;
+using Microsoft.SqlTools.ServiceLayer.SqlContext;
+using Microsoft.SqlTools.ServiceLayer.Test.Common;
+using NUnit.Framework;
+
+namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.QueryExecution
+{
+    public class ExecuteTests
+    {
+        [Test]
+        public void RollbackTransactionFailsWithoutBeginTransaction()
+        {
+            const string refactorText = "ROLLBACK TRANSACTION";
+
+            // Given a connection to a live database
+            var result = LiveConnectionHelper.InitLiveConnectionInfo();
+            ConnectionInfo connInfo = result.ConnectionInfo;
+            var fileStreamFactory = MemoryFileSystem.GetFileStreamFactory();
+
+            // If I run a "ROLLBACK TRANSACTION" query
+            Query query = new Query(refactorText, connInfo, new QueryExecutionSettings(), fileStreamFactory);
+            query.Execute();
+            query.ExecutionTask.Wait();
+
+            // There should be an error
+            Assert.True(query.Batches[0].HasError);
+        }
+
+        [Test]
+        public void TransactionsSucceedAcrossQueries()
+        {
+            const string beginText = "BEGIN TRANSACTION";
+            const string rollbackText = "ROLLBACK TRANSACTION";
+
+            // Given a connection to a live database
+            var result = LiveConnectionHelper.InitLiveConnectionInfo();
+            ConnectionInfo connInfo = result.ConnectionInfo;
+            var fileStreamFactory = MemoryFileSystem.GetFileStreamFactory();
+
+            // If I run a "BEGIN TRANSACTION" query
+            CreateAndExecuteQuery(beginText, connInfo, fileStreamFactory);
+
+            // Then I run a "ROLLBACK TRANSACTION" query, there should be no errors
+            Query rollbackQuery = CreateAndExecuteQuery(rollbackText, connInfo, fileStreamFactory);
+            Assert.False(rollbackQuery.Batches[0].HasError);
+        }
+
+        [Test]
+        public void TempTablesPersistAcrossQueries()
+        {
+            const string createTempText = "CREATE TABLE #someTempTable (id int)";
+            const string insertTempText = "INSERT INTO #someTempTable VALUES(1)";
+
+            // Given a connection to a live database
+            var result = LiveConnectionHelper.InitLiveConnectionInfo();
+            ConnectionInfo connInfo = result.ConnectionInfo;
+            var fileStreamFactory = MemoryFileSystem.GetFileStreamFactory(new ConcurrentDictionary<string, byte[]>());
+
+            // If I run a query creating a temp table
+            CreateAndExecuteQuery(createTempText, connInfo, fileStreamFactory);
+
+            // Then I run a different query using that temp table, there should be no errors
+            Query insertTempQuery = CreateAndExecuteQuery(insertTempText, connInfo, fileStreamFactory);
+            Assert.False(insertTempQuery.Batches[0].HasError);
+        }
+
+        [Test]
+        public void DatabaseChangesWhenCallingUseDatabase()
+        {
+            const string master = "master";
+            const string tempdb = "tempdb";
+            const string useQuery = "USE {0}";
+
+            // Given a connection to a live database
+            var result = LiveConnectionHelper.InitLiveConnectionInfo();
+            ConnectionInfo connInfo = result.ConnectionInfo;
+            DbConnection connection;
+            connInfo.TryGetConnection(ConnectionType.Default, out connection);
+
+            var fileStreamFactory = MemoryFileSystem.GetFileStreamFactory(new ConcurrentDictionary<string, byte[]>());
+
+            // If I use master, the current database should be master
+            CreateAndExecuteQuery(string.Format(useQuery, master), connInfo, fileStreamFactory);
+            Assert.AreEqual(master, connInfo.ConnectionDetails.DatabaseName);
+
+            // If I use tempdb, the current database should be tempdb
+            CreateAndExecuteQuery(string.Format(useQuery, tempdb), connInfo, fileStreamFactory);
+            Assert.AreEqual(tempdb, connInfo.ConnectionDetails.DatabaseName);
+
+            // If I switch back to master, the current database should be master
+            CreateAndExecuteQuery(string.Format(useQuery, master), connInfo, fileStreamFactory);
+            Assert.AreEqual(master, connInfo.ConnectionDetails.DatabaseName);
+        }
+
+        public static Query CreateAndExecuteQuery(string queryText, ConnectionInfo connectionInfo, IFileStreamFactory fileStreamFactory, bool IsSqlCmd = false)
+        {
+            var settings = new QueryExecutionSettings() { IsSqlCmdMode = IsSqlCmd };
+            Query query = new Query(queryText, connectionInfo, settings, fileStreamFactory);
+            query.Execute();
+            query.ExecutionTask.Wait();
+            return query;
+        }
+
+    }
+}
diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SchemaCompare/SchemaCompareServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SchemaCompare/SchemaCompareServiceTests.cs
index 8385bd96..5a006e91 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SchemaCompare/SchemaCompareServiceTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SchemaCompare/SchemaCompareServiceTests.cs
@@ -18,7 +18,6 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using NUnit.Framework;
-using System.Diagnostics;
 using static Microsoft.SqlTools.ServiceLayer.IntegrationTests.Utility.LiveConnectionHelper;
 using System.Collections.Generic;
 
diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SchemaCompare/SchemaCompareTestUtils.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SchemaCompare/SchemaCompareTestUtils.cs
index 75b1b7e0..002ab8ea 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SchemaCompare/SchemaCompareTestUtils.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/SchemaCompare/SchemaCompareTestUtils.cs
@@ -14,7 +14,6 @@ using NUnit.Framework;
 using System;
 using System.IO;
 using static Microsoft.SqlTools.ServiceLayer.IntegrationTests.Utility.LiveConnectionHelper;
-using System.Collections.Generic;
 
 namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.SchemaCompare
 {
diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Security/CredentialTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Security/CredentialTests.cs
index 1999c671..2eb46f6c 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Security/CredentialTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Security/CredentialTests.cs
@@ -3,19 +3,11 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Collections.Generic;
-using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.SqlTools.Hosting.Protocol;
-using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.IntegrationTests.Utility;
 using Microsoft.SqlTools.ServiceLayer.Security;
-using Microsoft.SqlTools.ServiceLayer.Security.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
-using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts;
-using Moq;
 using NUnit.Framework;
-using static Microsoft.SqlTools.ServiceLayer.IntegrationTests.Utility.LiveConnectionHelper;
 
 namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.Security
 {
diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Security/SecurityTestUtils.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Security/SecurityTestUtils.cs
index 09731041..1d1329f4 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Security/SecurityTestUtils.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Security/SecurityTestUtils.cs
@@ -6,7 +6,6 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.Hosting.Protocol;
-using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.Security;
 using Microsoft.SqlTools.ServiceLayer.Security.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Utility;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Utility/LiveConnectionHelper.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Utility/LiveConnectionHelper.cs
index 1ab197e4..cb14e44d 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Utility/LiveConnectionHelper.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/Utility/LiveConnectionHelper.cs
@@ -5,10 +5,8 @@
 
 using System;
 using Microsoft.Data.SqlClient;
-using System.Globalization;
 using System.IO;
 using System.Reflection;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.SqlServer.Management.Common;
 using Microsoft.SqlTools.ServiceLayer.Connection;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/CreateTestDbAttribute.cs b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/CreateTestDbAttribute.cs
index fc645979..76341711 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/CreateTestDbAttribute.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/CreateTestDbAttribute.cs
@@ -4,7 +4,6 @@
 //
 
 using System.Reflection;
-using System.Threading.Tasks;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
 using Xunit.Sdk;
 
diff --git a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Properties/AssemblyInfo.cs b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Properties/AssemblyInfo.cs
index fc716e0b..6a4b34dd 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Properties/AssemblyInfo.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Properties/AssemblyInfo.cs
@@ -4,7 +4,6 @@
 //
 
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following
diff --git a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/ScriptinTests.cs b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/ScriptinTests.cs
index b90ff9c3..d2039f65 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/ScriptinTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/ScriptinTests.cs
@@ -3,12 +3,9 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
-using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Scripting.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
 using Xunit;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/RequestContextMocking/EventFlowValidator.cs b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/RequestContextMocking/EventFlowValidator.cs
index 8fb4050c..50956594 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/RequestContextMocking/EventFlowValidator.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/RequestContextMocking/EventFlowValidator.cs
@@ -5,7 +5,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.Hosting.Contracts;
 using Microsoft.SqlTools.Hosting.Protocol;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/SqlTestDb.cs b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/SqlTestDb.cs
index 9553d3ba..a0cdcf46 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/SqlTestDb.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/SqlTestDb.cs
@@ -10,7 +10,6 @@ using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
 using NUnit.Framework;
 using Microsoft.Data.SqlClient;
 using System.Threading.Tasks;
-using Microsoft.SqlServer.Management.Common;
 
 namespace Microsoft.SqlTools.ServiceLayer.Test.Common
 {
diff --git a/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/Program.cs b/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/Program.cs
index b79c55ab..2dde4091 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/Program.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/Program.cs
@@ -3,12 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
-using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.TestDriver.Driver;
-using Microsoft.SqlTools.Utility;
 using NUnit.Framework;
 
 [assembly: NonParallelizable]
diff --git a/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/Properties/AssemblyInfo.cs b/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/Properties/AssemblyInfo.cs
index 6ef9f3ba..2bb4edf4 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/Properties/AssemblyInfo.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/Properties/AssemblyInfo.cs
@@ -4,7 +4,6 @@
 //
 
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following
diff --git a/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/QueryExecutionTests.cs b/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/QueryExecutionTests.cs
index e7d0b0f1..7c3cce10 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/QueryExecutionTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.TestDriver.Tests/QueryExecutionTests.cs
@@ -3,10 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.Test.Common;
-using NUnit.Framework;
-
 namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
 {
     public class QueryExecutionTests
diff --git a/test/Microsoft.SqlTools.ServiceLayer.TestEnvConfig/Properties/AssemblyInfo.cs b/test/Microsoft.SqlTools.ServiceLayer.TestEnvConfig/Properties/AssemblyInfo.cs
index 30515a2f..8be88f85 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.TestEnvConfig/Properties/AssemblyInfo.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.TestEnvConfig/Properties/AssemblyInfo.cs
@@ -4,7 +4,6 @@
 //
 
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/AutoParameterization/SqlParameterizerTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/AutoParameterization/SqlParameterizerTests.cs
index 41edd0d3..9c6284bb 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/AutoParameterization/SqlParameterizerTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/AutoParameterization/SqlParameterizerTests.cs
@@ -6,7 +6,6 @@
 using System;
 using System.Collections.Generic;
 using System.Data.Common;
-using System.Diagnostics;
 using System.Linq;
 using Microsoft.Data.SqlClient;
 using Microsoft.SqlTools.ServiceLayer.AutoParameterizaition;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/DisasterRecovery/BackupOperationStub.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/DisasterRecovery/BackupOperationStub.cs
index 3b984dcb..8056f3e1 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/DisasterRecovery/BackupOperationStub.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/DisasterRecovery/BackupOperationStub.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.SqlServer.Management.Smo;
-using Microsoft.SqlTools.ServiceLayer.Admin;
 using Microsoft.SqlTools.ServiceLayer.DisasterRecovery;
 using Microsoft.SqlTools.ServiceLayer.DisasterRecovery.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Management;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/DisasterRecovery/DatabaseFileInfoTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/DisasterRecovery/DatabaseFileInfoTests.cs
index 6f012457..545b5c34 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/DisasterRecovery/DatabaseFileInfoTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/DisasterRecovery/DatabaseFileInfoTests.cs
@@ -4,8 +4,6 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using Microsoft.SqlTools.ServiceLayer.DisasterRecovery.Contracts;
 using Microsoft.SqlTools.ServiceLayer.DisasterRecovery.RestoreOperation;
 using NUnit.Framework;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/DisasterRecovery/RestoreOptionsHelperTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/DisasterRecovery/RestoreOptionsHelperTests.cs
index 8e228d84..bdc6e1cc 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/DisasterRecovery/RestoreOptionsHelperTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/DisasterRecovery/RestoreOptionsHelperTests.cs
@@ -8,7 +8,6 @@ using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlTools.ServiceLayer.DisasterRecovery;
 using Microsoft.SqlTools.ServiceLayer.DisasterRecovery.Contracts;
 using Microsoft.SqlTools.ServiceLayer.DisasterRecovery.RestoreOperation;
-using Microsoft.SqlTools.ServiceLayer.Utility;
 using Microsoft.SqlTools.Utility;
 using NUnit.Framework;
 
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/EditData/Common.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/EditData/Common.cs
index aacadad8..c5a8b30d 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/EditData/Common.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/EditData/Common.cs
@@ -8,7 +8,6 @@ using System.Data.Common;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Castle.Components.DictionaryAdapter;
 using Microsoft.SqlTools.ServiceLayer.EditData;
 using Microsoft.SqlTools.ServiceLayer.EditData.Contracts;
 using Microsoft.SqlTools.ServiceLayer.EditData.UpdateManagement;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/EditData/ServiceIntegrationTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/EditData/ServiceIntegrationTests.cs
index 79423a58..d08b30d5 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/EditData/ServiceIntegrationTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/EditData/ServiceIntegrationTests.cs
@@ -7,7 +7,6 @@ using System;
 using System.Data.Common;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.SqlServer.Dac.Model;
 using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.EditData;
 using Microsoft.SqlTools.ServiceLayer.EditData.Contracts;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Formatter/FormatterSettingsTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Formatter/FormatterSettingsTests.cs
index 5a943880..82030d47 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Formatter/FormatterSettingsTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Formatter/FormatterSettingsTests.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Globalization;
 using Microsoft.SqlTools.ServiceLayer.Formatter;
 using Microsoft.SqlTools.ServiceLayer.Formatter.Contracts;
 using Microsoft.SqlTools.ServiceLayer.SqlContext;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Formatter/TSqlFormatterServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Formatter/TSqlFormatterServiceTests.cs
index 9324c97b..8a3e393d 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Formatter/TSqlFormatterServiceTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Formatter/TSqlFormatterServiceTests.cs
@@ -9,7 +9,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.Hosting.Protocol;
 using Microsoft.SqlTools.ServiceLayer.Formatter.Contracts;
-using Microsoft.SqlTools.ServiceLayer.LanguageServices;
 using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
 using Microsoft.SqlTools.ServiceLayer.Test.Common.RequestContextMocking;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/AutocompleteTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/AutocompleteTests.cs
index dc441af2..43a646fe 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/AutocompleteTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/AutocompleteTests.cs
@@ -5,7 +5,6 @@
 
 using System.Threading.Tasks;
 using Microsoft.SqlServer.Management.SqlParser.Parser;
-using Microsoft.SqlServer.Management.SqlParser.SqlCodeDom;
 using Microsoft.SqlTools.Hosting.Protocol;
 using Microsoft.SqlTools.ServiceLayer.LanguageServices;
 using Microsoft.SqlTools.ServiceLayer.LanguageServices.Completion;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/LanguageServiceTestBase.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/LanguageServiceTestBase.cs
index d3d89054..d65203cb 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/LanguageServiceTestBase.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/LanguageServiceTestBase.cs
@@ -19,7 +19,6 @@ using Microsoft.SqlTools.ServiceLayer.Workspace;
 using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts;
 using GlobalCommon = Microsoft.SqlTools.ServiceLayer.Test.Common;
 using Moq;
-using NUnit.Framework;
 
 namespace Microsoft.SqlTools.ServiceLayer.UnitTests.LanguageServer
 {
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/PeekDefinitionTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/PeekDefinitionTests.cs
index 71ec55a8..e6d45a19 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/PeekDefinitionTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/LanguageServer/PeekDefinitionTests.cs
@@ -4,28 +4,15 @@
 //
 
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
-using Microsoft.SqlServer.Management.SqlParser.Binder;
 using Microsoft.SqlServer.Management.SqlParser.Intellisense;
-using Microsoft.SqlServer.Management.SqlParser.MetadataProvider;
-using Microsoft.SqlServer.Management.SqlParser.Parser;
-using Microsoft.SqlTools.Hosting.Protocol;
-using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.LanguageServices;
-using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Scripting;
-using Microsoft.SqlTools.ServiceLayer.SqlContext;
-using Microsoft.SqlTools.ServiceLayer.UnitTests.Utility;
 using Microsoft.SqlTools.ServiceLayer.Utility;
-using Microsoft.SqlTools.ServiceLayer.Workspace;
-using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts;
 using Moq;
 using NUnit.Framework;
-using GlobalCommon = Microsoft.SqlTools.ServiceLayer.Test.Common;
 using Location = Microsoft.SqlTools.ServiceLayer.Workspace.Contracts.Location;
 
 namespace Microsoft.SqlTools.ServiceLayer.UnitTests.LanguageServer
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/NodePathGeneratorTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/NodePathGeneratorTests.cs
index 6fc42581..afb03d45 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/NodePathGeneratorTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ObjectExplorer/NodePathGeneratorTests.cs
@@ -3,24 +3,11 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using System.Collections.Generic;
-using Microsoft.Data.SqlClient;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.SqlTools.Hosting.Protocol;
-using Microsoft.SqlTools.ServiceLayer.Connection;
-using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
 using Microsoft.SqlTools.ServiceLayer.ObjectExplorer;
-using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Contracts;
 using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Nodes;
 using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel;
-using Microsoft.SqlTools.ServiceLayer.UnitTests.Utility;
-using Moq;
 using NUnit.Framework;
-using Microsoft.SqlTools.ServiceLayer.LanguageServices;
-using Microsoft.SqlServer.Management.Common;
-using Microsoft.SqlTools.ServiceLayer.Test.Common.RequestContextMocking;
 
 namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ObjectExplorer
 {
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Profiler/ProfilerServiceTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Profiler/ProfilerServiceTests.cs
index 7efe8216..bce6c5eb 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Profiler/ProfilerServiceTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Profiler/ProfilerServiceTests.cs
@@ -3,8 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Collections.Generic;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Profiler/ProfilerTestObjects.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Profiler/ProfilerTestObjects.cs
index 94dcd171..98834945 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Profiler/ProfilerTestObjects.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Profiler/ProfilerTestObjects.cs
@@ -3,19 +3,10 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.SqlServer.Management.XEvent;
-using Microsoft.SqlTools.Hosting.Protocol;
 using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.Profiler;
 using Microsoft.SqlTools.ServiceLayer.Profiler.Contracts;
-using Microsoft.SqlTools.ServiceLayer.UnitTests.Utility;
-using Moq;
-using NUnit.Framework;
 
 namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Profiler
 {
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/CancelTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/CancelTests.cs
index b6eb3dfb..b4ca9c82 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/CancelTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/CancelTests.cs
@@ -11,7 +11,6 @@ using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts.ExecuteRequests;
 using Microsoft.SqlTools.ServiceLayer.SqlContext;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
 using Microsoft.SqlTools.ServiceLayer.Test.Common.RequestContextMocking;
-using Microsoft.SqlTools.ServiceLayer.UnitTests.Utility;
 using Microsoft.SqlTools.ServiceLayer.Workspace;
 using Moq;
 using NUnit.Framework;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/DisposeTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/DisposeTests.cs
index 8ff1429c..1bb03300 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/DisposeTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/DisposeTests.cs
@@ -9,7 +9,6 @@ using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
 using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts.ExecuteRequests;
 using Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage;
 using Microsoft.SqlTools.ServiceLayer.SqlContext;
-using Microsoft.SqlTools.ServiceLayer.UnitTests.Utility;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
 using Microsoft.SqlTools.ServiceLayer.Test.Common.RequestContextMocking;
 using Microsoft.SqlTools.ServiceLayer.Workspace;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/Execution/BatchTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/Execution/BatchTests.cs
index ad536bcf..62572d87 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/Execution/BatchTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/Execution/BatchTests.cs
@@ -7,7 +7,6 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
-using Microsoft.Data.SqlClient;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/Execution/ResultSetTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/Execution/ResultSetTests.cs
index bc821edb..0beb27c7 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/Execution/ResultSetTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/Execution/ResultSetTests.cs
@@ -16,7 +16,6 @@ using Microsoft.SqlTools.ServiceLayer.QueryExecution;
 using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
 using Microsoft.SqlTools.ServiceLayer.UnitTests.Utility;
-using Microsoft.SqlTools.Utility;
 using NUnit.Framework;
 
 namespace Microsoft.SqlTools.ServiceLayer.UnitTests.QueryExecution.Execution
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/ExecutionPlanTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/ExecutionPlanTests.cs
index 305d4022..974ab442 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/ExecutionPlanTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/ExecutionPlanTests.cs
@@ -12,7 +12,6 @@ using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts.ExecuteRequests;
 using Microsoft.SqlTools.ServiceLayer.SqlContext;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
 using Microsoft.SqlTools.ServiceLayer.Test.Common.RequestContextMocking;
-using Microsoft.SqlTools.ServiceLayer.UnitTests.Utility;
 using NUnit.Framework;
 
 namespace Microsoft.SqlTools.ServiceLayer.UnitTests.QueryExecution
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/SaveResults/ServiceIntegrationTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/SaveResults/ServiceIntegrationTests.cs
index 50fe8bfe..898dd568 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/SaveResults/ServiceIntegrationTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/SaveResults/ServiceIntegrationTests.cs
@@ -14,7 +14,6 @@ using Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage;
 using Microsoft.SqlTools.ServiceLayer.SqlContext;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
 using Microsoft.SqlTools.ServiceLayer.Test.Common.RequestContextMocking;
-using Microsoft.SqlTools.ServiceLayer.UnitTests.Utility;
 using Microsoft.SqlTools.ServiceLayer.Workspace;
 using Moq;
 using NUnit.Framework;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/SubsetTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/SubsetTests.cs
index 79ddc7bc..99fef2f9 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/SubsetTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/SubsetTests.cs
@@ -11,7 +11,6 @@ using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
 using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts.ExecuteRequests;
 using Microsoft.SqlTools.ServiceLayer.Test.Common;
 using Microsoft.SqlTools.ServiceLayer.Test.Common.RequestContextMocking;
-using Microsoft.SqlTools.ServiceLayer.UnitTests.Utility;
 using NUnit.Framework;
 
 namespace Microsoft.SqlTools.ServiceLayer.UnitTests.QueryExecution
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ResourceProvider/Fakes/FakeDataFactory.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ResourceProvider/Fakes/FakeDataFactory.cs
index cfa5fd3f..56fb8500 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ResourceProvider/Fakes/FakeDataFactory.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ResourceProvider/Fakes/FakeDataFactory.cs
@@ -5,13 +5,8 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.Data.SqlClient;
-using System.Diagnostics;
-using System.Linq;
 using Microsoft.SqlTools.ResourceProvider.Core;
-using Microsoft.SqlTools.ResourceProvider.Core.Extensibility;
 using Microsoft.SqlTools.ServiceLayer.UnitTests.ResourceProvider.Azure;
-using Moq;
 
 namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ResourceProvider.Fakes
 {
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/SchemaCompare/SchemaCompareTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/SchemaCompare/SchemaCompareTests.cs
index 9ba93eee..96f1018a 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/SchemaCompare/SchemaCompareTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/SchemaCompare/SchemaCompareTests.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using Microsoft.SqlTools.ServiceLayer.SchemaCompare;
 using Microsoft.SqlTools.ServiceLayer.SchemaCompare.Contracts;
 using NUnit.Framework;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Scripting/ScriptingExtensionMethodsTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Scripting/ScriptingExtensionMethodsTests.cs
index 6fdb3e2f..036a1eb3 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Scripting/ScriptingExtensionMethodsTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Scripting/ScriptingExtensionMethodsTests.cs
@@ -3,9 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using Microsoft.SqlServer.Management.Sdk.Sfc;
 using Microsoft.SqlTools.ServiceLayer.Scripting;
 using Microsoft.SqlTools.ServiceLayer.Scripting.Contracts;
@@ -13,7 +10,7 @@ using NUnit.Framework;
 using Assert = NUnit.Framework.Assert;
 namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Scripting
 {
-    
+
     public class ScriptingExtensionMethodsTests
     {
         /// <summary>
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Scripting/ScriptingObjectMatcherTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Scripting/ScriptingObjectMatcherTests.cs
index 1d9d187f..9c050d4a 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Scripting/ScriptingObjectMatcherTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Scripting/ScriptingObjectMatcherTests.cs
@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.SqlTools.ServiceLayer.Scripting;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/ScriptFileTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/ScriptFileTests.cs
index b70e762b..36699dba 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/ScriptFileTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceHost/ScriptFileTests.cs
@@ -5,7 +5,6 @@
 
 using System;
 using System.Linq;
-using Microsoft.SqlTools.Utility;
 using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts;
 using NUnit.Framework;
 
@@ -18,7 +17,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ServiceHost
     {
         internal static object fileLock = new object();
 
-        private static readonly string query = 
+        private static readonly string query =
             "SELECT * FROM sys.objects as o1" + Environment.NewLine +
             "SELECT * FROM sys.objects as o2" + Environment.NewLine +
             "SELECT * FROM sys.objects as o3" + Environment.NewLine;
@@ -31,7 +30,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ServiceHost
             }
 
             string ownerUri = System.IO.Path.GetTempFileName();
-           
+
             // Write the query text to a backing file
             lock (fileLock)
             {
@@ -42,7 +41,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ServiceHost
         }
 
         /// <summary>
-        /// Validate GetLinesInRange with invalid range   
+        /// Validate GetLinesInRange with invalid range
         /// </summary>
         [Test]
         public void GetLinesInRangeWithInvalidRangeTest()
@@ -54,20 +53,20 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ServiceHost
             {
                 scriptFile.GetLinesInRange(
                     new BufferRange(
-                        new BufferPosition(1, 0), 
+                        new BufferPosition(1, 0),
                         new BufferPosition(2, 0)));
             }
             catch (ArgumentOutOfRangeException)
             {
                 exceptionRaised = true;
             }
-            
+
             Assert.True(exceptionRaised, "ArgumentOutOfRangeException raised for invalid index");
 
         }
 
         /// <summary>
-        /// Validate GetLinesInRange       
+        /// Validate GetLinesInRange
         /// </summary>
         [Test]
         public void GetLinesInRangeTest()
@@ -82,7 +81,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ServiceHost
 
             string[] lines = scriptFile.GetLinesInRange(
                     new BufferRange(
-                        new BufferPosition(2, 1), 
+                        new BufferPosition(2, 1),
                         new BufferPosition(2, 7)));
 
             Assert.True(lines.Length == 1, "One line in range");
@@ -115,7 +114,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ServiceHost
                 scriptFile.GetOffsetAtPosition(2, 7));
             Assert.NotNull(range);
         }
-        
+
         [Test]
         public void CanApplySingleLineInsert()
         {
@@ -496,7 +495,7 @@ First line
 
             Assert.AreEqual(expectedLine, newPosition.Line);
             Assert.AreEqual(expectedColumn, newPosition.Column);
-        }        
+        }
 
 
     }
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceTestBase.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceTestBase.cs
index 5a5dfbc8..eb4adbaa 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceTestBase.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ServiceTestBase.cs
@@ -8,7 +8,6 @@ using System.Threading.Tasks;
 using Microsoft.SqlTools.Extensibility;
 using Microsoft.SqlTools.Hosting.Protocol;
 using Microsoft.SqlTools.ServiceLayer.Test.Common.RequestContextMocking;
-using Microsoft.SqlTools.ServiceLayer.UnitTests.Utility;
 using Moq;
 
 namespace Microsoft.SqlTools.ServiceLayer.UnitTests
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/SqlAssessment/GenerateScriptOperationTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/SqlAssessment/GenerateScriptOperationTests.cs
index 80f92e5b..dcd588f2 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/SqlAssessment/GenerateScriptOperationTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/SqlAssessment/GenerateScriptOperationTests.cs
@@ -11,7 +11,6 @@ using Microsoft.SqlServer.Management.Assessment;
 using Microsoft.SqlTools.ServiceLayer.SqlAssessment;
 using Microsoft.SqlTools.ServiceLayer.SqlAssessment.Contracts;
 using Microsoft.SqlTools.ServiceLayer.TaskServices;
-using Moq;
 using NUnit.Framework;
 
 namespace Microsoft.SqlTools.ServiceLayer.UnitTests.SqlAssessment
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/TestDbDataReader.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/TestDbDataReader.cs
index c517f198..be67b75d 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/TestDbDataReader.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/TestDbDataReader.cs
@@ -8,8 +8,6 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Data.Common;
-using Microsoft.Data.SqlClient;
-using System.Linq;
 
 namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
 {
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/TestObjects.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/TestObjects.cs
index 3997983a..81bcc077 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/TestObjects.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/TestObjects.cs
@@ -8,8 +8,6 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.SqlTools.ServiceLayer.Connection;
 using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
 using Microsoft.SqlTools.ServiceLayer.LanguageServices;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/UtilityTests/FromSqlScriptTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/UtilityTests/FromSqlScriptTests.cs
index 5f18bc65..cf8752dd 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/UtilityTests/FromSqlScriptTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/UtilityTests/FromSqlScriptTests.cs
@@ -5,7 +5,6 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlTools.ServiceLayer.Utility.SqlScriptFormatters;
 using NUnit.Framework;
 
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/UtilityTests/ToSqlScriptTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/UtilityTests/ToSqlScriptTests.cs
index 1135340e..aff90bbc 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/UtilityTests/ToSqlScriptTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/UtilityTests/ToSqlScriptTests.cs
@@ -3,13 +3,11 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data.Common;
 using System.Text.RegularExpressions;
-using Microsoft.SqlServer.Management.Smo;
 using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
-using Microsoft.SqlTools.ServiceLayer.UnitTests.Utility;
 using Microsoft.SqlTools.ServiceLayer.Utility.SqlScriptFormatters;
 using NUnit.Framework;
 
diff --git a/test/ScriptGenerator/CommandOptions.cs b/test/ScriptGenerator/CommandOptions.cs
index 03a2fbea..69f5e418 100644
--- a/test/ScriptGenerator/CommandOptions.cs
+++ b/test/ScriptGenerator/CommandOptions.cs
@@ -4,8 +4,6 @@
 //
 
 using System;
-using System.Globalization;
-using System.IO;
 
 namespace ScriptGenerator
 {