diff --git a/src/Adapter/MSTest.CoreAdapter/Discovery/UnitTestDiscoverer.cs b/src/Adapter/MSTest.CoreAdapter/Discovery/UnitTestDiscoverer.cs
index 2c59ad0aaf..4a75207da4 100644
--- a/src/Adapter/MSTest.CoreAdapter/Discovery/UnitTestDiscoverer.cs
+++ b/src/Adapter/MSTest.CoreAdapter/Discovery/UnitTestDiscoverer.cs
@@ -6,7 +6,6 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter
     using System.Collections.Generic;
     using System.Globalization;
     using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Discovery;
-    using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
     using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
diff --git a/src/Adapter/MSTest.CoreAdapter/Execution/TestMethodRunner.cs b/src/Adapter/MSTest.CoreAdapter/Execution/TestMethodRunner.cs
index 67fb4b3823..30338d7c42 100644
--- a/src/Adapter/MSTest.CoreAdapter/Execution/TestMethodRunner.cs
+++ b/src/Adapter/MSTest.CoreAdapter/Execution/TestMethodRunner.cs
@@ -11,7 +11,6 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution
     using System.Linq;
     using System.Reflection;
     using Extensions;
-    using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
     using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
     using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
diff --git a/src/Adapter/MSTest.CoreAdapter/Extensions/MethodInfoExtensions.cs b/src/Adapter/MSTest.CoreAdapter/Extensions/MethodInfoExtensions.cs
index b221df7923..5f5d1f45a3 100644
--- a/src/Adapter/MSTest.CoreAdapter/Extensions/MethodInfoExtensions.cs
+++ b/src/Adapter/MSTest.CoreAdapter/Extensions/MethodInfoExtensions.cs
@@ -4,7 +4,6 @@
 namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Extensions
 {
     using System.Diagnostics;
-    using System.Globalization;
     using System.Linq;
     using System.Reflection;
     using System.Runtime.CompilerServices;
diff --git a/src/Adapter/MSTest.CoreAdapter/Helpers/RunSettingsUtilities.cs b/src/Adapter/MSTest.CoreAdapter/Helpers/RunSettingsUtilities.cs
index ad6061a67d..646effd838 100644
--- a/src/Adapter/MSTest.CoreAdapter/Helpers/RunSettingsUtilities.cs
+++ b/src/Adapter/MSTest.CoreAdapter/Helpers/RunSettingsUtilities.cs
@@ -10,7 +10,6 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers
     using System.IO;
     using System.Xml;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
-    using TestAdapter;
     using TestPlatform.ObjectModel;
 
     internal class RunSettingsUtilities
diff --git a/src/Adapter/MSTest.CoreAdapter/ObjectModel/TestFailedException.cs b/src/Adapter/MSTest.CoreAdapter/ObjectModel/TestFailedException.cs
index fd6dab2dd8..51a31628a1 100644
--- a/src/Adapter/MSTest.CoreAdapter/ObjectModel/TestFailedException.cs
+++ b/src/Adapter/MSTest.CoreAdapter/ObjectModel/TestFailedException.cs
@@ -6,8 +6,6 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel
     using System;
     using System.Diagnostics;
 
-    using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
-
     /// <summary>
     /// Internal class to indicate Test Execution failure
     /// </summary>
diff --git a/src/Adapter/MSTest.CoreAdapter/RunConfigurationSettings.cs b/src/Adapter/MSTest.CoreAdapter/RunConfigurationSettings.cs
index 375d1e0a9c..86bf7829ac 100644
--- a/src/Adapter/MSTest.CoreAdapter/RunConfigurationSettings.cs
+++ b/src/Adapter/MSTest.CoreAdapter/RunConfigurationSettings.cs
@@ -9,7 +9,6 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter
 
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
 
     public class RunConfigurationSettings
diff --git a/src/Adapter/PlatformServices.Desktop/Data/TestDataConnectionFactory.cs b/src/Adapter/PlatformServices.Desktop/Data/TestDataConnectionFactory.cs
index dd4f7bcd97..0331f0c504 100644
--- a/src/Adapter/PlatformServices.Desktop/Data/TestDataConnectionFactory.cs
+++ b/src/Adapter/PlatformServices.Desktop/Data/TestDataConnectionFactory.cs
@@ -6,9 +6,6 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Dat
     using System;
     using System.Collections.Generic;
     using System.Diagnostics;
-    using System.Linq;
-    using System.Text;
-    using System.Threading.Tasks;
 
     /// <summary>
     /// Defines a class that creates TestDataConnection instances to connect to data sources.
diff --git a/src/Adapter/PlatformServices.Desktop/Services/DesktopFileOperations.cs b/src/Adapter/PlatformServices.Desktop/Services/DesktopFileOperations.cs
index e437b850ce..7aa3f2ceff 100644
--- a/src/Adapter/PlatformServices.Desktop/Services/DesktopFileOperations.cs
+++ b/src/Adapter/PlatformServices.Desktop/Services/DesktopFileOperations.cs
@@ -4,8 +4,6 @@
 namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices
 {
     using System;
-    using System.Collections;
-    using System.Collections.Generic;
     using System.IO;
     using System.Reflection;
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
diff --git a/src/Adapter/PlatformServices.Desktop/Services/DesktopTestContextImplementation.cs b/src/Adapter/PlatformServices.Desktop/Services/DesktopTestContextImplementation.cs
index 3fc57d069f..8b36dae876 100644
--- a/src/Adapter/PlatformServices.Desktop/Services/DesktopTestContextImplementation.cs
+++ b/src/Adapter/PlatformServices.Desktop/Services/DesktopTestContextImplementation.cs
@@ -14,7 +14,6 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices
     using System.IO;
     using System.Linq;
     using System.Threading;
-    using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment;
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.ObjectModel;
     using UTF = Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Adapter/PlatformServices.Desktop/Services/DesktopThreadOperations.cs b/src/Adapter/PlatformServices.Desktop/Services/DesktopThreadOperations.cs
index 4d8cfbb595..d6b17e43a8 100644
--- a/src/Adapter/PlatformServices.Desktop/Services/DesktopThreadOperations.cs
+++ b/src/Adapter/PlatformServices.Desktop/Services/DesktopThreadOperations.cs
@@ -8,7 +8,6 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices
     using System.Threading;
 
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
 #pragma warning disable SA1649 // SA1649FileNameMustMatchTypeName
 
diff --git a/src/Adapter/PlatformServices.Desktop/Utilities/DesktopDeploymentUtility.cs b/src/Adapter/PlatformServices.Desktop/Utilities/DesktopDeploymentUtility.cs
index 85d4df61d8..1f708d0124 100644
--- a/src/Adapter/PlatformServices.Desktop/Utilities/DesktopDeploymentUtility.cs
+++ b/src/Adapter/PlatformServices.Desktop/Utilities/DesktopDeploymentUtility.cs
@@ -9,15 +9,11 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Uti
     using System.Globalization;
     using System.IO;
     using System.Linq;
-    using System.Reflection;
     using System.Security;
 
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment;
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Extensions;
-
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 
     internal class DeploymentUtility : DeploymentUtilityBase
     {
diff --git a/src/Adapter/PlatformServices.Desktop/Utilities/VSInstallationUtilities.cs b/src/Adapter/PlatformServices.Desktop/Utilities/VSInstallationUtilities.cs
index 8de306f263..f606b7b8ff 100644
--- a/src/Adapter/PlatformServices.Desktop/Utilities/VSInstallationUtilities.cs
+++ b/src/Adapter/PlatformServices.Desktop/Utilities/VSInstallationUtilities.cs
@@ -7,7 +7,6 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Uti
     using System.Diagnostics;
     using System.IO;
     using System.Runtime.InteropServices;
-    using Microsoft.Win32;
     using static System.String;
 
     public static class VSInstallationUtilities
diff --git a/src/Adapter/PlatformServices.Interface/ITestDataSource.cs b/src/Adapter/PlatformServices.Interface/ITestDataSource.cs
index 5946b949b9..30a3255c9e 100644
--- a/src/Adapter/PlatformServices.Interface/ITestDataSource.cs
+++ b/src/Adapter/PlatformServices.Interface/ITestDataSource.cs
@@ -4,7 +4,6 @@
 namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface
 {
     using System.Collections.Generic;
-    using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.ObjectModel;
     using UTF = Microsoft.VisualStudio.TestTools.UnitTesting;
 
     /// <summary>
diff --git a/src/Adapter/PlatformServices.Interface/ITestSourceHost.cs b/src/Adapter/PlatformServices.Interface/ITestSourceHost.cs
index f404a05d9c..deb85355ae 100644
--- a/src/Adapter/PlatformServices.Interface/ITestSourceHost.cs
+++ b/src/Adapter/PlatformServices.Interface/ITestSourceHost.cs
@@ -4,7 +4,6 @@
 namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface
 {
     using System;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
 
     /// <summary>
     /// A host that loads the test source.This can be in isolation for desktop using an AppDomain or just loading the source in the current context.
diff --git a/src/Adapter/PlatformServices.Interface/ITraceListenerManager.cs b/src/Adapter/PlatformServices.Interface/ITraceListenerManager.cs
index 5cf874af62..d056f75d41 100644
--- a/src/Adapter/PlatformServices.Interface/ITraceListenerManager.cs
+++ b/src/Adapter/PlatformServices.Interface/ITraceListenerManager.cs
@@ -3,8 +3,6 @@
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface
 {
-    using System.IO;
-
     /// <summary>
     /// Manager to perform operations on the TraceListener object passed as parameter.
     /// These operations are implemented differently for each platform service.
diff --git a/src/Adapter/PlatformServices.NetCore/Services/NetCoreTestSourceHost.cs b/src/Adapter/PlatformServices.NetCore/Services/NetCoreTestSourceHost.cs
index 453d1ec797..26b70f525d 100644
--- a/src/Adapter/PlatformServices.NetCore/Services/NetCoreTestSourceHost.cs
+++ b/src/Adapter/PlatformServices.NetCore/Services/NetCoreTestSourceHost.cs
@@ -7,7 +7,6 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices
     using System.IO;
 
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
-    using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Utilities;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
 
diff --git a/src/Adapter/PlatformServices.NetCore/Utilities/NetCoreAssemblyUtility.cs b/src/Adapter/PlatformServices.NetCore/Utilities/NetCoreAssemblyUtility.cs
index 923d005162..1850155904 100644
--- a/src/Adapter/PlatformServices.NetCore/Utilities/NetCoreAssemblyUtility.cs
+++ b/src/Adapter/PlatformServices.NetCore/Utilities/NetCoreAssemblyUtility.cs
@@ -4,14 +4,6 @@
 namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Utilities
 {
     using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Globalization;
-    using System.IO;
-    using System.Reflection;
-
-    using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
     /// <summary>
     /// Utility for assembly specific functionality.
diff --git a/src/Adapter/PlatformServices.NetCore/Utilities/NetCoreDeploymentUtility.cs b/src/Adapter/PlatformServices.NetCore/Utilities/NetCoreDeploymentUtility.cs
index 073eadf299..09438b2043 100644
--- a/src/Adapter/PlatformServices.NetCore/Utilities/NetCoreDeploymentUtility.cs
+++ b/src/Adapter/PlatformServices.NetCore/Utilities/NetCoreDeploymentUtility.cs
@@ -5,18 +5,9 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Uti
 {
     using System;
     using System.Collections.Generic;
-    using System.Diagnostics;
     using System.Globalization;
-    using System.IO;
-    using System.Linq;
-    using System.Reflection;
-    using System.Security;
 
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment;
-    using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Extensions;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 
     internal class DeploymentUtility : DeploymentUtilityBase
     {
diff --git a/src/Adapter/PlatformServices.NetCore/Utilities/NetCoreReflectionUtility.cs b/src/Adapter/PlatformServices.NetCore/Utilities/NetCoreReflectionUtility.cs
index ad5255660a..87398e542c 100644
--- a/src/Adapter/PlatformServices.NetCore/Utilities/NetCoreReflectionUtility.cs
+++ b/src/Adapter/PlatformServices.NetCore/Utilities/NetCoreReflectionUtility.cs
@@ -4,10 +4,6 @@
 namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Utilities
 {
     using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.IO;
     using System.Linq;
     using System.Reflection;
 
diff --git a/src/Adapter/PlatformServices.Shared/netstandard1.0/Services/ns10TestDataSource.cs b/src/Adapter/PlatformServices.Shared/netstandard1.0/Services/ns10TestDataSource.cs
index 4f2ef00ee4..475edc1ff5 100644
--- a/src/Adapter/PlatformServices.Shared/netstandard1.0/Services/ns10TestDataSource.cs
+++ b/src/Adapter/PlatformServices.Shared/netstandard1.0/Services/ns10TestDataSource.cs
@@ -4,9 +4,7 @@
 namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices
 {
     using System.Collections.Generic;
-    using System.Reflection;
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
-    using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.ObjectModel;
 
     using UTF = Microsoft.VisualStudio.TestTools.UnitTesting;
 
diff --git a/src/Adapter/PlatformServices.Shared/netstandard1.3/Services/ns13TraceListener.cs b/src/Adapter/PlatformServices.Shared/netstandard1.3/Services/ns13TraceListener.cs
index 90b4b81934..2f9f32b8e0 100644
--- a/src/Adapter/PlatformServices.Shared/netstandard1.3/Services/ns13TraceListener.cs
+++ b/src/Adapter/PlatformServices.Shared/netstandard1.3/Services/ns13TraceListener.cs
@@ -3,7 +3,6 @@
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices
 {
-    using System;
     using System.Diagnostics;
     using System.IO;
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
diff --git a/src/Adapter/PlatformServices.Shared/netstandard1.3/Services/ns13TraceListenerManager.cs b/src/Adapter/PlatformServices.Shared/netstandard1.3/Services/ns13TraceListenerManager.cs
index ab3c25ecb7..eeecb8d7b3 100644
--- a/src/Adapter/PlatformServices.Shared/netstandard1.3/Services/ns13TraceListenerManager.cs
+++ b/src/Adapter/PlatformServices.Shared/netstandard1.3/Services/ns13TraceListenerManager.cs
@@ -5,7 +5,6 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices
 {
     using System;
     using System.Diagnostics;
-    using System.Globalization;
     using System.IO;
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
 
diff --git a/src/Adapter/PlatformServices.Shared/netstandard1.3/Utilities/ns13DeploymentUtilityBase.cs b/src/Adapter/PlatformServices.Shared/netstandard1.3/Utilities/ns13DeploymentUtilityBase.cs
index 19abfde94b..cfdf441016 100644
--- a/src/Adapter/PlatformServices.Shared/netstandard1.3/Utilities/ns13DeploymentUtilityBase.cs
+++ b/src/Adapter/PlatformServices.Shared/netstandard1.3/Utilities/ns13DeploymentUtilityBase.cs
@@ -8,9 +8,7 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Uti
     using System.Diagnostics;
     using System.Globalization;
     using System.IO;
-    using System.Linq;
     using System.Reflection;
-    using System.Security;
 
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment;
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Extensions;
diff --git a/src/Adapter/PlatformServices.Shared/netstandard1.3/Utilities/ns13FileUtility.cs b/src/Adapter/PlatformServices.Shared/netstandard1.3/Utilities/ns13FileUtility.cs
index ef829322de..8f672b3194 100644
--- a/src/Adapter/PlatformServices.Shared/netstandard1.3/Utilities/ns13FileUtility.cs
+++ b/src/Adapter/PlatformServices.Shared/netstandard1.3/Utilities/ns13FileUtility.cs
@@ -9,7 +9,6 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Uti
     using System.Globalization;
     using System.IO;
     using System.Linq;
-    using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment;
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Extensions;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
diff --git a/src/TestFramework/Extension.Desktop/ConfigurationSettings/DataSourceElement.cs b/src/TestFramework/Extension.Desktop/ConfigurationSettings/DataSourceElement.cs
index 3267f9a7bb..c961dbff77 100644
--- a/src/TestFramework/Extension.Desktop/ConfigurationSettings/DataSourceElement.cs
+++ b/src/TestFramework/Extension.Desktop/ConfigurationSettings/DataSourceElement.cs
@@ -4,7 +4,6 @@
 namespace Microsoft.VisualStudio.TestTools.UnitTesting
 {
     using System.Configuration;
-    using System.Diagnostics.CodeAnalysis;
 
     /// <summary>
     /// The Data Source element.
diff --git a/src/TestFramework/Extension.Desktop/DesktopTestContext.cs b/src/TestFramework/Extension.Desktop/DesktopTestContext.cs
index 6829575609..9e7a4d9299 100644
--- a/src/TestFramework/Extension.Desktop/DesktopTestContext.cs
+++ b/src/TestFramework/Extension.Desktop/DesktopTestContext.cs
@@ -5,7 +5,6 @@ namespace Microsoft.VisualStudio.TestTools.UnitTesting
 {
     using System;
     using System.Collections;
-    using System.Collections.Generic;
     using System.Data;
     using System.Data.Common;
     using System.Diagnostics;
diff --git a/src/TestFramework/Extension.Shared/TestContext.cs b/src/TestFramework/Extension.Shared/TestContext.cs
index 4de71f3bf4..b8f5a7089a 100644
--- a/src/TestFramework/Extension.Shared/TestContext.cs
+++ b/src/TestFramework/Extension.Shared/TestContext.cs
@@ -6,7 +6,6 @@ namespace Microsoft.VisualStudio.TestTools.UnitTesting
     using System;
     using System.Collections;
     using System.Collections.Generic;
-    using System.Diagnostics;
     using System.Globalization;
     using System.Threading;
 
diff --git a/src/TestFramework/Extension.UWP/UITestMethodAttribute.cs b/src/TestFramework/Extension.UWP/UITestMethodAttribute.cs
index a5b654ca0c..6382aee862 100644
--- a/src/TestFramework/Extension.UWP/UITestMethodAttribute.cs
+++ b/src/TestFramework/Extension.UWP/UITestMethodAttribute.cs
@@ -6,8 +6,6 @@ namespace Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer
     using System;
     using System.Runtime.CompilerServices;
 
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
-
     /// <summary>
     /// Execute test code in UI thread for Windows store apps.
     /// </summary>
diff --git a/src/TestFramework/MSTest.Core/Internal/Helper.cs b/src/TestFramework/MSTest.Core/Internal/Helper.cs
index f43a425696..6cc8d8ab35 100644
--- a/src/TestFramework/MSTest.Core/Internal/Helper.cs
+++ b/src/TestFramework/MSTest.Core/Internal/Helper.cs
@@ -4,12 +4,6 @@
 namespace Microsoft.VisualStudio.TestTools.UnitTesting
 {
     using System;
-    using System.Collections.Generic;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using System.Reflection;
-    using System.Text;
-    using System.Threading.Tasks;
 
     /// <summary>
     /// The helper.
diff --git a/src/TestFramework/MSTest.Core/Internal/UtfHelper.cs b/src/TestFramework/MSTest.Core/Internal/UtfHelper.cs
index 78a4949f6f..8d5dec5cf3 100644
--- a/src/TestFramework/MSTest.Core/Internal/UtfHelper.cs
+++ b/src/TestFramework/MSTest.Core/Internal/UtfHelper.cs
@@ -7,7 +7,6 @@ namespace Microsoft.VisualStudio.TestTools.UnitTesting
     using System.Diagnostics;
     using System.Diagnostics.CodeAnalysis;
     using System.Globalization;
-    using System.Reflection;
     using System.Text;
 
     /// <summary>
diff --git a/test/ComponentTests/PlatformServices.Desktop.Component.Tests/DesktopTestSourceHostTests.cs b/test/ComponentTests/PlatformServices.Desktop.Component.Tests/DesktopTestSourceHostTests.cs
index 74291efdf1..88975f66ad 100644
--- a/test/ComponentTests/PlatformServices.Desktop.Component.Tests/DesktopTestSourceHostTests.cs
+++ b/test/ComponentTests/PlatformServices.Desktop.Component.Tests/DesktopTestSourceHostTests.cs
@@ -6,8 +6,6 @@ namespace PlatformServices.Desktop.ComponentTests
     extern alias FrameworkV1;
     extern alias FrameworkV2;
 
-    using System;
-    using System.Diagnostics;
     using System.IO;
     using System.Reflection;
     using System.Xml;
diff --git a/test/E2ETests/Automation.CLI/CLITestBase.cs b/test/E2ETests/Automation.CLI/CLITestBase.cs
index f2bef0c535..fedd165ab4 100644
--- a/test/E2ETests/Automation.CLI/CLITestBase.cs
+++ b/test/E2ETests/Automation.CLI/CLITestBase.cs
@@ -4,8 +4,6 @@
 namespace Microsoft.MSTestV2.CLIAutomation
 {
     using System;
-    using System.Collections.Generic;
-    using System.Configuration;
     using System.IO;
     using System.Linq;
     using System.Xml;
diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Discovery/AssemblyEnumeratorWrapperTests.cs b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Discovery/AssemblyEnumeratorWrapperTests.cs
index dae916291c..000062b9d4 100644
--- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Discovery/AssemblyEnumeratorWrapperTests.cs
+++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Discovery/AssemblyEnumeratorWrapperTests.cs
@@ -16,7 +16,6 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Discovery
     using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
     using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Discovery;
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.TestableImplementations;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
     using Moq;
     using Assert = FrameworkV1::Microsoft.VisualStudio.TestTools.UnitTesting.Assert;
     using CollectionAssert = FrameworkV1::Microsoft.VisualStudio.TestTools.UnitTesting.CollectionAssert;
diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Discovery/TypeEnumeratorTests.cs b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Discovery/TypeEnumeratorTests.cs
index 1ff92165bc..78e307c755 100644
--- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Discovery/TypeEnumeratorTests.cs
+++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Discovery/TypeEnumeratorTests.cs
@@ -11,7 +11,6 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Discovery
     using System.Linq;
     using System.Reflection;
     using System.Runtime.CompilerServices;
-    using global::MSTestAdapter.TestUtilities;
     using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
     using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Discovery;
     using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestMethodRunnerTests.cs b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestMethodRunnerTests.cs
index 749c6508bb..189d502867 100644
--- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestMethodRunnerTests.cs
+++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestMethodRunnerTests.cs
@@ -18,7 +18,6 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution
     using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
     using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
-    using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.ObjectModel;
     using Moq;
     using MSTest.TestAdapter;
     using TestableImplementations;
diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/UnitTestResultTest.cs b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/UnitTestResultTest.cs
index 515a8f25f9..a2453eb42a 100644
--- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/UnitTestResultTest.cs
+++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/UnitTestResultTest.cs
@@ -11,7 +11,6 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution
     using System.Linq;
     using System.Reflection;
     using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
-    using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution;
     using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using Assert = FrameworkV1::Microsoft.VisualStudio.TestTools.UnitTesting.Assert;
diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/MSTestExecutorTests.cs b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/MSTestExecutorTests.cs
index 177b8191a3..da1072c2dd 100644
--- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/MSTestExecutorTests.cs
+++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/MSTestExecutorTests.cs
@@ -9,11 +9,9 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests
     using System.Collections.Generic;
     using System.Linq;
     using System.Reflection;
-    using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using Moq;
     using MSTest.TestAdapter;
-    using MSTest.TestAdapter.ObjectModel;
     using TestPlatform.ObjectModel.Adapter;
     using Assert = FrameworkV1::Microsoft.VisualStudio.TestTools.UnitTesting.Assert;
     using TestClass = FrameworkV1::Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute;
diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/TestableImplementations/TestablePlatformServiceProvider.cs b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/TestableImplementations/TestablePlatformServiceProvider.cs
index 9d017dd603..720e4ebf9b 100644
--- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/TestableImplementations/TestablePlatformServiceProvider.cs
+++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/TestableImplementations/TestablePlatformServiceProvider.cs
@@ -3,7 +3,6 @@
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.TestableImplementations
 {
-    using System;
     using System.Collections.Generic;
     using System.IO;
     using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
diff --git a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopReflectionOperationsTests.cs b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopReflectionOperationsTests.cs
index d363b9138d..5766a049bf 100644
--- a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopReflectionOperationsTests.cs
+++ b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopReflectionOperationsTests.cs
@@ -6,7 +6,6 @@ namespace MSTestAdapter.PlatformServices.Desktop.UnitTests.Services
     extern alias FrameworkV1;
 
     using System;
-    using System.Collections.Generic;
     using System.Reflection;
 
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
diff --git a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopTestDeploymentTests.cs b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopTestDeploymentTests.cs
index 75f7fbadb2..8a6f4bea99 100644
--- a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopTestDeploymentTests.cs
+++ b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopTestDeploymentTests.cs
@@ -9,15 +9,12 @@ namespace MSTestAdapter.PlatformServices.Desktop.UnitTests.Services
 
     using System.Collections.Generic;
     using System.IO;
-    using System.Linq;
     using System.Reflection;
-    using System.Xml;
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment;
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Utilities;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
 
     using Moq;
     using MSTestAdapter.PlatformServices.Tests.Utilities;
diff --git a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopThreadOperationsTests.cs b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopThreadOperationsTests.cs
index d7d690f1b6..0e736fe564 100644
--- a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopThreadOperationsTests.cs
+++ b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Services/DesktopThreadOperationsTests.cs
@@ -6,12 +6,10 @@ namespace MSTestAdapter.PlatformServices.Desktop.UnitTests.Services
     extern alias FrameworkV1;
 
     using System;
-    using System.Diagnostics;
     using System.Reflection;
     using System.Threading;
 
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using MSTestAdapter.TestUtilities;
 
     using Assert = FrameworkV1::Microsoft.VisualStudio.TestTools.UnitTesting.Assert;
diff --git a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Utilities/AppDomainUtilitiesTests.cs b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Utilities/AppDomainUtilitiesTests.cs
index e2e99596fa..c9476f18a9 100644
--- a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Utilities/AppDomainUtilitiesTests.cs
+++ b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/Utilities/AppDomainUtilitiesTests.cs
@@ -6,7 +6,6 @@ namespace MSTestAdapter.PlatformServices.Desktop.UnitTests.Utilities
     extern alias FrameworkV1;
 
     using System;
-    using System.IO;
     using System.Xml;
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Utilities;
     using Assert = FrameworkV1::Microsoft.VisualStudio.TestTools.UnitTesting.Assert;
diff --git a/test/UnitTests/PlatformServices.NetCore.Unit.Tests/Utilities/NetCoreDeploymentUtilityTests.cs b/test/UnitTests/PlatformServices.NetCore.Unit.Tests/Utilities/NetCoreDeploymentUtilityTests.cs
index 36ab61f84c..1f4f9624e5 100644
--- a/test/UnitTests/PlatformServices.NetCore.Unit.Tests/Utilities/NetCoreDeploymentUtilityTests.cs
+++ b/test/UnitTests/PlatformServices.NetCore.Unit.Tests/Utilities/NetCoreDeploymentUtilityTests.cs
@@ -15,7 +15,6 @@ namespace MSTestAdapter.PlatformServices.Tests.Utilities
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
     using Moq;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using MSTestAdapter.PlatformServices.Tests.Utilities;
 
     [TestClass]
     public class NetCoreDeploymentUtilityTests
diff --git a/test/UnitTests/PlatformServices.Shared.Unit.Tests/netstandard1.0/Utilities/ns10DeploymentUtilityTests.cs b/test/UnitTests/PlatformServices.Shared.Unit.Tests/netstandard1.0/Utilities/ns10DeploymentUtilityTests.cs
index 8fc03c6c40..1bb7e23fac 100644
--- a/test/UnitTests/PlatformServices.Shared.Unit.Tests/netstandard1.0/Utilities/ns10DeploymentUtilityTests.cs
+++ b/test/UnitTests/PlatformServices.Shared.Unit.Tests/netstandard1.0/Utilities/ns10DeploymentUtilityTests.cs
@@ -18,13 +18,9 @@ namespace MSTestAdapter.PlatformServices.Tests.Utilities
     using System;
     using System.Collections.Generic;
     using System.IO;
-    using System.Reflection;
-    using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment;
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Utilities;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
     using Moq;
 
     [TestClass]
diff --git a/test/UnitTests/PlatformServices.Shared.Unit.Tests/netstandard1.0/ns10DiaSessionOperationsTests.cs b/test/UnitTests/PlatformServices.Shared.Unit.Tests/netstandard1.0/ns10DiaSessionOperationsTests.cs
index 1721f73a10..82171ed0b4 100644
--- a/test/UnitTests/PlatformServices.Shared.Unit.Tests/netstandard1.0/ns10DiaSessionOperationsTests.cs
+++ b/test/UnitTests/PlatformServices.Shared.Unit.Tests/netstandard1.0/ns10DiaSessionOperationsTests.cs
@@ -15,10 +15,8 @@ namespace MSTestAdapter.PlatformServices.Tests.Services
 #endif
 
     using System;
-    using System.IO;
     using System.Reflection;
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
-    using MSTestAdapter.TestUtilities;
 #pragma warning disable SA1649 // SA1649FileNameMustMatchTypeName
 
     [TestClass]
diff --git a/test/UnitTests/PlatformServices.Universal.Unit.Tests/Services/UniversalFileOperationsTests.cs b/test/UnitTests/PlatformServices.Universal.Unit.Tests/Services/UniversalFileOperationsTests.cs
index bb6a16525c..33c19a64d9 100644
--- a/test/UnitTests/PlatformServices.Universal.Unit.Tests/Services/UniversalFileOperationsTests.cs
+++ b/test/UnitTests/PlatformServices.Universal.Unit.Tests/Services/UniversalFileOperationsTests.cs
@@ -10,7 +10,6 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.UWP
     using System.Reflection;
     using FrameworkV1::Microsoft.VisualStudio.TestTools.UnitTesting;
     using global::MSTestAdapter.TestUtilities;
-    using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
 
     /// <summary>
     /// The universal file operations tests.
diff --git a/test/UnitTests/PlatformServices.Universal.Unit.Tests/Services/UniversalTestSourceTests.cs b/test/UnitTests/PlatformServices.Universal.Unit.Tests/Services/UniversalTestSourceTests.cs
index 3a063078f8..7961116b2b 100644
--- a/test/UnitTests/PlatformServices.Universal.Unit.Tests/Services/UniversalTestSourceTests.cs
+++ b/test/UnitTests/PlatformServices.Universal.Unit.Tests/Services/UniversalTestSourceTests.cs
@@ -8,7 +8,6 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.UWP
     using System.Linq;
     using System.Reflection;
     using FrameworkV1::Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
 
     /// <summary>
     /// The universal test source validator tests.