diff --git a/NuGet.config b/NuGet.config
index 53695a466cc..d3528829f24 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,8 +4,6 @@
-
-
diff --git a/eng/Versions.props b/eng/Versions.props
index 0b24beb7cbb..272f5cace2c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -68,6 +68,8 @@
+ 3.3.2
+ 4.0.0-1.final
3.3.0-beta1.final
diff --git a/global.json b/global.json
index b4f3bd0ff75..80d450fee1e 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "6.0.100-preview.6.21317.3",
+ "dotnet": "6.0.100-rc.1.21368.3",
"runtimes": {
"dotnet/x64": [
"$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"
@@ -11,7 +11,7 @@
}
},
"sdk": {
- "version": "6.0.100-preview.6.21317.3"
+ "version": "6.0.100-rc.1.21368.3"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21366.1",
diff --git a/src/Common/tests/TestUtilities/CommonTestHelper.cs b/src/Common/tests/TestUtilities/CommonTestHelper.cs
index ffecc037857..0fee5136ce8 100644
--- a/src/Common/tests/TestUtilities/CommonTestHelper.cs
+++ b/src/Common/tests/TestUtilities/CommonTestHelper.cs
@@ -2,10 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel.Design.Serialization;
using System.Drawing;
-using System.Linq;
using Xunit;
namespace System.Windows.Forms.TestUtilities
diff --git a/src/Common/tests/TestUtilities/ReflectionHelper.cs b/src/Common/tests/TestUtilities/ReflectionHelper.cs
index ccc7520154c..4c2ac4a17c4 100644
--- a/src/Common/tests/TestUtilities/ReflectionHelper.cs
+++ b/src/Common/tests/TestUtilities/ReflectionHelper.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
-using System.Linq;
using System.Reflection;
using Xunit;
diff --git a/src/Common/tests/TestUtilities/TestAccessor.cs b/src/Common/tests/TestUtilities/TestAccessor.cs
index b3dd2477bea..f70f33efcf8 100644
--- a/src/Common/tests/TestUtilities/TestAccessor.cs
+++ b/src/Common/tests/TestUtilities/TestAccessor.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Dynamic;
-using System.Linq;
using System.Reflection;
namespace System
diff --git a/src/Microsoft.VisualBasic/tests/IntegrationTests/Microsoft.VisualBasic.IntegrationTests/InteractionTests.cs b/src/Microsoft.VisualBasic/tests/IntegrationTests/Microsoft.VisualBasic.IntegrationTests/InteractionTests.cs
index 81f3563a541..4b37375d5e2 100644
--- a/src/Microsoft.VisualBasic/tests/IntegrationTests/Microsoft.VisualBasic.IntegrationTests/InteractionTests.cs
+++ b/src/Microsoft.VisualBasic/tests/IntegrationTests/Microsoft.VisualBasic.IntegrationTests/InteractionTests.cs
@@ -2,9 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Diagnostics;
-using System.IO;
using System.Windows.Forms.IntegrationTests.Common;
using Xunit;
diff --git a/src/Microsoft.VisualBasic/tests/IntegrationTests/Microsoft.VisualBasic.IntegrationTests/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBaseTests.cs b/src/Microsoft.VisualBasic/tests/IntegrationTests/Microsoft.VisualBasic.IntegrationTests/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBaseTests.cs
index c475321aff6..5ecf97156d4 100644
--- a/src/Microsoft.VisualBasic/tests/IntegrationTests/Microsoft.VisualBasic.IntegrationTests/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBaseTests.cs
+++ b/src/Microsoft.VisualBasic/tests/IntegrationTests/Microsoft.VisualBasic.IntegrationTests/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBaseTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Diagnostics;
using System.Windows.Forms.IntegrationTests.Common;
using Microsoft.VisualBasic.ApplicationServices;
diff --git a/src/Microsoft.VisualBasic/tests/IntegrationTests/VisualBasicRuntimeTest/Program.cs b/src/Microsoft.VisualBasic/tests/IntegrationTests/VisualBasicRuntimeTest/Program.cs
index 789b3079ab7..48133d8cb65 100644
--- a/src/Microsoft.VisualBasic/tests/IntegrationTests/VisualBasicRuntimeTest/Program.cs
+++ b/src/Microsoft.VisualBasic/tests/IntegrationTests/VisualBasicRuntimeTest/Program.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Reflection;
using System.Resources;
diff --git a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/ApplicationBaseTests.cs b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/ApplicationBaseTests.cs
index e256fe5f0ba..5585625fafd 100644
--- a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/ApplicationBaseTests.cs
+++ b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/ApplicationBaseTests.cs
@@ -2,9 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-using System.Collections.Generic;
-using System.Linq;
using Xunit;
namespace Microsoft.VisualBasic.ApplicationServices.Tests
diff --git a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/AssemblyInfoTests.cs b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/AssemblyInfoTests.cs
index daa0c266db4..14547da0f2b 100644
--- a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/AssemblyInfoTests.cs
+++ b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/AssemblyInfoTests.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-using System.Collections.Generic;
using System.Reflection;
using Xunit;
diff --git a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/ConsoleApplicationBaseTests.cs b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/ConsoleApplicationBaseTests.cs
index 5b6f6546e82..127cc44b6fe 100644
--- a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/ConsoleApplicationBaseTests.cs
+++ b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/ConsoleApplicationBaseTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Linq;
using Xunit;
namespace Microsoft.VisualBasic.ApplicationServices.Tests
diff --git a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/SingleInstanceTests.cs b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/SingleInstanceTests.cs
index 3ca25fbbad6..2dda3a3d344 100644
--- a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/SingleInstanceTests.cs
+++ b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/SingleInstanceTests.cs
@@ -2,15 +2,10 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-using System.Collections.Generic;
using System.Collections.Immutable;
using System.IO.Pipes;
-using System.Linq;
using System.Runtime.Serialization;
using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
using Xunit;
namespace Microsoft.VisualBasic.ApplicationServices.Tests
diff --git a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/StartupEventArgsTests.cs b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/StartupEventArgsTests.cs
index d99236eeb3a..d8cf009e581 100644
--- a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/StartupEventArgsTests.cs
+++ b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/StartupEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Collections.ObjectModel;
using Xunit;
diff --git a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/StartupNextInstanceEventArgsTests.cs b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/StartupNextInstanceEventArgsTests.cs
index 3f9bf910046..01a2cb47d0e 100644
--- a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/StartupNextInstanceEventArgsTests.cs
+++ b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/StartupNextInstanceEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Collections.ObjectModel;
using Xunit;
diff --git a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/UnhandledExceptionEventArgsTests.cs b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/UnhandledExceptionEventArgsTests.cs
index cf05e9751b7..7830d9eda09 100644
--- a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/UnhandledExceptionEventArgsTests.cs
+++ b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/UnhandledExceptionEventArgsTests.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-using System.Collections.Generic;
using Xunit;
namespace Microsoft.VisualBasic.ApplicationServices.Tests
diff --git a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBaseTests.cs b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBaseTests.cs
index f008acf4b41..ab0dfdeb8d3 100644
--- a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBaseTests.cs
+++ b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/ApplicationServices/WindowsFormsApplicationBaseTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Reflection;
using System.Reflection.Emit;
using System.Runtime.InteropServices;
diff --git a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/Devices/AudioTests.cs b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/Devices/AudioTests.cs
index b25ac6cdc6f..62a3005aa91 100644
--- a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/Devices/AudioTests.cs
+++ b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/Devices/AudioTests.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-using System.IO;
using Xunit;
namespace Microsoft.VisualBasic.Devices.Tests
diff --git a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/Devices/ClockTests.cs b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/Devices/ClockTests.cs
index 300dc674a3f..cb9ef59b8d3 100644
--- a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/Devices/ClockTests.cs
+++ b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/Devices/ClockTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using Xunit;
namespace Microsoft.VisualBasic.Devices.Tests
diff --git a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/Devices/ComputerInfoTests.cs b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/Devices/ComputerInfoTests.cs
index 2d0ee9649db..0a83f4d1a54 100644
--- a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/Devices/ComputerInfoTests.cs
+++ b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/Devices/ComputerInfoTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using Xunit;
namespace Microsoft.VisualBasic.Devices.Tests
diff --git a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/Devices/MouseTests.cs b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/Devices/MouseTests.cs
index e5175390faa..6b784f0f79f 100644
--- a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/Devices/MouseTests.cs
+++ b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/Devices/MouseTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Windows.Forms;
using Xunit;
diff --git a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/ClipboardProxyTests.cs b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/ClipboardProxyTests.cs
index 45cfa92628a..90263da563d 100644
--- a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/ClipboardProxyTests.cs
+++ b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/ClipboardProxyTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using Microsoft.VisualBasic.Devices;
using Xunit;
diff --git a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/FileCleanupTestBase.cs b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/FileCleanupTestBase.cs
index 259b8e46082..cef04e3e0f8 100644
--- a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/FileCleanupTestBase.cs
+++ b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/FileCleanupTestBase.cs
@@ -2,9 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-using System.IO;
-
namespace Microsoft.VisualBasic.Tests
{
public abstract class FileCleanupTestBase : IDisposable
diff --git a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/FileSystemProxyTests.cs b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/FileSystemProxyTests.cs
index 7f8a9b2c7b4..75eece654a4 100644
--- a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/FileSystemProxyTests.cs
+++ b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/FileSystemProxyTests.cs
@@ -2,10 +2,9 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-using System.Collections.Generic;
using Microsoft.VisualBasic.FileIO;
using Xunit;
+using SearchOption = Microsoft.VisualBasic.FileIO.SearchOption;
namespace Microsoft.VisualBasic.MyServices.Tests
{
diff --git a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/Internal/ContextValueTests.cs b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/Internal/ContextValueTests.cs
index 946d7b2b3bc..c8e078799aa 100644
--- a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/Internal/ContextValueTests.cs
+++ b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/Internal/ContextValueTests.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-using System.Threading;
using Xunit;
namespace Microsoft.VisualBasic.MyServices.Internal.Tests
diff --git a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/RegistryProxyTests.cs b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/RegistryProxyTests.cs
index 3d6b25bb35f..f6592816340 100644
--- a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/RegistryProxyTests.cs
+++ b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/RegistryProxyTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using Microsoft.VisualBasic.Devices;
using Xunit;
diff --git a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/SpecialDirectoriesProxyTests.cs b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/SpecialDirectoriesProxyTests.cs
index 10f42d38663..80a7fbbfc24 100644
--- a/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/SpecialDirectoriesProxyTests.cs
+++ b/src/Microsoft.VisualBasic/tests/UnitTests/Microsoft/VisualBasic/MyServices/SpecialDirectoriesProxyTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using Microsoft.VisualBasic.Devices;
using Xunit;
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/BinaryEditor.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/BinaryEditor.cs
index bf6b140ba2e..046e50473c3 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/BinaryEditor.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/BinaryEditor.cs
@@ -5,7 +5,6 @@
using System.Diagnostics;
using System.Drawing;
using System.Drawing.Design;
-using System.IO;
using System.Text;
using System.Windows.Forms;
using System.Windows.Forms.Design;
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/ByteViewer.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/ByteViewer.cs
index a6f6ba79bab..ce3dea5babd 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/ByteViewer.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/ByteViewer.cs
@@ -4,7 +4,6 @@
using System.Drawing;
using System.Globalization;
-using System.IO;
using System.Text;
using System.Windows.Forms;
using static Interop;
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/ComponentDesigner.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/ComponentDesigner.cs
index 236c53167e6..6f42949839a 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/ComponentDesigner.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/ComponentDesigner.cs
@@ -6,7 +6,6 @@
using System.Configuration;
using System.Diagnostics;
using System.Globalization;
-using System.Linq;
using System.Windows.Forms.Design;
namespace System.ComponentModel.Design
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionList.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionList.cs
index f7a63653546..7c86054a579 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionList.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionList.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Reflection;
namespace System.ComponentModel.Design
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.CheckBoxPropertyLine.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.CheckBoxPropertyLine.cs
index f94e6cb49a1..db06092e66d 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.CheckBoxPropertyLine.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.CheckBoxPropertyLine.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.EditorPropertyLine.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.EditorPropertyLine.cs
index 38f54ff1fb8..2245bb59dee 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.EditorPropertyLine.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.EditorPropertyLine.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Design;
using System.Drawing.Imaging;
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.Line.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.Line.cs
index e870e702e24..6b3669c7f52 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.Line.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.Line.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.MethodLine.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.MethodLine.cs
index bc0d0342951..ecbdda8f74d 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.MethodLine.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.MethodLine.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Reflection;
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.PanelHeaderLine.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.PanelHeaderLine.cs
index 99eb8a6e10b..4039a39d4c5 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.PanelHeaderLine.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.PanelHeaderLine.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.SeparatorLine.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.SeparatorLine.cs
index b2160d2d32f..89bc834b1e2 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.SeparatorLine.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.SeparatorLine.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.TextBoxPropertyLine.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.TextBoxPropertyLine.cs
index 7175c97ae07..ecf0d72ea3b 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.TextBoxPropertyLine.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.TextBoxPropertyLine.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.TextLine.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.TextLine.cs
index f0c3c9021a6..aeebd7a2a6c 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.TextLine.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.TextLine.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.cs
index 3de1b36da35..d54688168cf 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.Collections.Specialized;
using System.Diagnostics;
using System.Drawing;
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/EventBindingService.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/EventBindingService.cs
index f70955d5d4d..18254d8c33b 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/EventBindingService.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/EventBindingService.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.Diagnostics;
using System.Reflection;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/MenuCommandService.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/MenuCommandService.cs
index 5307b605e35..062b5b114cc 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/MenuCommandService.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/MenuCommandService.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomComponentSerializationService.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomComponentSerializationService.cs
index cf9bc5248f8..bc4a106d347 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomComponentSerializationService.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomComponentSerializationService.cs
@@ -4,10 +4,8 @@
using System.CodeDom;
using System.Collections;
-using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
-using System.IO;
using System.Reflection;
using System.Resources;
using System.Runtime.Serialization;
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomDesignerLoader.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomDesignerLoader.cs
index b6e8ce92c5e..8b6b6126f8d 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomDesignerLoader.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomDesignerLoader.cs
@@ -9,7 +9,6 @@
using System.Diagnostics;
using System.Globalization;
#if DEBUG
-using System.IO;
#endif
using System.Reflection;
using System.Text;
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomSerializerBase.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomSerializerBase.cs
index 87430c7e28c..50ade74fa78 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomSerializerBase.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CodeDomSerializerBase.cs
@@ -4,7 +4,6 @@
using System.CodeDom;
using System.Collections;
-using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.Reflection;
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CollectionCodeDomSerializer.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CollectionCodeDomSerializer.cs
index bbe234515be..7a4b8263ec2 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CollectionCodeDomSerializer.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/CollectionCodeDomSerializer.cs
@@ -4,7 +4,6 @@
using System.CodeDom;
using System.Collections;
-using System.Collections.Generic;
using System.Collections.Specialized;
using System.Diagnostics;
using System.Globalization;
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/ComponentCache.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/ComponentCache.cs
index 839a109f4bd..3f3d54c31f5 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/ComponentCache.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/ComponentCache.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.CodeDom;
-using System.Collections.Generic;
namespace System.ComponentModel.Design.Serialization
{
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/ResourceCodeDomSerializer.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/ResourceCodeDomSerializer.cs
index db29516df01..6f32a7621fc 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/ResourceCodeDomSerializer.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/ResourceCodeDomSerializer.cs
@@ -6,7 +6,6 @@
using System.Collections;
using System.Diagnostics;
using System.Globalization;
-using System.IO;
using System.Resources;
using System.Runtime.Serialization;
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/StatementContext.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/StatementContext.cs
index 931a1f6895e..72927582e9c 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/StatementContext.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/StatementContext.cs
@@ -4,7 +4,6 @@
using System.CodeDom;
using System.Collections;
-using System.Collections.Generic;
namespace System.ComponentModel.Design.Serialization
{
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/TypeCodeDomSerializer.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/TypeCodeDomSerializer.cs
index 214269e8c4e..bfdcfaa5ec4 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/TypeCodeDomSerializer.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/TypeCodeDomSerializer.cs
@@ -5,7 +5,6 @@
using System.CodeDom;
using System.CodeDom.Compiler;
using System.Collections;
-using System.Collections.Generic;
using System.Collections.Specialized;
using System.Diagnostics;
diff --git a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/UndoEngine.cs b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/UndoEngine.cs
index 170cd137c49..e7213bbb9ff 100644
--- a/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/UndoEngine.cs
+++ b/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/UndoEngine.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel.Design.Serialization;
using System.Diagnostics;
using System.Globalization;
diff --git a/src/System.Windows.Forms.Design/src/System/Drawing/BitmapSelector.cs b/src/System.Windows.Forms.Design/src/System/Drawing/BitmapSelector.cs
index ca06a386651..e82345e08da 100644
--- a/src/System.Windows.Forms.Design/src/System/Drawing/BitmapSelector.cs
+++ b/src/System.Windows.Forms.Design/src/System/Drawing/BitmapSelector.cs
@@ -4,7 +4,6 @@
using System.Configuration;
using System.Drawing.Configuration;
-using System.IO;
using System.Reflection;
namespace System.Drawing
diff --git a/src/System.Windows.Forms.Design/src/System/Drawing/Design/BitmapEditor.cs b/src/System.Windows.Forms.Design/src/System/Drawing/Design/BitmapEditor.cs
index 459a5d05aa3..95dc216ace6 100644
--- a/src/System.Windows.Forms.Design/src/System/Drawing/Design/BitmapEditor.cs
+++ b/src/System.Windows.Forms.Design/src/System/Drawing/Design/BitmapEditor.cs
@@ -2,9 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
-using System.IO;
-
namespace System.Drawing.Design
{
///
diff --git a/src/System.Windows.Forms.Design/src/System/Drawing/Design/ColorEditor.cs b/src/System.Windows.Forms.Design/src/System/Drawing/Design/ColorEditor.cs
index 58a122c8f1c..982dc2f9faf 100644
--- a/src/System.Windows.Forms.Design/src/System/Drawing/Design/ColorEditor.cs
+++ b/src/System.Windows.Forms.Design/src/System/Drawing/Design/ColorEditor.cs
@@ -6,7 +6,6 @@
using System.ComponentModel;
using System.Diagnostics;
using System.Globalization;
-using System.IO;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms.Design/src/System/Drawing/Design/IconEditor.cs b/src/System.Windows.Forms.Design/src/System/Drawing/Design/IconEditor.cs
index 4c8b38808ed..590473b6e1e 100644
--- a/src/System.Windows.Forms.Design/src/System/Drawing/Design/IconEditor.cs
+++ b/src/System.Windows.Forms.Design/src/System/Drawing/Design/IconEditor.cs
@@ -2,10 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
-using System.IO;
using System.Runtime.InteropServices;
using System.Windows.Forms;
using System.Windows.Forms.Design;
diff --git a/src/System.Windows.Forms.Design/src/System/Drawing/Design/ImageEditor.cs b/src/System.Windows.Forms.Design/src/System/Drawing/Design/ImageEditor.cs
index 50de3c2d4a0..7128ab4a1f2 100644
--- a/src/System.Windows.Forms.Design/src/System/Drawing/Design/ImageEditor.cs
+++ b/src/System.Windows.Forms.Design/src/System/Drawing/Design/ImageEditor.cs
@@ -4,7 +4,6 @@
using System.Collections;
using System.ComponentModel;
-using System.IO;
using System.Reflection;
using System.Text;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms.Design/src/System/Drawing/Design/MetafileEditor.cs b/src/System.Windows.Forms.Design/src/System/Drawing/Design/MetafileEditor.cs
index ec9df27d2b8..387e1fa359f 100644
--- a/src/System.Windows.Forms.Design/src/System/Drawing/Design/MetafileEditor.cs
+++ b/src/System.Windows.Forms.Design/src/System/Drawing/Design/MetafileEditor.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Drawing.Imaging;
-using System.IO;
namespace System.Drawing.Design
{
diff --git a/src/System.Windows.Forms.Design/src/System/Drawing/Design/ToolboxItem.cs b/src/System.Windows.Forms.Design/src/System/Drawing/Design/ToolboxItem.cs
index 267ac10e1eb..24823636be4 100644
--- a/src/System.Windows.Forms.Design/src/System/Drawing/Design/ToolboxItem.cs
+++ b/src/System.Windows.Forms.Design/src/System/Drawing/Design/ToolboxItem.cs
@@ -3,11 +3,9 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design;
using System.Diagnostics;
-using System.IO;
using System.Reflection;
using System.Runtime.Serialization;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/Behavior/BehaviorService.AdornerWindow.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/Behavior/BehaviorService.AdornerWindow.cs
index e15c44c31b0..2b66958d7ea 100644
--- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/Behavior/BehaviorService.AdornerWindow.cs
+++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/Behavior/BehaviorService.AdornerWindow.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using static Interop;
diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/Behavior/BehaviorService.MenuCommandHandler.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/Behavior/BehaviorService.MenuCommandHandler.cs
index 06edbde41b0..b42b1cbbd9a 100644
--- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/Behavior/BehaviorService.MenuCommandHandler.cs
+++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/Behavior/BehaviorService.MenuCommandHandler.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel.Design;
namespace System.Windows.Forms.Design.Behavior
diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/Behavior/DesignerActionBehavior.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/Behavior/DesignerActionBehavior.cs
index 6f906e506ce..36e0e563a8f 100644
--- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/Behavior/DesignerActionBehavior.cs
+++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/Behavior/DesignerActionBehavior.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design;
using System.Diagnostics;
diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/CommandSet.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/CommandSet.cs
index 50c5e735092..62727f360b4 100644
--- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/CommandSet.cs
+++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/CommandSet.cs
@@ -5,7 +5,6 @@
using System.Runtime.Serialization.Formatters.Binary;
using System.ComponentModel;
using System.Diagnostics;
-using System.IO;
using System.ComponentModel.Design;
using System.ComponentModel.Design.Serialization;
using System.Windows.Forms.Design.Behavior;
diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ComponentTray.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ComponentTray.cs
index 95234bbbb68..ba956938a45 100644
--- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ComponentTray.cs
+++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ComponentTray.cs
@@ -10,7 +10,6 @@
using System.Drawing;
using System.Drawing.Design;
using System.Drawing.Drawing2D;
-using System.IO;
using System.Runtime.InteropServices;
using System.Windows.Forms.Design.Behavior;
using Microsoft.Win32;
diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ContextMenuStripGroup.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ContextMenuStripGroup.cs
index 64a57dbeabd..d095f866562 100644
--- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ContextMenuStripGroup.cs
+++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ContextMenuStripGroup.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
-
namespace System.Windows.Forms.Design
{
internal class ContextMenuStripGroup
diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ControlDesigner.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ControlDesigner.cs
index 0b60b2d4f1b..0b5fa889563 100644
--- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ControlDesigner.cs
+++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ControlDesigner.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design;
using System.ComponentModel.Design.Serialization;
diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/DocumentDesigner.AxToolboxItem.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/DocumentDesigner.AxToolboxItem.cs
index 57858fecba2..921cb2807a1 100644
--- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/DocumentDesigner.AxToolboxItem.cs
+++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/DocumentDesigner.AxToolboxItem.cs
@@ -7,7 +7,6 @@
using System.Diagnostics;
using System.Drawing.Design;
using System.Globalization;
-using System.IO;
using System.Reflection;
using System.Runtime.InteropServices.ComTypes;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/DocumentDesigner.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/DocumentDesigner.cs
index ef16701453e..a464b3b05cd 100644
--- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/DocumentDesigner.cs
+++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/DocumentDesigner.cs
@@ -9,7 +9,6 @@
using System.Diagnostics;
using System.Drawing;
using System.Drawing.Design;
-using System.IO;
using System.Runtime.InteropServices;
using System.Windows.Forms.Design.Behavior;
using Microsoft.Win32;
diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/EventHandlerService.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/EventHandlerService.cs
index fd24553abb0..648efeb64df 100644
--- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/EventHandlerService.cs
+++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/EventHandlerService.cs
@@ -2,9 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Diagnostics;
-using System.Linq;
namespace System.Windows.Forms.Design
{
diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/GroupedContextMenuStrip.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/GroupedContextMenuStrip.cs
index 8a5ea92696c..e8c5c84e0e2 100644
--- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/GroupedContextMenuStrip.cs
+++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/GroupedContextMenuStrip.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ImageListImage.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ImageListImage.cs
index 20d431eb4e2..633e5591a0e 100644
--- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ImageListImage.cs
+++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ImageListImage.cs
@@ -6,7 +6,6 @@
using System.Drawing;
using System.Drawing.Design;
using System.Drawing.Imaging;
-using System.IO;
namespace System.Windows.Forms.Design
{
diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ImageListImageEditor.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ImageListImageEditor.cs
index 1360ad7f9c4..72eb5c87f50 100644
--- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ImageListImageEditor.cs
+++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ImageListImageEditor.cs
@@ -5,7 +5,6 @@
using System.Collections;
using System.ComponentModel;
using System.Drawing.Design;
-using System.IO;
using System.Reflection;
using static Interop;
diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/MaskDescriptor.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/MaskDescriptor.cs
index a98a203dae2..1dad049aa94 100644
--- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/MaskDescriptor.cs
+++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/MaskDescriptor.cs
@@ -4,7 +4,6 @@
using System.ComponentModel;
using System.Globalization;
-using System.Threading;
namespace System.Windows.Forms.Design
{
diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/MaskDescriptorComparer.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/MaskDescriptorComparer.cs
index fe6e5abf680..fdf567bebe6 100644
--- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/MaskDescriptorComparer.cs
+++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/MaskDescriptorComparer.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Diagnostics;
namespace System.Windows.Forms.Design
diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/MaskDescriptorTemplate.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/MaskDescriptorTemplate.cs
index 7c81324fc68..3427aeedbd6 100644
--- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/MaskDescriptorTemplate.cs
+++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/MaskDescriptorTemplate.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Globalization;
namespace System.Windows.Forms.Design
diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/MaskDesignerDialog.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/MaskDesignerDialog.cs
index c802416c859..33971cfab56 100644
--- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/MaskDesignerDialog.cs
+++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/MaskDesignerDialog.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design;
using System.Diagnostics;
diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/OleDragDropHandler.ComponentDataObject.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/OleDragDropHandler.ComponentDataObject.cs
index e173217e08c..9c53f35814b 100644
--- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/OleDragDropHandler.ComponentDataObject.cs
+++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/OleDragDropHandler.ComponentDataObject.cs
@@ -7,7 +7,6 @@
using System.ComponentModel.Design;
using System.ComponentModel;
using System.Diagnostics;
-using System.IO;
using System.Runtime.Serialization.Formatters.Binary;
namespace System.Windows.Forms.Design
diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripDesignerUtils.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripDesignerUtils.cs
index 876ac712361..2c014081152 100644
--- a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripDesignerUtils.cs
+++ b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/ToolStripDesignerUtils.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design;
using System.Diagnostics;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/CodeDomHelpers.cs b/src/System.Windows.Forms.Design/tests/UnitTests/CodeDomHelpers.cs
index d70f335f3e9..45986cc9205 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/CodeDomHelpers.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/CodeDomHelpers.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.CodeDom;
-using System.Linq;
using Xunit;
namespace System.Windows.Forms.TestUtilities
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/EnsureDesignerTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/EnsureDesignerTests.cs
index dd9534976be..b49097b0097 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/EnsureDesignerTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/EnsureDesignerTests.cs
@@ -2,9 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel.Design;
-using System.Linq;
using Xunit;
namespace System.Windows.Forms.Design.Editors.Tests
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/EnsureEditorsTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/EnsureEditorsTests.cs
index 1bbe868cb94..0f16aa674ac 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/EnsureEditorsTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/EnsureEditorsTests.cs
@@ -3,14 +3,11 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design;
using System.Drawing;
using System.Drawing.Design;
using System.Drawing.Imaging;
-using System.IO;
-using System.Linq;
using System.Reflection;
using Xunit;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/SerializableAttributeTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/SerializableAttributeTests.cs
index 8ad632accf3..3d9b8fa138a 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/SerializableAttributeTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/SerializableAttributeTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Design.Tests.Serialization
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/ArrayEditorTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/ArrayEditorTests.cs
index 707d3768364..7c1884fd22a 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/ArrayEditorTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/ArrayEditorTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.Drawing.Design;
using System.Reflection;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/ByteViewerTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/ByteViewerTests.cs
index de3c902266f..b32f164d8aa 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/ByteViewerTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/ByteViewerTests.cs
@@ -2,10 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
-using System.IO;
-using System.Linq;
using System.Windows.Forms;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/CollectionEditorTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/CollectionEditorTests.cs
index 428c37d68a5..c343d319031 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/CollectionEditorTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/CollectionEditorTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.Drawing.Design;
using System.Reflection;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/CollectionFormTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/CollectionFormTests.cs
index 5dd63b5ac81..cb3d8eb9aa1 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/CollectionFormTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/CollectionFormTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Windows.Forms;
using System.Windows.Forms.Design;
using Moq;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/ComponentDesignerTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/ComponentDesignerTests.cs
index 5ba51425107..e1d6198e74f 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/ComponentDesignerTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/ComponentDesignerTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.Configuration;
using Moq;
using Moq.Protected;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignSurfaceTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignSurfaceTests.cs
index 8cbdd06672a..87eb547d109 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignSurfaceTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignSurfaceTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel.Design.Serialization;
using System.Reflection;
using System.Windows.Forms.Design;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionItemCollectionTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionItemCollectionTests.cs
index 171082f165c..5f895eb7937 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionItemCollectionTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionItemCollectionTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Linq;
using Xunit;
namespace System.ComponentModel.Design.Tests
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionListCollectionTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionListCollectionTests.cs
index 87d81290541..7d9be85fbdc 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionListCollectionTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionListCollectionTests.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
-using System.Linq;
using Xunit;
namespace System.ComponentModel.Design.Tests
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionListTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionListTests.cs
index 37c67ca8889..5095179e2a5 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionListTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionListTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Runtime.CompilerServices;
using Moq;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionListsChangedEventArgsTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionListsChangedEventArgsTests.cs
index 93883d99c4a..4e073a6e09e 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionListsChangedEventArgsTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionListsChangedEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.ComponentModel.Design.Tests
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionMethodItemTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionMethodItemTests.cs
index 80362ec08ec..367490c633a 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionMethodItemTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionMethodItemTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Collections.Specialized;
using System.Reflection;
using Xunit;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionPropertyItemTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionPropertyItemTests.cs
index f10d9dcd36a..e6c2a9652ab 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionPropertyItemTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionPropertyItemTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Collections.Specialized;
using Xunit;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionServiceTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionServiceTests.cs
index 297796f76c2..556594c561f 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionServiceTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionServiceTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.Collections.Specialized;
using System.Windows.Forms.Design;
using Moq;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionUIStateChangeEventArgsTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionUIStateChangeEventArgsTests.cs
index b02aa4cd90c..0a2fb3dbe1b 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionUIStateChangeEventArgsTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerActionUIStateChangeEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.ComponentModel.Design.Tests
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerHostTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerHostTests.cs
index 4de67f4bc2f..7f3ffd3301b 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerHostTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/DesignerHostTests.cs
@@ -3,9 +3,7 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel.Design.Serialization;
-using System.Linq;
using System.Reflection;
using Moq;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/ExceptionCollectionTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/ExceptionCollectionTests.cs
index 927f277ee27..9fd50ae6f60 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/ExceptionCollectionTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/ExceptionCollectionTests.cs
@@ -3,8 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
-using System.IO;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
using Xunit;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/LoadedEventArgsTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/LoadedEventArgsTests.cs
index a5c4cea3d6f..f739cd46ae4 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/LoadedEventArgsTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/LoadedEventArgsTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using Xunit;
namespace System.ComponentModel.Design.Tests
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/MultilineStringEditorTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/MultilineStringEditorTests.cs
index 4605fade8ef..b7ccd936a8f 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/MultilineStringEditorTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/MultilineStringEditorTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing.Design;
using System.Windows.Forms;
using System.Windows.Forms.Design;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/ObjectSelectorEditorTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/ObjectSelectorEditorTests.cs
index 71215bf27af..5f56bcdc761 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/ObjectSelectorEditorTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/ObjectSelectorEditorTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing.Design;
using System.Windows.Forms;
using System.Windows.Forms.Design;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/Serialization/CodeDomComponentSerializationServiceTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/Serialization/CodeDomComponentSerializationServiceTests.cs
index e115614292b..423bec01b90 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/Serialization/CodeDomComponentSerializationServiceTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/Serialization/CodeDomComponentSerializationServiceTests.cs
@@ -4,8 +4,6 @@
using System.CodeDom;
using System.Collections;
-using System.Collections.Generic;
-using System.IO;
using System.Reflection;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/Serialization/CodeDomSerializerExceptionTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/Serialization/CodeDomSerializerExceptionTests.cs
index 421022e70f3..953bf820889 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/Serialization/CodeDomSerializerExceptionTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/Serialization/CodeDomSerializerExceptionTests.cs
@@ -3,9 +3,7 @@
// See the LICENSE file in the project root for more information.
using System.CodeDom;
-using System.Collections.Generic;
using System.ComponentModel.Design.Serialization;
-using System.IO;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
using Moq;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/Serialization/DesignerSerializationManagerTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/Serialization/DesignerSerializationManagerTests.cs
index b9b79705c6e..39617339548 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/Serialization/DesignerSerializationManagerTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/Serialization/DesignerSerializationManagerTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using Moq;
using Moq.Protected;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/Serialization/ExpressionContextTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/Serialization/ExpressionContextTests.cs
index 89f6f3d212a..43a2f586720 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/Serialization/ExpressionContextTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/Serialization/ExpressionContextTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.CodeDom;
-using System.Collections.Generic;
using Xunit;
namespace System.ComponentModel.Design.Serialization.Tests
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/Serialization/SerializeAbsoluteContextTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/Serialization/SerializeAbsoluteContextTests.cs
index 64e133f9ea7..09138e77669 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/Serialization/SerializeAbsoluteContextTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/Serialization/SerializeAbsoluteContextTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.ComponentModel.Design.Serialization.Tests
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/SiteNestedContainerTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/SiteNestedContainerTests.cs
index 6d9b0d0cbea..69f67c41440 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/SiteNestedContainerTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/ComponentModel/Design/SiteNestedContainerTests.cs
@@ -2,9 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel.Design.Serialization;
-using System.Linq;
using Moq;
using Xunit;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/BitmapEditorTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/BitmapEditorTests.cs
index 5b214aef026..9f157ef80ed 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/BitmapEditorTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/BitmapEditorTests.cs
@@ -2,10 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing.Imaging;
-using System.IO;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ColorEditorTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ColorEditorTests.cs
index 4475654210a..745189e3b58 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ColorEditorTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ColorEditorTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Windows.Forms;
using System.Windows.Forms.Design;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/CursorEditorTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/CursorEditorTests.cs
index f4d476b40eb..d320468049b 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/CursorEditorTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/CursorEditorTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Windows.Forms;
using System.Windows.Forms.Design;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/FontNameEditorTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/FontNameEditorTests.cs
index ff3a0e09225..3a7b5ec0d12 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/FontNameEditorTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/FontNameEditorTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Windows.Forms.Design;
using Moq;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ImageEditorTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ImageEditorTests.cs
index fb68d670364..8e08db31ee8 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ImageEditorTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ImageEditorTests.cs
@@ -2,10 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing.Imaging;
-using System.IO;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/MetafileEditorTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/MetafileEditorTests.cs
index f915f197b9c..0aa661f601e 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/MetafileEditorTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/MetafileEditorTests.cs
@@ -4,7 +4,6 @@
using System.ComponentModel;
using System.Drawing.Imaging;
-using System.IO;
using System.Runtime.InteropServices;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxComponentsCreatedEventArgsTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxComponentsCreatedEventArgsTests.cs
index 70f913efb9d..1ce53683974 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxComponentsCreatedEventArgsTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxComponentsCreatedEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using Xunit;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxComponentsCreatingEventArgsTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxComponentsCreatingEventArgsTests.cs
index ad215877597..bcfae6fb6a3 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxComponentsCreatingEventArgsTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxComponentsCreatingEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel.Design;
using Moq;
using Xunit;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxItemTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxItemTests.cs
index f8d6883bf4a..c22af866c08 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxItemTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/Drawing/Design/ToolboxItemTests.cs
@@ -3,11 +3,8 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design;
-using System.IO;
-using System.Linq;
using System.Reflection;
using System.Runtime.Loader;
using Moq;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/AnchorEditorTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/AnchorEditorTests.cs
index 0881698abff..94f9ada30a7 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/AnchorEditorTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/AnchorEditorTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing.Design;
using Moq;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/Behavior/BehaviorDragDropEventArgsTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/Behavior/BehaviorDragDropEventArgsTests.cs
index b6cc0732f33..8f41dfcbc3e 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/Behavior/BehaviorDragDropEventArgsTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/Behavior/BehaviorDragDropEventArgsTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Design.Behavior.Tests
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/Behavior/SnapLineTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/Behavior/SnapLineTests.cs
index 80124b592b5..cd36136c8f8 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/Behavior/SnapLineTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/Behavior/SnapLineTests.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
-using System.Linq;
using Xunit;
namespace System.Windows.Forms.Design.Behavior.Tests
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/BorderSidesEditorTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/BorderSidesEditorTests.cs
index e53682c3a3f..95a220d4d3a 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/BorderSidesEditorTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/BorderSidesEditorTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing.Design;
using Moq;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/DesignerOptionsTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/DesignerOptionsTests.cs
index 57be49e17a3..0a90ed110dd 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/DesignerOptionsTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/DesignerOptionsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/DockEditorTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/DockEditorTests.cs
index 2831a7783d8..d20c3da01b2 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/DockEditorTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/DockEditorTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing.Design;
using Moq;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/ImageListImageEditorTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/ImageListImageEditorTests.cs
index cd962435b8f..ac5def8757b 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/ImageListImageEditorTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/ImageListImageEditorTests.cs
@@ -4,7 +4,6 @@
using System.Drawing;
using System.Drawing.Imaging;
-using System.IO;
using Xunit;
namespace System.Windows.Forms.Design.Tests
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/MenuCommandsTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/MenuCommandsTests.cs
index bf501225c00..11cbf8137b9 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/MenuCommandsTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/MenuCommandsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel.Design;
using Xunit;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/ShortcutKeysEditorTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/ShortcutKeysEditorTests.cs
index 139232bd98e..4570be5c717 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/ShortcutKeysEditorTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/ShortcutKeysEditorTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing.Design;
using Moq;
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/WindowsFormsDesignerOptionServiceTests.cs b/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/WindowsFormsDesignerOptionServiceTests.cs
index 99c089cda06..bcd189f9937 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/WindowsFormsDesignerOptionServiceTests.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/System/Windows/Forms/Design/WindowsFormsDesignerOptionServiceTests.cs
@@ -5,7 +5,6 @@
using System.ComponentModel;
using System.ComponentModel.Design;
using System.Drawing;
-using System.Linq;
using Xunit;
namespace System.Windows.Forms.Design.Tests
diff --git a/src/System.Windows.Forms.Design/tests/UnitTests/SystemDesignMetadataReader.cs b/src/System.Windows.Forms.Design/tests/UnitTests/SystemDesignMetadataReader.cs
index c0b920575dc..e83370a5939 100644
--- a/src/System.Windows.Forms.Design/tests/UnitTests/SystemDesignMetadataReader.cs
+++ b/src/System.Windows.Forms.Design/tests/UnitTests/SystemDesignMetadataReader.cs
@@ -2,10 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel.Design;
-using System.IO;
-using System.Linq;
using System.Reflection;
using System.Reflection.Metadata;
using System.Reflection.PortableExecutable;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.CCS.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.CCS.cs
index 01e9ea5c950..7b3672c5f8c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.CCS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.CCS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.CDDS.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.CDDS.cs
index f6e44965c8f..69c903d1cff 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.CDDS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.CDDS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.CDIS.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.CDIS.cs
index f60b84efc98..bc87fa9a5b0 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.CDIS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.CDIS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.CDRF.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.CDRF.cs
index 0ea983896db..528a76848a9 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.CDRF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.CDRF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.DTS.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.DTS.cs
index e17e9444b61..887ec61569d 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.DTS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.DTS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.GDTR.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.GDTR.cs
index 23363ef6a9e..69716d7030d 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.GDTR.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.GDTR.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.HDI.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.HDI.cs
index a0b9a7e356f..ad3d437a604 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.HDI.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.HDI.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.HDITEMW.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.HDITEMW.cs
index 27e56b0d716..7b62613ede8 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.HDITEMW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.HDITEMW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.HICF.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.HICF.cs
index 9beac0b7ed1..422fc45b2bd 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.HICF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.HICF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ILC.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ILC.cs
index f45fdea3e38..f22853cd608 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ILC.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ILC.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ILD.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ILD.cs
index f079e9b9216..e01e842b19a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ILD.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ILD.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ILP.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ILP.cs
index a29e3e106a6..5180d944b7d 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ILP.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ILP.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Add.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Add.cs
index ce288585438..e963e94cd3c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Add.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Add.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Create.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Create.cs
index a6617cfbb18..8cd95c49621 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Create.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Create.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Destroy.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Destroy.cs
index 03a17817575..0eb92b2a36b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Destroy.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Destroy.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Draw.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Draw.cs
index 472c57251f4..835d0ef7c30 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Draw.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Draw.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.DrawEx.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.DrawEx.cs
index 8f03ada242b..952db9f376a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.DrawEx.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.DrawEx.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Duplicate.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Duplicate.cs
index 7a9dc188970..0511e570a45 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Duplicate.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Duplicate.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.GetIconSize.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.GetIconSize.cs
index 71711fbb51e..94a64841f16 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.GetIconSize.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.GetIconSize.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.GetImageCount.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.GetImageCount.cs
index abe488b97a8..788707890bb 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.GetImageCount.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.GetImageCount.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.GetImageInfo.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.GetImageInfo.cs
index 766521b057d..c4b37dddfc7 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.GetImageInfo.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.GetImageInfo.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Read.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Read.cs
index 3b53b768f60..7e32dd5abe6 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Read.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Read.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Remove.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Remove.cs
index 4dff5b3b16f..98bf507c99c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Remove.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Remove.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Replace.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Replace.cs
index 32cc6bf6560..0d256afe88a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Replace.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Replace.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.ReplaceIcon.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.ReplaceIcon.cs
index 0e5e2be7fe9..b1e2ffa2f73 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.ReplaceIcon.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.ReplaceIcon.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.SetBkColor.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.SetBkColor.cs
index e3e10e2b21b..590880e219a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.SetBkColor.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.SetBkColor.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Write.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Write.cs
index 0f8fc059947..9dc97875236 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Write.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.Write.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.WriteEx.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.WriteEx.cs
index 59996f356ee..688fb5c7748 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.WriteEx.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.ImageList.WriteEx.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LIF.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LIF.cs
index a942e872c83..606fdeaf279 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LIF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LIF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LIS.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LIS.cs
index 4e02c62ab5a..5036fadb041 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LIS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LIS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVBKIF.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVBKIF.cs
index 2dbb77ce8c1..a15d97952a9 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVBKIF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVBKIF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVBKIMAGEW.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVBKIMAGEW.cs
index ea9e07d0ed8..056b753a151 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVBKIMAGEW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVBKIMAGEW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVCDI.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVCDI.cs
index a503902fe2a..87a35c96d04 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVCDI.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVCDI.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVCF.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVCF.cs
index 559ded25244..49ccde49b5b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVCF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVCF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVCFMT.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVCFMT.cs
index 0101e98bc3c..00e2f5fab98 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVCFMT.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVCFMT.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVFI.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVFI.cs
index f837ec9e00c..b9cf6542f17 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVFI.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVFI.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVFINDINFOW.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVFINDINFOW.cs
index 633dbc43fad..7412cc0454b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVFINDINFOW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVFINDINFOW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVGA.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVGA.cs
index d44217f6198..38bef868a0b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVGA.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVGA.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVGF.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVGF.cs
index 13368b108fe..d45577d64e0 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVGF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVGF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVGS.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVGS.cs
index a32584e9987..642cff6dbee 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVGS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVGS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVHT.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVHT.cs
index 64433d1f98f..3bba3e0570f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVHT.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVHT.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVIF.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVIF.cs
index 68cf86603b4..f4d03c79ccb 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVIF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVIF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVIS.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVIS.cs
index ebfefd3d221..09f46a6649f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVIS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVIS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVITEMW.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVITEMW.cs
index 55af086ed2a..aaf9d993507 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVITEMW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVITEMW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVNI.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVNI.cs
index 85eb7c002a0..2096f15a35b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVNI.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVNI.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVS.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVS.cs
index 4532ed84d5f..b7b5be33747 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVS_EX.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVS_EX.cs
index d5e134af3f1..9c1389d5bcb 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVS_EX.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVS_EX.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVTVIF.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVTVIF.cs
index df2092db0bf..c076bfa7618 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVTVIF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVTVIF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVTVIM.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVTVIM.cs
index f36972e9d4f..921fef6c2a7 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVTVIM.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.LVTVIM.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.MCGIF.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.MCGIF.cs
index a28cbcd9570..ae95b383187 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.MCGIF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.MCGIF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.MCGRIDINFO.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.MCGRIDINFO.cs
index 410666f0562..6d8e1d7e38a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.MCGRIDINFO.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.MCGRIDINFO.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.NMCUSTOMDRAW.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.NMCUSTOMDRAW.cs
index d62946b3fce..2f5c7de8303 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.NMCUSTOMDRAW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.NMCUSTOMDRAW.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.NMDAYSTATE.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.NMDAYSTATE.cs
index bebb9867882..cc7c2fdf041 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.NMDAYSTATE.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.NMDAYSTATE.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.NMLISTVIEW.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.NMLISTVIEW.cs
index 1dc0fa03839..c1f05cc15b7 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.NMLISTVIEW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.NMLISTVIEW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.NMLVGETINFOTIPW.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.NMLVGETINFOTIPW.cs
index 6e4adccca5d..b959d1a7c0b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.NMLVGETINFOTIPW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.NMLVGETINFOTIPW.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.NMTTDISPINFOW.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.NMTTDISPINFOW.cs
index 8edde163469..4cc8b79ee76 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.NMTTDISPINFOW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.NMTTDISPINFOW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.PBS.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.PBS.cs
index b02a14fbcfc..39d9d547e89 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.PBS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.PBS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.SBARS.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.SBARS.cs
index b271e60dc0e..510c7f4103c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.SBARS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.SBARS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.SBT.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.SBT.cs
index e4411117608..f9c4a064db3 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.SBT.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.SBT.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TASKDIALOGCONFIG.IconUnion.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TASKDIALOGCONFIG.IconUnion.cs
index dcf34557579..d88f0180c3a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TASKDIALOGCONFIG.IconUnion.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TASKDIALOGCONFIG.IconUnion.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TASKDIALOGCONFIG.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TASKDIALOGCONFIG.cs
index 8b4c10f3615..292d7829406 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TASKDIALOGCONFIG.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TASKDIALOGCONFIG.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TBS.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TBS.cs
index 8eb3db0764f..0a026ee65cd 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TBS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TBS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TCIF.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TCIF.cs
index 0c1487e7041..9ec959bc4b5 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TCIF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TCIF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TCIS.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TCIS.cs
index f8899a0ddcd..30cf1b0af63 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TCIS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TCIS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TCITEMW.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TCITEMW.cs
index 83009c322f3..19ac94da21e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TCITEMW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TCITEMW.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TCS.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TCS.cs
index 548b72b8b4f..254e87aa47e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TCS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TCS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TDCBF.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TDCBF.cs
index faeb02a5b24..c237bbd05d4 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TDCBF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TDCBF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TDF.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TDF.cs
index fa8e7c5d608..955447fa91e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TDF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TDF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TTF.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TTF.cs
index d614e21eb0a..5127c7d63ef 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TTF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TTF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TTOOLINFOW.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TTOOLINFOW.cs
index 4a431959509..4f04e6a223e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TTOOLINFOW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TTOOLINFOW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TTS.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TTS.cs
index 0e2cbf0ab84..e313a5a49ac 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TTS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TTS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVE.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVE.cs
index 3991a5652dd..9474d31faab 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVE.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVE.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVGN.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVGN.cs
index e98e09e0e99..ee3d18b5f2f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVGN.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVGN.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVHITTESTINFO.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVHITTESTINFO.cs
index c637d5e1679..5233d0263ad 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVHITTESTINFO.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVHITTESTINFO.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVHT.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVHT.cs
index d62c9949ff3..b07d7d513b2 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVHT.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVHT.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVIF.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVIF.cs
index 13c77727196..4ba52ba10ad 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVIF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVIF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVINSERTSTRUCTW.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVINSERTSTRUCTW.cs
index b4af57ac408..14a34497787 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVINSERTSTRUCTW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVINSERTSTRUCTW.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVIS.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVIS.cs
index 53b607293c0..f2f940cd161 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVIS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVIS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVITEMW.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVITEMW.cs
index afe2cbd60b0..c00e89d6235 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVITEMW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVITEMW.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVS.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVS.cs
index 41ab5bf31ec..a457392b763 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVS_EX.cs b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVS_EX.cs
index 2e42cd8c458..02d301a09d2 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVS_EX.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/ComCtl32/Interop.TVS_EX.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class ComCtl32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.CC.cs b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.CC.cs
index 19a68923541..d02c42830ef 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.CC.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.CC.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal partial class Comdlg32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.CF.cs b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.CF.cs
index 5f70bdbb3ea..710abc26259 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.CF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.CF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal partial class Comdlg32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.ChooseColorW.cs b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.ChooseColorW.cs
index 7a9fd23d024..be4932e93a7 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.ChooseColorW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.ChooseColorW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.ChooseFontW.cs b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.ChooseFontW.cs
index 91a6da132f6..e1f31821d95 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.ChooseFontW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.ChooseFontW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.FR.cs b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.FR.cs
index 97bf9f983e0..31bce14dfd5 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.FR.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.FR.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Comdlg32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.OFN.cs b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.OFN.cs
index e6c66eadbe8..63d715814bc 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.OFN.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.OFN.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal partial class Comdlg32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.OFNOTIFYW.cs b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.OFNOTIFYW.cs
index 34121428637..13dedea399b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.OFNOTIFYW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.OFNOTIFYW.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal partial class Comdlg32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.OFN_EX.cs b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.OFN_EX.cs
index cdec9c9619b..586d07844ca 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.OFN_EX.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.OFN_EX.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal partial class Comdlg32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.PD.cs b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.PD.cs
index a5bc560cba0..5510a466d3c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.PD.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.PD.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal partial class Comdlg32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.PSD.cs b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.PSD.cs
index 3afba00a248..06963d7cc97 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.PSD.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.PSD.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal partial class Comdlg32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.PageSetupDlgW.cs b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.PageSetupDlgW.cs
index 54e1e48af6b..e7b449e646c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.PageSetupDlgW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.PageSetupDlgW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.PrintDlg.cs b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.PrintDlg.cs
index 33a294be8f8..6918af0e770 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.PrintDlg.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.PrintDlg.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.PrintDlgW.cs b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.PrintDlgW.cs
index 148d36b1c5d..c5dee48edc7 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.PrintDlgW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Comdlg32/Interop.PrintDlgW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.BITMAP.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.BITMAP.cs
index 2df085ef515..68d0071ebc7 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.BITMAP.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.BITMAP.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.BitBlt.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.BitBlt.cs
index adff1f84799..8e97395d8c9 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.BitBlt.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.BitBlt.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateBitmapScope.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateBitmapScope.cs
index 4d866446786..1ac4a83afdc 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateBitmapScope.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateBitmapScope.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Gdi32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateBrushScope.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateBrushScope.cs
index d87b40ffa56..14f0df28d74 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateBrushScope.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateBrushScope.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
#if DEBUG
-using System;
#endif
using System.ComponentModel;
using System.Diagnostics;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateDC.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateDC.cs
index 0c8a6f16237..2e1365937d2 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateDC.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateDC.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateDIBSection.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateDIBSection.cs
index d7321467a16..b58b5405812 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateDIBSection.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateDIBSection.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateDcScope.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateDcScope.cs
index decc16f3f61..d638cd8fb6c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateDcScope.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateDcScope.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Gdi32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateICW.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateICW.cs
index aefd8554848..5a52ba507cc 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateICW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreateICW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreatePenScope.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreatePenScope.cs
index e353729fe8c..5837f7b9d69 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreatePenScope.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.CreatePenScope.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
#if DEBUG
-using System;
#endif
using System.Drawing;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.DeleteObject.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.DeleteObject.cs
index e4a00735e00..ff09b1a20e9 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.DeleteObject.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.DeleteObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.ENHMETARECORD.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.ENHMETARECORD.cs
index 29a37cb5fb9..f59b0c0da5f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.ENHMETARECORD.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.ENHMETARECORD.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Gdi32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.ETO.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.ETO.cs
index 6a1d0ed4c76..db36776bd1b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.ETO.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.ETO.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Gdi32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.Ellipse.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.Ellipse.cs
index 378d301e378..65319c3a81e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.Ellipse.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.Ellipse.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.Enhmfenumproc.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.Enhmfenumproc.cs
index de0c2b7efc7..ac9a9a258b4 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.Enhmfenumproc.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.Enhmfenumproc.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Gdi32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.EnumEnhMetaFile.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.EnumEnhMetaFile.cs
index c0172b90f1a..9a0cb168d33 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.EnumEnhMetaFile.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.EnumEnhMetaFile.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetBitmapBits.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetBitmapBits.cs
index 3804b3247b4..73ff53e098c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetBitmapBits.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetBitmapBits.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetCurrentObject.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetCurrentObject.cs
index eb541fef18b..ec5eea5f598 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetCurrentObject.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetCurrentObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetMapMode.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetMapMode.cs
index df07d872865..aee7ccfd236 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetMapMode.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetMapMode.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetObjectType.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetObjectType.cs
index 352508e8d83..5f4c3f47d5c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetObjectType.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetObjectType.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetObjectW.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetObjectW.cs
index ffd784e14bb..f0724c4951c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetObjectW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetObjectW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetPaletteEntries.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetPaletteEntries.cs
index befe3c8154a..4fbdc7f55f5 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetPaletteEntries.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetPaletteEntries.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetROP2.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetROP2.cs
index bb1c4ae8bed..81ac52eec06 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetROP2.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetROP2.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetRegionData.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetRegionData.cs
index 44794ce131c..01333c75c5c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetRegionData.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetRegionData.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetTextAlign.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetTextAlign.cs
index ed9805a8790..80844bb7189 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetTextAlign.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetTextAlign.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetTextExtentPoint32.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetTextExtentPoint32.cs
index 0f5020ba664..f99125540ca 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetTextExtentPoint32.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetTextExtentPoint32.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetTextMetricsW.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetTextMetricsW.cs
index 4e8e262fb20..46585f59249 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetTextMetricsW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetTextMetricsW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetViewportExtEx.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetViewportExtEx.cs
index f3549d28fd7..b2498d5c3e0 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetViewportExtEx.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetViewportExtEx.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetViewportOrgEx.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetViewportOrgEx.cs
index b38cd5a84b9..8f5aaca6d27 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetViewportOrgEx.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.GetViewportOrgEx.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HBITMAP.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HBITMAP.cs
index 061600f6558..6f783366d70 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HBITMAP.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HBITMAP.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Gdi32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HBRUSH.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HBRUSH.cs
index 9e88002beb7..4b0624c5237 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HBRUSH.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HBRUSH.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Gdi32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HDC.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HDC.cs
index d4fb0219570..e0d41fabb98 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HDC.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HDC.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Gdi32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HENHMETAFILE.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HENHMETAFILE.cs
index bcd21574b5b..d1c34647f4d 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HENHMETAFILE.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HENHMETAFILE.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Gdi32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HFONT.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HFONT.cs
index c06c0d22e87..99d377ed384 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HFONT.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HFONT.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Gdi32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HGDIOBJ.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HGDIOBJ.cs
index e5df07340a9..185ec1b718a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HGDIOBJ.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HGDIOBJ.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Gdi32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HPALETTE.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HPALETTE.cs
index c57082c3f04..56827e498d3 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HPALETTE.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HPALETTE.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Gdi32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HPEN.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HPEN.cs
index d2743672352..e5eb4188c42 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HPEN.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HPEN.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Gdi32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HRGN.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HRGN.cs
index 3dbc9860b1d..b72fac07fed 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HRGN.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.HRGN.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Buffers;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.IntersetClipRect.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.IntersetClipRect.cs
index 45e182e0ccf..f5dfc76130d 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.IntersetClipRect.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.IntersetClipRect.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.LOGBRUSH.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.LOGBRUSH.cs
index b4efe6f34a0..061c056b305 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.LOGBRUSH.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.LOGBRUSH.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Gdi32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.LineTo.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.LineTo.cs
index a58594985fd..5a7b425c995 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.LineTo.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.LineTo.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.MoveToEx.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.MoveToEx.cs
index e729636b535..26d9b1cfa88 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.MoveToEx.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.MoveToEx.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.ObjectScope.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.ObjectScope.cs
index 270897c3cd3..0cd7eac59c4 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.ObjectScope.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.ObjectScope.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Gdi32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.OffsetViewportOrgEx.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.OffsetViewportOrgEx.cs
index d7816c4c20a..3477f0e9295 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.OffsetViewportOrgEx.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.OffsetViewportOrgEx.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.PS.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.PS.cs
index c5c07212b20..45ec7e49e1d 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.PS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.PS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Gdi32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.PatBlt.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.PatBlt.cs
index c8a5de17d89..51114a6d6c6 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.PatBlt.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.PatBlt.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.RGNDATAHEADER.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.RGNDATAHEADER.cs
index 1ada4b96162..3e460f633ee 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.RGNDATAHEADER.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.RGNDATAHEADER.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Gdi32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.RealizePalette.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.RealizePalette.cs
index 85303aa96b1..85c6cf4e9ad 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.RealizePalette.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.RealizePalette.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.RegionScope.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.RegionScope.cs
index fe09bf247bb..bffa4b4b1ed 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.RegionScope.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.RegionScope.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Diagnostics;
using System.Drawing;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.RestoreDC.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.RestoreDC.cs
index b6a5e827e5f..02c79b527a9 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.RestoreDC.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.RestoreDC.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SaveDC.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SaveDC.cs
index 34004504650..4175bbd2ec9 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SaveDC.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SaveDC.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SelectObject.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SelectObject.cs
index 8f4a5f4cb93..763ab685f96 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SelectObject.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SelectObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SelectPaletteScope.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SelectPaletteScope.cs
index 55e23d0dec5..a0adaa6256c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SelectPaletteScope.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SelectPaletteScope.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SelectionScope.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SelectionScope.cs
index a9e054c3a4e..401de6806a0 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SelectionScope.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SelectionScope.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
#if DEBUG
-using System;
#endif
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetBkColor.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetBkColor.cs
index fd3e9e9d529..d55e68d1624 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetBkColor.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetBkColor.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetBkModeScope.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetBkModeScope.cs
index 19253e2591c..f06dde99b2a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetBkModeScope.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetBkModeScope.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
#if DEBUG
-using System;
#endif
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetMapMode.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetMapMode.cs
index 823880bed9a..b5a5863e79c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetMapMode.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetMapMode.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetMapModeScope.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetMapModeScope.cs
index f559882c6b4..851c9c59bb1 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetMapModeScope.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetMapModeScope.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
#if DEBUG
-using System;
#endif
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetROP2.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetROP2.cs
index 111110bb6f8..d217604bf09 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetROP2.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetROP2.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetRop2Scope.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetRop2Scope.cs
index 763ecc434ee..c0fcce7115f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetRop2Scope.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetRop2Scope.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
#if DEBUG
-using System;
#endif
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetTextAlignmentScope.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetTextAlignmentScope.cs
index fc3fc24f91d..6bfacf334a1 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetTextAlignmentScope.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetTextAlignmentScope.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
#if DEBUG
-using System;
#endif
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetTextColor.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetTextColor.cs
index 91d177f727c..533c09e51c9 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetTextColor.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetTextColor.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetTextColorScope.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetTextColorScope.cs
index 013dd89cca9..949346a3ec6 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetTextColorScope.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetTextColorScope.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
#if DEBUG
-using System;
#endif
using System.Drawing;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetViewportExtEx.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetViewportExtEx.cs
index 75c9b67b03a..5d669928d8c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetViewportExtEx.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetViewportExtEx.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetViewportOrgEx.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetViewportOrgEx.cs
index 5e487e44f7a..37435e78dcd 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetViewportOrgEx.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.SetViewportOrgEx.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.TA.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.TA.cs
index c60200fbe10..393b3dce153 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.TA.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.TA.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Gdi32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.TMPF.cs b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.TMPF.cs
index a1b026e0cc2..6b6f3f9b072 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.TMPF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Gdi32/Interop.TMPF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Gdi32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/GdiPlus/Interop.GdipCloneBrush.cs b/src/System.Windows.Forms.Primitives/src/Interop/GdiPlus/Interop.GdipCloneBrush.cs
index 2e353a50198..98ec1bd88c2 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/GdiPlus/Interop.GdipCloneBrush.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/GdiPlus/Interop.GdipCloneBrush.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/GdiPlus/Interop.GdipCreateSolidFill.cs b/src/System.Windows.Forms.Primitives/src/Interop/GdiPlus/Interop.GdipCreateSolidFill.cs
index 24369570f8c..9f3de90cf29 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/GdiPlus/Interop.GdipCreateSolidFill.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/GdiPlus/Interop.GdipCreateSolidFill.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Hhctrl/Interop.HH_POPUPW.cs b/src/System.Windows.Forms.Primitives/src/Interop/Hhctrl/Interop.HH_POPUPW.cs
index 9972027230d..5ddf09feb7f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Hhctrl/Interop.HH_POPUPW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Hhctrl/Interop.HH_POPUPW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Hhctrl/Interop.HtmlHelpW.cs b/src/System.Windows.Forms.Primitives/src/Interop/Hhctrl/Interop.HtmlHelpW.cs
index 711a591431d..a4b4c99608f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Hhctrl/Interop.HtmlHelpW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Hhctrl/Interop.HtmlHelpW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/IHandle.cs b/src/System.Windows.Forms.Primitives/src/Interop/IHandle.cs
index b82abf8841b..f945e5c853b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/IHandle.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/IHandle.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
///
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.GCS.cs b/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.GCS.cs
index 66448c8b0a6..01e18728bc8 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.GCS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.GCS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal partial class Imm32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.IME_SMODE.cs b/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.IME_SMODE.cs
index 0a7a40d6206..23152181c8b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.IME_SMODE.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.IME_SMODE.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal partial class Imm32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmAssociateContext.cs b/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmAssociateContext.cs
index 98ac3b603ec..676cd937a25 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmAssociateContext.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmAssociateContext.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmCreateContext.cs b/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmCreateContext.cs
index d24d33a8f47..e38636136f2 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmCreateContext.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmCreateContext.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmGetContext.cs b/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmGetContext.cs
index 64c6313fffa..e62c0fedf44 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmGetContext.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmGetContext.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmGetConversionStatus.cs b/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmGetConversionStatus.cs
index 101efbdbd9e..b724f551774 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmGetConversionStatus.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmGetConversionStatus.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmGetOpenStatus.cs b/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmGetOpenStatus.cs
index 121e6056c3f..745c151857e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmGetOpenStatus.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmGetOpenStatus.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmNotifyIME.cs b/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmNotifyIME.cs
index 2dc73f5cecb..dadb553f575 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmNotifyIME.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmNotifyIME.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmReleaseContext.cs b/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmReleaseContext.cs
index 6523baf01c5..6e3f3fc4227 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmReleaseContext.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmReleaseContext.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmSetConversionStatus.cs b/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmSetConversionStatus.cs
index 898fa54d156..c0bf7124fb1 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmSetConversionStatus.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmSetConversionStatus.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmSetOpenStatus.cs b/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmSetOpenStatus.cs
index 4b02b1eeb0f..4c394443be4 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmSetOpenStatus.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Imm32/Interop.ImmSetOpenStatus.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Interop.BSTR.cs b/src/System.Windows.Forms.Primitives/src/Interop/Interop.BSTR.cs
index 7db633c1ba0..846a6f5014d 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Interop.BSTR.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Interop.BSTR.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Interop.CLSID.cs b/src/System.Windows.Forms.Primitives/src/Interop/Interop.CLSID.cs
index dbd72c16663..b02a17be427 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Interop.CLSID.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Interop.CLSID.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static class CLSID
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Interop.COLORREF.cs b/src/System.Windows.Forms.Primitives/src/Interop/Interop.COLORREF.cs
index edd327574ce..d404c3e94ec 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Interop.COLORREF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Interop.COLORREF.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Interop.HRESULT.cs b/src/System.Windows.Forms.Primitives/src/Interop/Interop.HRESULT.cs
index c7aeff1cf80..aaf994beb6c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Interop.HRESULT.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Interop.HRESULT.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using static Interop;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Interop.IID.cs b/src/System.Windows.Forms.Primitives/src/Interop/Interop.IID.cs
index 49b62629932..ee32bf03455 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Interop.IID.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Interop.IID.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static class IID
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Interop.PARAM.cs b/src/System.Windows.Forms.Primitives/src/Interop/Interop.PARAM.cs
index 52fa2e6db22..3a83636bef5 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Interop.PARAM.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Interop.PARAM.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.ACTCTXW.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.ACTCTXW.cs
index 8fb083e6995..ebb90b15582 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.ACTCTXW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.ACTCTXW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.ACTCTX_FLAG.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.ACTCTX_FLAG.cs
index 14216140502..3bb25f9716a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.ACTCTX_FLAG.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.ACTCTX_FLAG.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal partial class Kernel32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.ActivateActCtx.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.ActivateActCtx.cs
index 9ab5ac05cac..098e8433a09 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.ActivateActCtx.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.ActivateActCtx.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.CloseHandle.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.CloseHandle.cs
index fbb107216c3..00556614032 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.CloseHandle.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.CloseHandle.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.CreateActCtxW.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.CreateActCtxW.cs
index a6f67f82c24..a91661d1560 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.CreateActCtxW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.CreateActCtxW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.DeactivateActCtx.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.DeactivateActCtx.cs
index d2e99704625..64a324c97c2 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.DeactivateActCtx.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.DeactivateActCtx.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.DuplicateHandle.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.DuplicateHandle.cs
index 9c8e025545b..4df4cd2929a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.DuplicateHandle.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.DuplicateHandle.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.FILETIME.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.FILETIME.cs
index 59bc3a5c012..e603f02d42e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.FILETIME.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.FILETIME.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Kernel32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.FormatMessageOptions.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.FormatMessageOptions.cs
index 5d13c95e0d2..ebd585345bf 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.FormatMessageOptions.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.FormatMessageOptions.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal partial class Kernel32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.FormatMessageW.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.FormatMessageW.cs
index dd26fa03f3e..3683268d59b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.FormatMessageW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.FormatMessageW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
using System.Text;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.FreeLibrary.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.FreeLibrary.cs
index e8a30c0433a..017f3458f2f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.FreeLibrary.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.FreeLibrary.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GMEM.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GMEM.cs
index bfb1969520a..3b804a1c373 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GMEM.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GMEM.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal partial class Kernel32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetCurrentActCtx.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetCurrentActCtx.cs
index b26cbae96cc..e38dd5f7683 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetCurrentActCtx.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetCurrentActCtx.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetCurrentProcess.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetCurrentProcess.cs
index 7f53abfa1b6..841e985bdce 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetCurrentProcess.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetCurrentProcess.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetCurrentThread.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetCurrentThread.cs
index ca723fb9f3e..2df17a99127 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetCurrentThread.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetCurrentThread.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetExitCodeThread.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetExitCodeThread.cs
index 319be23eaf6..af2dfb8c68a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetExitCodeThread.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetExitCodeThread.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetModuleHandle.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetModuleHandle.cs
index 3de804ee9d8..5597dba8055 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetModuleHandle.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetModuleHandle.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetProcAddress.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetProcAddress.cs
index 1411a536743..a9ae7140f6b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetProcAddress.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GetProcAddress.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalAlloc.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalAlloc.cs
index d1019905e1f..56135fc77ea 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalAlloc.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalAlloc.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalFree.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalFree.cs
index 789aae3f27d..939b58f1b2f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalFree.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalFree.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalLock.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalLock.cs
index 02fb2f6b988..5c3adffd970 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalLock.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalLock.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalReAlloc.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalReAlloc.cs
index 2eb678410b6..930c43d68a7 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalReAlloc.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalReAlloc.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalSize.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalSize.cs
index 0c163b9c066..5ea3e6ce84e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalSize.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalSize.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalUnlock.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalUnlock.cs
index a9dca6721fe..16c4c45b473 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalUnlock.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.GlobalUnlock.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.LoadLibrary.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.LoadLibrary.cs
index 6bc8f296df5..9c467ecd3b8 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.LoadLibrary.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.LoadLibrary.cs
@@ -2,9 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Diagnostics;
-using System.IO;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.OpenProcess.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.OpenProcess.cs
index 9a4d7ce690b..075d41922c8 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.OpenProcess.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.OpenProcess.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.ProcessAccessOptions.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.ProcessAccessOptions.cs
index 8c2a6aaaad7..ef0475c2ee3 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.ProcessAccessOptions.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.ProcessAccessOptions.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal partial class Kernel32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.STARTF.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.STARTF.cs
index 5d7080997a0..b1648c89f9f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.STARTF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.STARTF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal partial class Kernel32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.STARTUPINFOW.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.STARTUPINFOW.cs
index 2e5d887c4a5..153076e8feb 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.STARTUPINFOW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.STARTUPINFOW.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal partial class Kernel32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.SYSTEMTIME.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.SYSTEMTIME.cs
index 055742a8715..1c02c7e6f35 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.SYSTEMTIME.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.SYSTEMTIME.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Diagnostics;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.WideCharToMultiByte.cs b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.WideCharToMultiByte.cs
index 28a0c91f296..3c7556b2808 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.WideCharToMultiByte.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Kernel32/Interop.WideCharToMultiByte.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.DOCHOSTUIFLAG.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.DOCHOSTUIFLAG.cs
index 0eaf1943b44..cb41f25cccc 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.DOCHOSTUIFLAG.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.DOCHOSTUIFLAG.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Mshtml
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IDocHostUIHandler.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IDocHostUIHandler.cs
index 2f45142f62e..3c79a4b7ce1 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IDocHostUIHandler.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IDocHostUIHandler.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.ComTypes;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLDOMNode.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLDOMNode.cs
index 2dd339e2cbb..0ed6d21e9bd 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLDOMNode.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLDOMNode.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLElement3.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLElement3.cs
index a45ca6bdd81..66fac51b8ab 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLElement3.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLElement3.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLStyle.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLStyle.cs
index 19c2d441b8a..d89026f024b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLStyle.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IHTMLStyle.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IWebBrowser2.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IWebBrowser2.cs
index 03fded499f5..e4474bc0323 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IWebBrowser2.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Mshtml/Interop.IWebBrowser2.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mso/Interop.IMsoComponent.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mso/Interop.IMsoComponent.cs
index bd3f9a4778e..9968769c627 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Mso/Interop.IMsoComponent.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Mso/Interop.IMsoComponent.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mso/Interop.IMsoComponentManager.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mso/Interop.IMsoComponentManager.cs
index 0c31650066d..ab35c6e93d0 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Mso/Interop.IMsoComponentManager.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Mso/Interop.IMsoComponentManager.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mso/Interop.msocadvf.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mso/Interop.msocadvf.cs
index 112f01f73c4..4713bd450be 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Mso/Interop.msocadvf.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Mso/Interop.msocadvf.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Mso
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mso/Interop.msocrf.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mso/Interop.msocrf.cs
index 873d58ef211..3b8eff9b5ea 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Mso/Interop.msocrf.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Mso/Interop.msocrf.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Mso
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Mso/Interop.msoidlef.cs b/src/System.Windows.Forms.Primitives/src/Interop/Mso/Interop.msoidlef.cs
index 13bdf3a8931..b9c4b65380b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Mso/Interop.msoidlef.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Mso/Interop.msoidlef.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Mso
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.ADVF.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.ADVF.cs
index da40abfd064..0e34023d1a3 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.ADVF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.ADVF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CADWORD.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CADWORD.cs
index 5e1e8fb19d4..d35031c31b5 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CADWORD.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CADWORD.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CALPOLESTR.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CALPOLESTR.cs
index a999b0c8b07..9de2742dc8d 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CALPOLESTR.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CALPOLESTR.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CAUUID.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CAUUID.cs
index daa762d7835..a0edd8f3c27 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CAUUID.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CAUUID.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CLSCTX.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CLSCTX.cs
index 4e737c3a110..452d1596f63 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CLSCTX.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CLSCTX.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CONTROLINFO.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CONTROLINFO.cs
index 2347957b226..17db1e0a072 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CONTROLINFO.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CONTROLINFO.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CTRLINFO.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CTRLINFO.cs
index 5b15239c0a4..129d675a80a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CTRLINFO.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CTRLINFO.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CoCreateInstance.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CoCreateInstance.cs
index 9c5624d9ad8..52fe4977594 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CoCreateInstance.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CoCreateInstance.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CoGetClassObject.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CoGetClassObject.cs
index eb49911ef8c..df8adc12a75 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CoGetClassObject.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CoGetClassObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CoRegisterMessageFilter.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CoRegisterMessageFilter.cs
index 898b7825bda..24d3e2068a0 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CoRegisterMessageFilter.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CoRegisterMessageFilter.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CreateILockBytesOnHGlobal.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CreateILockBytesOnHGlobal.cs
index 8969ce54edf..c261a3e9c5f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CreateILockBytesOnHGlobal.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CreateILockBytesOnHGlobal.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.DROPEFFECT.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.DROPEFFECT.cs
index 3737756702d..5ef17106adb 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.DROPEFFECT.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.DROPEFFECT.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.DVASPECT.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.DVASPECT.cs
index 0f18e2ed66c..9bd190a3cda 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.DVASPECT.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.DVASPECT.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.FUNCDESC.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.FUNCDESC.cs
index f0d0658c68e..7808f2fe93e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.FUNCDESC.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.FUNCDESC.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.FUNCFLAGS.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.FUNCFLAGS.cs
index c09e7f0983e..fd249d0fa39 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.FUNCFLAGS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.FUNCFLAGS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.GC_WCH.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.GC_WCH.cs
index b9b55f7215a..b5d3444cb29 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.GC_WCH.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.GC_WCH.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.GPStream.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.GPStream.cs
index 9575805edf8..e347bbfe8e0 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.GPStream.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.GPStream.cs
@@ -2,9 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Buffers;
-using System.IO;
internal static partial class Interop
{
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.GetHGlobalFromILockBytes.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.GetHGlobalFromILockBytes.cs
index 5280b5e1112..8c81dbd9e7b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.GetHGlobalFromILockBytes.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.GetHGlobalFromILockBytes.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IClassFactory2.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IClassFactory2.cs
index 09ea3b13e66..fc6dc1f1ef6 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IClassFactory2.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IClassFactory2.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IConnectionPoint.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IConnectionPoint.cs
index ddb82793d8e..810c341fece 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IConnectionPoint.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IConnectionPoint.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IConnectionPointContainer.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IConnectionPointContainer.cs
index 57960fd6276..07223780252 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IConnectionPointContainer.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IConnectionPointContainer.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IDLDESC.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IDLDESC.cs
index 51b4f1e6def..5eab64531b1 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IDLDESC.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IDLDESC.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IDLFLAG.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IDLFLAG.cs
index 5eceaef1972..790894e2687 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IDLFLAG.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IDLFLAG.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IDropSource.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IDropSource.cs
index cef6abfb089..93af0032ac0 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IDropSource.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IDropSource.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IDropTarget.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IDropTarget.cs
index 198d646c21a..e84e253d943 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IDropTarget.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IDropTarget.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IEnumUnknown.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IEnumUnknown.cs
index 0faf7ef5c22..b2e1234ada1 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IEnumUnknown.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IEnumUnknown.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IFont.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IFont.cs
index 5fdf0b0124c..01399e9fd69 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IFont.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IFont.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IFontDisp.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IFontDisp.cs
index fd16c9a37b2..f76fa5cec40 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IFontDisp.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IFontDisp.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IGetOleObject.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IGetOleObject.cs
index 07d4fbe446e..c29e254ca78 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IGetOleObject.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IGetOleObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IGetVBAObject.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IGetVBAObject.cs
index e1d8aceb7f2..370bd3f065c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IGetVBAObject.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IGetVBAObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.ILockBytes.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.ILockBytes.cs
index 2130d665399..d63b32d0a2f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.ILockBytes.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.ILockBytes.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IMPLTYPEFLAG.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IMPLTYPEFLAG.cs
index b3de89aa856..2d6fe252567 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IMPLTYPEFLAG.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IMPLTYPEFLAG.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IMallocSpy.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IMallocSpy.cs
index c0080eea684..628e7669d89 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IMallocSpy.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IMallocSpy.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.INVOKEKIND.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.INVOKEKIND.cs
index 7661b594657..65b5bd4f748 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.INVOKEKIND.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.INVOKEKIND.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleClientSite.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleClientSite.cs
index 140a7ccc1dd..8cf62d3eeb7 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleClientSite.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleClientSite.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleCommandTarget.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleCommandTarget.cs
index 70333e15175..531d423bd35 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleCommandTarget.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleCommandTarget.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleContainer.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleContainer.cs
index 62c4984d18a..9bf38b2f968 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleContainer.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleContainer.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleControl.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleControl.cs
index f2352c1423a..bb6e6a444e4 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleControl.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleControl.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleControlSite.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleControlSite.cs
index edbe7da4b46..ecad5324933 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleControlSite.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleControlSite.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceActiveObject.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceActiveObject.cs
index eb411ebcfa3..ea06e12a3ed 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceActiveObject.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceActiveObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceFrame.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceFrame.cs
index 031f27ab37e..0a5d6e33e9a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceFrame.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceFrame.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceObject.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceObject.cs
index daf98fabaf7..0b127f942a5 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceObject.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceObjectWindowless.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceObjectWindowless.cs
index a214bf1c339..e074c4321ff 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceObjectWindowless.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceObjectWindowless.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.ComTypes;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceSite.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceSite.cs
index 6d5349fa0e4..3d8a6fe41aa 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceSite.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceSite.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceUIWindow.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceUIWindow.cs
index b6cb676bf33..f25b1acbe5b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceUIWindow.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleInPlaceUIWindow.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleObject.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleObject.cs
index c0f6a6c90e6..d80297a920e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleObject.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.ComTypes;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleWindow.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleWindow.cs
index 89ac96a123b..c1d61748928 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleWindow.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IOleWindow.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPersist.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPersist.cs
index 26654660da7..047beee03f5 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPersist.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPersist.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPersistStorage.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPersistStorage.cs
index 34990cb6034..b53f6ffb997 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPersistStorage.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPersistStorage.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPersistStream.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPersistStream.cs
index 8559773006b..7f7e0ce8b46 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPersistStream.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPersistStream.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPersistStreamInit.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPersistStreamInit.cs
index ca485856511..1708cfff285 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPersistStreamInit.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPersistStreamInit.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPicture.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPicture.cs
index 0ecfd11e315..d8ab9c85f03 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPicture.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPicture.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPictureDisp.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPictureDisp.cs
index decab7631b8..072e7caa4ea 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPictureDisp.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPictureDisp.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPropertyNotifySink.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPropertyNotifySink.cs
index 39b38d97fc6..fd5ee0fb0cc 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPropertyNotifySink.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPropertyNotifySink.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IServiceProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IServiceProvider.cs
index 9de60773b11..12e222a52ec 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IServiceProvider.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IServiceProvider.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.ISimpleFrameSite.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.ISimpleFrameSite.cs
index b5556dfbc10..614fab5aae2 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.ISimpleFrameSite.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.ISimpleFrameSite.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.ISpecifyPropertyPages.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.ISpecifyPropertyPages.cs
index 909c149c50e..6790e1129e4 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.ISpecifyPropertyPages.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.ISpecifyPropertyPages.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IStorage.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IStorage.cs
index a1517627a31..880d69810a0 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IStorage.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IStorage.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.ComTypes;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IStream.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IStream.cs
index 6a3857138cf..dad1e63263d 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IStream.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IStream.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.IO;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IVBFormat.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IVBFormat.cs
index 3ae91000753..9ca54165c1d 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IVBFormat.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IVBFormat.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IVBGetControl.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IVBGetControl.cs
index f9c1b2fa7f0..1ff09448527 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IVBGetControl.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IVBGetControl.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IViewObject.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IViewObject.cs
index 0d17e45d4ef..80265527345 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IViewObject.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IViewObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.ComTypes;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IViewObject2.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IViewObject2.cs
index 722678b80f3..f27e851d0e0 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IViewObject2.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IViewObject2.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.ComTypes;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IsAccelerator.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IsAccelerator.cs
index 185febb51f2..510ffc93822 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IsAccelerator.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IsAccelerator.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.KEYMODIFIERS.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.KEYMODIFIERS.cs
index e4852bfc777..a46926c304b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.KEYMODIFIERS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.KEYMODIFIERS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OLECMDF.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OLECMDF.cs
index 126c7610b6c..8dc9abed7f9 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OLECMDF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OLECMDF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OLECONTF.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OLECONTF.cs
index 0334391cc8f..48eac3f1169 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OLECONTF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OLECONTF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OLEINPLACEFRAMEINFO.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OLEINPLACEFRAMEINFO.cs
index a5a0456ecd5..061c03663e5 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OLEINPLACEFRAMEINFO.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OLEINPLACEFRAMEINFO.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OLEMISC.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OLEMISC.cs
index 2f68ecfc753..e43a04d38ef 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OLEMISC.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OLEMISC.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OLEVERBATTRIB.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OLEVERBATTRIB.cs
index 3bcbc183dc3..7ecae354525 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OLEVERBATTRIB.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OLEVERBATTRIB.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OleCreatePictureIndirect.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OleCreatePictureIndirect.cs
index 9d95e304cf0..99029bd650f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OleCreatePictureIndirect.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OleCreatePictureIndirect.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OleInitialize.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OleInitialize.cs
index 02cc922925c..426b05d9b6e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OleInitialize.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.OleInitialize.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.PARAMDESC.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.PARAMDESC.cs
index 85081ad2aee..fd9677b6f2e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.PARAMDESC.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.PARAMDESC.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.PARAMFLAG.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.PARAMFLAG.cs
index 3564fe29283..59037df4424 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.PARAMFLAG.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.PARAMFLAG.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.PICTDESC.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.PICTDESC.cs
index 7327765e206..d160251adf1 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.PICTDESC.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.PICTDESC.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Drawing.Imaging;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.POINTERINACTIVE.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.POINTERINACTIVE.cs
index 8a2629981db..5218dada5c6 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.POINTERINACTIVE.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.POINTERINACTIVE.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.QACONTAINER.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.QACONTAINER.cs
index 040fe0719cc..8825f1f6db5 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.QACONTAINER.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.QACONTAINER.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.ComTypes;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.QACONTAINERFLAGS.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.QACONTAINERFLAGS.cs
index be5f94141a4..51bb325b7e6 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.QACONTAINERFLAGS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.QACONTAINERFLAGS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.ReadClassStg.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.ReadClassStg.cs
index 3260dffd411..d44708dc65f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.ReadClassStg.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.ReadClassStg.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.RegisterDragDrop.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.RegisterDragDrop.cs
index 74b8ae5028e..023ae4ff875 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.RegisterDragDrop.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.RegisterDragDrop.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.RevokeDragDrop.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.RevokeDragDrop.cs
index 7ca532ad689..272d4cbc541 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.RevokeDragDrop.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.RevokeDragDrop.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.STATSTG.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.STATSTG.cs
index fb2a0682d8a..295033b22ef 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.STATSTG.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.STATSTG.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.ComTypes;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.STGC.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.STGC.cs
index b9337064aa0..06a65bf2b96 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.STGC.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.STGC.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.STGM.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.STGM.cs
index 7d04d35b68f..03173db6552 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.STGM.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.STGM.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.StgOpenStorageOnILockBytes.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.StgOpenStorageOnILockBytes.cs
index 1cb479d191f..06544e16fa7 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.StgOpenStorageOnILockBytes.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.StgOpenStorageOnILockBytes.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.TYPEATTR.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.TYPEATTR.cs
index 9dce831c90f..fc9672d2151 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.TYPEATTR.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.TYPEATTR.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.TYPEDESC.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.TYPEDESC.cs
index 67b329da056..155afbc0df3 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.TYPEDESC.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.TYPEDESC.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.VARDESC.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.VARDESC.cs
index 9e7e622fe20..196a4fad059 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.VARDESC.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.VARDESC.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.VARFLAGS.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.VARFLAGS.cs
index fc7b457e938..83ab54a228e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.VARFLAGS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.VARFLAGS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.VIEWSTATUS.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.VIEWSTATUS.cs
index dfb6e301836..7e4771696e3 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.VIEWSTATUS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.VIEWSTATUS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.XFORMCOORDS.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.XFORMCOORDS.cs
index 1c2813fb925..8faaad9c57a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.XFORMCOORDS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.XFORMCOORDS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Ole32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.DISPATCH.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.DISPATCH.cs
index c376c9622c1..4557fb56350 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.DISPATCH.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.DISPATCH.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Oleaut32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.EXCEPINFO.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.EXCEPINFO.cs
index febba782a4e..2e5a7d62a59 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.EXCEPINFO.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.EXCEPINFO.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Oleaut32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.FADF.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.FADF.cs
index 64e91a6d4d6..edb4a345452 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.FADF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.FADF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Oleaut32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IDispatch.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IDispatch.cs
index d5e0a46a2ff..bcf5d874ed5 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IDispatch.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IDispatch.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
using static Interop.Kernel32;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IEnumVariant.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IEnumVariant.cs
index 03bb33af603..2fa9ed985aa 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IEnumVariant.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IEnumVariant.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IErrorInfo.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IErrorInfo.cs
index 955475b158b..273282b5a5e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IErrorInfo.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IErrorInfo.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IErrorLog.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IErrorLog.cs
index 7b60c43c893..1bbe6732a85 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IErrorLog.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IErrorLog.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IExtender.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IExtender.cs
index 39e6ac8e697..71858e7a682 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IExtender.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IExtender.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IPerPropertyBrowsing.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IPerPropertyBrowsing.cs
index 45da2c7d4a3..4685c4431f2 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IPerPropertyBrowsing.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IPerPropertyBrowsing.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
using static Interop.Ole32;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IPersistPropertyBag.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IPersistPropertyBag.cs
index 4c44c9e06f1..6b63a952b69 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IPersistPropertyBag.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IPersistPropertyBag.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IPropertyBag.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IPropertyBag.cs
index 0588edc364e..3d4d6063ba9 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IPropertyBag.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IPropertyBag.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IProvideMultipleClassInfo.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IProvideMultipleClassInfo.cs
index 12112fed568..67adc503d6e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IProvideMultipleClassInfo.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IProvideMultipleClassInfo.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IRecordInfo.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IRecordInfo.cs
index d744757502b..288d5a4368c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IRecordInfo.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.IRecordInfo.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.ISupportErrorInfo.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.ISupportErrorInfo.cs
index 884f201d960..9a261607248 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.ISupportErrorInfo.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.ISupportErrorInfo.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.ITypeInfo.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.ITypeInfo.cs
index 462b9e02ef1..aa9c53a3643 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.ITypeInfo.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.ITypeInfo.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.LoadRegTypeLib.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.LoadRegTypeLib.cs
index 003745e1933..fa8c5c6c21d 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.LoadRegTypeLib.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.LoadRegTypeLib.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.ComTypes;
using System.Runtime.Versioning;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.MULTICLASSINFO.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.MULTICLASSINFO.cs
index 67ef95c1355..71d2655886e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.MULTICLASSINFO.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.MULTICLASSINFO.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Oleaut32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.OCPFIPARAMS.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.OCPFIPARAMS.cs
index dce4664ee1d..42f7d9d3cdc 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.OCPFIPARAMS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.OCPFIPARAMS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Oleaut32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.OleCreateFontIndirect.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.OleCreateFontIndirect.cs
index 670a19b1a7f..e1d89a0b621 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.OleCreateFontIndirect.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.OleCreateFontIndirect.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.OleCreatePropertyFrame.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.OleCreatePropertyFrame.cs
index 12c4259bee8..f2dcf48d601 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.OleCreatePropertyFrame.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.OleCreatePropertyFrame.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
using static Interop.Kernel32;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.SAFEARRAY.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.SAFEARRAY.cs
index 3b567787c17..5f91af16e2f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.SAFEARRAY.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.SAFEARRAY.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.CompilerServices;
using static Interop.Ole32;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.SysFreeString.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.SysFreeString.cs
index eaefc57a205..5ac81a0ef0d 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.SysFreeString.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.SysFreeString.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.VARIANT.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.VARIANT.cs
index 985afc84152..9ca15b7e4e4 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.VARIANT.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.VARIANT.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Diagnostics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.VARIANTVector.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.VARIANTVector.cs
index 56eac23e37e..f09cb4af602 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.VARIANTVector.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.VARIANTVector.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.VarFormat.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.VarFormat.cs
index 4b37765764b..b4e31e1a472 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.VarFormat.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.VarFormat.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.VarFormatOptions.cs b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.VarFormatOptions.cs
index 97b02388f16..0ba7c1380a7 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.VarFormatOptions.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.VarFormatOptions.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal partial class Oleaut32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Oleacc/Interop.LresultFromObject.cs b/src/System.Windows.Forms.Primitives/src/Interop/Oleacc/Interop.LresultFromObject.cs
index 8e9b2a6344e..80f1b6fc071 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Oleacc/Interop.LresultFromObject.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Oleacc/Interop.LresultFromObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.CFE.cs b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.CFE.cs
index 7f4d7a3dacb..ee5f90a4c1f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.CFE.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.CFE.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Richedit
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.CFM.cs b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.CFM.cs
index b7bc8df8ceb..82978cec0ab 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.CFM.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.CFM.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Richedit
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.CHARFORMAT2W.cs b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.CHARFORMAT2W.cs
index a422d3c8638..3d44da45388 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.CHARFORMAT2W.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.CHARFORMAT2W.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ECO.cs b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ECO.cs
index d05f2fa5220..38a09471e4c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ECO.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ECO.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Richedit
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.EDITSTREAM.cs b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.EDITSTREAM.cs
index b15cf71481f..ab66c7be9ae 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.EDITSTREAM.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.EDITSTREAM.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.EDITSTREAMCALLBACK.cs b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.EDITSTREAMCALLBACK.cs
index 15bf8c6b998..fbdb99ed891 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.EDITSTREAMCALLBACK.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.EDITSTREAMCALLBACK.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Richedit
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ENDROPFILES.cs b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ENDROPFILES.cs
index 4004046a05a..2cc5ab5cd30 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ENDROPFILES.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ENDROPFILES.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Richedit
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ENM.cs b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ENM.cs
index b5ae551ab60..c509b25f7fb 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ENM.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ENM.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Richedit
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ES.cs b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ES.cs
index d534b8d51c4..89cf1dcd2a6 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ES.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ES.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Richedit
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.GETTEXTEX.cs b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.GETTEXTEX.cs
index a2e8220ae28..d0a517dd839 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.GETTEXTEX.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.GETTEXTEX.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.GT.cs b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.GT.cs
index 65a65e40a3d..d3a78e2ac00 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.GT.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.GT.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Richedit
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.GTL.cs b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.GTL.cs
index a5cbf3a6af5..21e5eebc5bb 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.GTL.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.GTL.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Richedit
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.IRichEditOleCallback.cs b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.IRichEditOleCallback.cs
index 47fa672535d..18a16b9484e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.IRichEditOleCallback.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.IRichEditOleCallback.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.ComTypes;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ITextDocument.cs b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ITextDocument.cs
index b67906be02b..13a438a3338 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ITextDocument.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ITextDocument.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ITextRange.cs b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ITextRange.cs
index 6b14adf66ca..fc75cb29e11 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ITextRange.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.ITextRange.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.PFM.cs b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.PFM.cs
index ffd8382e82e..59f1b8e4d44 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.PFM.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.PFM.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Richedit
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.SCF.cs b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.SCF.cs
index e26f2198b17..df2022858f8 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.SCF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.SCF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Richedit
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.SEL.cs b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.SEL.cs
index 58828449681..9527453da54 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.SEL.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.SEL.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Richedit
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.SF.cs b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.SF.cs
index f9f02d88b32..257f2074acf 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.SF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.SF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Richedit
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.TEXTRANGE.cs b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.TEXTRANGE.cs
index 041d1a4e33b..4b9a8f29dad 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.TEXTRANGE.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.TEXTRANGE.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Richedit
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/SHCore/Interop.GetProcessDpiAwareness.cs b/src/System.Windows.Forms.Primitives/src/Interop/SHCore/Interop.GetProcessDpiAwareness.cs
index efd4d75d394..0e42a654fcc 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/SHCore/Interop.GetProcessDpiAwareness.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/SHCore/Interop.GetProcessDpiAwareness.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.AUTOCOMPLETEOPTIONS.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.AUTOCOMPLETEOPTIONS.cs
index 1b252832604..6f48f46a0fa 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.AUTOCOMPLETEOPTIONS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.AUTOCOMPLETEOPTIONS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Shell32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.DragAcceptFiles.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.DragAcceptFiles.cs
index 553c77816ea..4cb8b6cb574 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.DragAcceptFiles.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.DragAcceptFiles.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.DragQueryFileW.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.DragQueryFileW.cs
index aaf9341030c..d9272e898a5 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.DragQueryFileW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.DragQueryFileW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
using System.Text;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.FOS.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.FOS.cs
index 7a3aab2a0b4..fe8ec80421a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.FOS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.FOS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Shell32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.GETPROPERTYSTOREFLAGS.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.GETPROPERTYSTOREFLAGS.cs
index 302bd936e10..dfe149daa91 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.GETPROPERTYSTOREFLAGS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.GETPROPERTYSTOREFLAGS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Shell32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IAutoComplete2.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IAutoComplete2.cs
index 214aec9321e..90c48475c28 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IAutoComplete2.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IAutoComplete2.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.ComTypes;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IFileDialog.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IFileDialog.cs
index def2238b732..08a6709eb08 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IFileDialog.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IFileDialog.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IFileDialogCustomize.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IFileDialogCustomize.cs
index 5254a142448..668b8a05a0b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IFileDialogCustomize.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IFileDialogCustomize.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IFileDialogEvents.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IFileDialogEvents.cs
index 26a779e65d9..3f2a3ee657c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IFileDialogEvents.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IFileDialogEvents.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IFileOpenDialog.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IFileOpenDialog.cs
index 9d1019cdfba..0588234e2e5 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IFileOpenDialog.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IFileOpenDialog.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IFileSaveDialog.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IFileSaveDialog.cs
index d26b5b980e5..38fc234dbed 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IFileSaveDialog.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IFileSaveDialog.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IShellItem.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IShellItem.cs
index 82092aadfe9..2c58656ab30 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IShellItem.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IShellItem.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IShellItemArray.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IShellItemArray.cs
index d06775e2e8f..c3349e6e6ec 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IShellItemArray.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IShellItemArray.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.NIF.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.NIF.cs
index f696f53f0e2..cb6679da267 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.NIF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.NIF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Shell32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.NIIF.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.NIIF.cs
index 7991be06fcb..bd55c5255bd 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.NIIF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.NIIF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Shell32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.NOTIFYICONDATAW.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.NOTIFYICONDATAW.cs
index 466dfa1b52c..313e9d1f4d1 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.NOTIFYICONDATAW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.NOTIFYICONDATAW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.PROPERTYKEY.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.PROPERTYKEY.cs
index 671f871a470..1974c6749bf 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.PROPERTYKEY.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.PROPERTYKEY.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Shell32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SFGAOF.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SFGAOF.cs
index 7b278ebe5d2..6cb016f13b0 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SFGAOF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SFGAOF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class Shell32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHBrowseForFolder.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHBrowseForFolder.cs
index ff14b01570d..ef12660ba46 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHBrowseForFolder.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHBrowseForFolder.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
using Microsoft.Win32.SafeHandles;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHCreateItemFromParsingName.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHCreateItemFromParsingName.cs
index e0a18563b53..1265c78a6ce 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHCreateItemFromParsingName.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHCreateItemFromParsingName.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHCreateShellItem.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHCreateShellItem.cs
index 43d5d2516c5..2dc6fe4bc4f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHCreateShellItem.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHCreateShellItem.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-using System.IO;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHGetKnownFolderPath.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHGetKnownFolderPath.cs
index b25cf59e857..1aa1c0f2181 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHGetKnownFolderPath.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHGetKnownFolderPath.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHGetPathFromIDListLongPath.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHGetPathFromIDListLongPath.cs
index c8b338eeb82..a1a713ef0bb 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHGetPathFromIDListLongPath.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHGetPathFromIDListLongPath.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHGetSpecialFolderLocation.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHGetSpecialFolderLocation.cs
index 1ea0e06d5cd..0d6f569e0fa 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHGetSpecialFolderLocation.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHGetSpecialFolderLocation.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
using Microsoft.Win32.SafeHandles;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHParseDisplayName.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHParseDisplayName.cs
index 380c7868ed4..289eb2f835f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHParseDisplayName.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHParseDisplayName.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.ShellExecuteW.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.ShellExecuteW.cs
index 62541528596..47f26da7424 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.ShellExecuteW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.ShellExecuteW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shlwapi/Interop.SHACF.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shlwapi/Interop.SHACF.cs
index 355d5d1d4ee..3a921335f8c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shlwapi/Interop.SHACF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shlwapi/Interop.SHACF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class Shlwapi
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shlwapi/Interop.SHAutoComplete.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shlwapi/Interop.SHAutoComplete.cs
index a50ddb7f826..16f97faa094 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shlwapi/Interop.SHAutoComplete.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shlwapi/Interop.SHAutoComplete.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Shlwapi/Interop.SHLoadIndirectString.cs b/src/System.Windows.Forms.Primitives/src/Interop/Shlwapi/Interop.SHLoadIndirectString.cs
index 0c9aa735938..43919239511 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/Shlwapi/Interop.SHLoadIndirectString.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/Shlwapi/Interop.SHLoadIndirectString.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
using System.Text;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/TrailingArray.cs b/src/System.Windows.Forms.Primitives/src/Interop/TrailingArray.cs
index 69d9ecd5e0b..f3ea59ead51 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/TrailingArray.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/TrailingArray.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.CompilerServices;
///
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IAccessibleEx.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IAccessibleEx.cs
index a21684a95a5..a37449f6a76 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IAccessibleEx.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IAccessibleEx.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IAccessibleInternal.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IAccessibleInternal.cs
index e5e6d13ed02..192feef23be 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IAccessibleInternal.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IAccessibleInternal.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IExpandCollapseProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IExpandCollapseProvider.cs
index 10307ef3fd6..7c06dc35e1c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IExpandCollapseProvider.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IExpandCollapseProvider.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IGridItemProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IGridItemProvider.cs
index 689f3a5510b..225767afb91 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IGridItemProvider.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IGridItemProvider.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IGridProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IGridProvider.cs
index 405ef14e450..a2f29e3a7e9 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IGridProvider.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IGridProvider.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IInvokeProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IInvokeProvider.cs
index a38e22252c9..466e4430d70 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IInvokeProvider.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IInvokeProvider.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ILegacyIAccessibleProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ILegacyIAccessibleProvider.cs
index 12c15919bbc..c07ed0e1115 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ILegacyIAccessibleProvider.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ILegacyIAccessibleProvider.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
using Accessibility;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRangeValueProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRangeValueProvider.cs
index 6afe0eeeb03..0eb08d8c634 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRangeValueProvider.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRangeValueProvider.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderFragment.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderFragment.cs
index 12db7c6d4f4..575a64a0fbb 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderFragment.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderFragment.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderFragmentRoot.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderFragmentRoot.cs
index a4be98e1e46..b97940629ed 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderFragmentRoot.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderFragmentRoot.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderHwndOverride.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderHwndOverride.cs
index 4ca25ba9d33..dae80d8df6f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderHwndOverride.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderHwndOverride.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderSimple.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderSimple.cs
index 1879c4ec3f3..3197dc8820d 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderSimple.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderSimple.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IScrollItemProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IScrollItemProvider.cs
index 8303f341802..d961e1dbaa2 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IScrollItemProvider.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IScrollItemProvider.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ISelectionItemProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ISelectionItemProvider.cs
index e615f92ca72..4eb29591ca4 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ISelectionItemProvider.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ISelectionItemProvider.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ISelectionProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ISelectionProvider.cs
index c3b8df97666..93b1e4212ba 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ISelectionProvider.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ISelectionProvider.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ITableItemProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ITableItemProvider.cs
index 7d470da0364..5f226646c55 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ITableItemProvider.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ITableItemProvider.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ITableProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ITableProvider.cs
index 4934af44690..da820794c4c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ITableProvider.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ITableProvider.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IToggleProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IToggleProvider.cs
index c0a91cb023a..981b56a80f0 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IToggleProvider.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IToggleProvider.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IValueProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IValueProvider.cs
index 272c4fbce1a..f266a72098f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IValueProvider.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IValueProvider.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ProviderOptions.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ProviderOptions.cs
index 53006f5949f..d53b8db2fbf 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ProviderOptions.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ProviderOptions.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class UiaCore
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.RowOrColumnMajor.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.RowOrColumnMajor.cs
index 7c17f013ddd..9c36875df60 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.RowOrColumnMajor.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.RowOrColumnMajor.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class UiaCore
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.SupportedTextSelection.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.SupportedTextSelection.cs
index e9d9050a308..0eec713cd7d 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.SupportedTextSelection.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.SupportedTextSelection.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class UiaCore
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ToggleState.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ToggleState.cs
index 1b5a3e25015..7dcfa4a5695 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ToggleState.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ToggleState.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class UiaCore
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaHostProviderFromHwnd.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaHostProviderFromHwnd.cs
index 374bafeed57..80922b0bf64 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaHostProviderFromHwnd.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaHostProviderFromHwnd.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaReturnRawElementProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaReturnRawElementProvider.cs
index bb91d0041e9..b514287c5c3 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaReturnRawElementProvider.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaReturnRawElementProvider.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.AcceleratorFlags.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.AcceleratorFlags.cs
index f4dc96f230b..437579b8498 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.AcceleratorFlags.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.AcceleratorFlags.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ActivateKeyboardLayout.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ActivateKeyboardLayout.cs
index 3b0949267df..5de537019e2 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ActivateKeyboardLayout.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ActivateKeyboardLayout.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.AreDpiAwarenessContextsEqual.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.AreDpiAwarenessContextsEqual.cs
index 232bb625fa7..5f42771aacf 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.AreDpiAwarenessContextsEqual.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.AreDpiAwarenessContextsEqual.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.Atom.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.Atom.cs
index d16e4988604..2cd475e99fe 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.Atom.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.Atom.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
///
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.BDR.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.BDR.cs
index f2830366702..eefe254773f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.BDR.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.BDR.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.BF.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.BF.cs
index 818134a43c8..040647b8774 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.BF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.BF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.BS.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.BS.cs
index aea9117bd58..80cb1fe8984 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.BS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.BS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.BeginPaint.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.BeginPaint.cs
index be3831cbe3a..ad986921886 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.BeginPaint.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.BeginPaint.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.BeginPaintScope.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.BeginPaintScope.cs
index 7747aa02a75..ce53af253b9 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.BeginPaintScope.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.BeginPaintScope.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CBS.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CBS.cs
index e1db14981a6..39077b7f51a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CBS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CBS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CLIENTCREATESTRUCT.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CLIENTCREATESTRUCT.cs
index 42eb1119759..b0a37db30f9 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CLIENTCREATESTRUCT.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CLIENTCREATESTRUCT.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.COPYDATASTRUCT.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.COPYDATASTRUCT.cs
index fc99800b2bf..7ce842c860f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.COPYDATASTRUCT.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.COPYDATASTRUCT.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CS.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CS.cs
index 097234ce981..d962ee4dd86 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CWP.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CWP.cs
index 1cae8145674..aaec4828ec6 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CWP.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CWP.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CallNextHookEx.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CallNextHookEx.cs
index 1514395560a..bcfca666fb9 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CallNextHookEx.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CallNextHookEx.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CallWindowProcW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CallWindowProcW.cs
index 0870c0302b9..a5289786704 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CallWindowProcW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CallWindowProcW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ChildWindowFromPointEx.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ChildWindowFromPointEx.cs
index c06486f99fd..caa813836bd 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ChildWindowFromPointEx.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ChildWindowFromPointEx.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ClientToScreen.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ClientToScreen.cs
index f500743884d..f157c464eba 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ClientToScreen.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ClientToScreen.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CloseDesktop.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CloseDesktop.cs
index 0c122254d85..fd91eab768e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CloseDesktop.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CloseDesktop.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CopyImage.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CopyImage.cs
index eb289a39209..5b00a9f1f20 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CopyImage.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CopyImage.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CreateAcceleratorTableW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CreateAcceleratorTableW.cs
index bf2a6882fa6..9dc930f1270 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CreateAcceleratorTableW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CreateAcceleratorTableW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CreateMenu.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CreateMenu.cs
index 3cb38ca2fe0..227535bb324 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CreateMenu.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CreateMenu.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CreatePopupMenu.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CreatePopupMenu.cs
index 0073e0ccc36..b7b3b6d03b3 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CreatePopupMenu.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CreatePopupMenu.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CreateWindowExW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CreateWindowExW.cs
index 83091eb91fc..3dc23a18c79 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CreateWindowExW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.CreateWindowExW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DCX.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DCX.cs
index 15cd5f55f54..a2da4cae69f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DCX.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DCX.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DESKTOP.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DESKTOP.cs
index 8f061cacad9..266e03a88cd 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DESKTOP.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DESKTOP.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DF.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DF.cs
index 1fad037147e..66743c50933 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DFCS.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DFCS.cs
index 7c64712190a..58382f4f2ef 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DFCS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DFCS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DLGC.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DLGC.cs
index 55ab00b5a04..cbe363124c6 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DLGC.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DLGC.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DM.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DM.cs
index 438335cc38e..93544f91de3 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DM.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DM.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DPI_AWARENESS_CONTEXT.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DPI_AWARENESS_CONTEXT.cs
index a3c22099cbf..8d4ec6ac89a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DPI_AWARENESS_CONTEXT.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DPI_AWARENESS_CONTEXT.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DRAWITEMSTRUCT.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DRAWITEMSTRUCT.cs
index a3ac5bfa99a..9302e413a0d 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DRAWITEMSTRUCT.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DRAWITEMSTRUCT.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DT.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DT.cs
index 252d1e7101c..d4ee79f2fdf 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DT.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DT.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DefFrameProcW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DefFrameProcW.cs
index 2af1ed76b7d..8348ec449aa 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DefFrameProcW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DefFrameProcW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DefMDIChildProcW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DefMDIChildProcW.cs
index 450c3e51056..04bc6bbb938 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DefMDIChildProcW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DefMDIChildProcW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DefWindowProcW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DefWindowProcW.cs
index ec2ca492d47..0609958f000 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DefWindowProcW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DefWindowProcW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyAcceleratorTable.cs.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyAcceleratorTable.cs.cs
index 530d2a272fb..167c1a902c9 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyAcceleratorTable.cs.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyAcceleratorTable.cs.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyCursor.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyCursor.cs
index 71e5836476b..3fdd577b27d 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyCursor.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyCursor.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyIcon.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyIcon.cs
index d3f5da2479e..ec3904942b1 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyIcon.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyIcon.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyMenu.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyMenu.cs
index 8641e30cea9..00cbecaac87 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyMenu.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyMenu.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyWindow.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyWindow.cs
index 838882bc3ef..95cafdc09b3 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyWindow.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DestroyWindow.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DispatchMessage.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DispatchMessage.cs
index d3d2e4d2566..f8b65c95e89 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DispatchMessage.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DispatchMessage.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DrawIcon.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DrawIcon.cs
index 313f28c4035..8b6a53d42f3 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DrawIcon.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DrawIcon.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DrawIconEx.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DrawIconEx.cs
index 1ec8093d497..6140eaf88ae 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DrawIconEx.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DrawIconEx.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DrawMenuBar.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DrawMenuBar.cs
index 4a8d08c2d48..8ee02a90295 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DrawMenuBar.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DrawMenuBar.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DrawTextEx.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DrawTextEx.cs
index 783d2be74cd..e7d68ccbb1c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DrawTextEx.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.DrawTextEx.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EC.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EC.cs
index bd7877443b7..e407cfe2c74 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EC.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EC.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EDGE.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EDGE.cs
index 4ed40113ec9..ffee64b1414 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EDGE.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EDGE.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EN.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EN.cs
index 90872d3ed83..f95fd116666 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EN.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EN.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ES.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ES.cs
index cde887982d7..2314223c759 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ES.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ES.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ESB.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ESB.cs
index 986d9adaed2..01f41e5c0dc 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ESB.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ESB.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EVENTMSG.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EVENTMSG.cs
index 7ca71702075..50333a95dc0 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EVENTMSG.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EVENTMSG.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EXTLOGFONTW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EXTLOGFONTW.cs
index 2703175e365..28223153e33 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EXTLOGFONTW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EXTLOGFONTW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnableMenuItem.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnableMenuItem.cs
index f85a237e545..22a3e2687f0 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnableMenuItem.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnableMenuItem.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnableScrollBar.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnableScrollBar.cs
index 59d7abc1d27..28340f0fe29 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnableScrollBar.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnableScrollBar.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnableWindow.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnableWindow.cs
index 6b155f225c7..edbafbde1a1 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnableWindow.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnableWindow.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EndDialog.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EndDialog.cs
index cebeaa2e63f..62f5fe5131c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EndDialog.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EndDialog.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EndPaint.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EndPaint.cs
index 9897f16a272..2daa82a9067 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EndPaint.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EndPaint.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnumChildWindows.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnumChildWindows.cs
index d20aab40a45..a006a49d829 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnumChildWindows.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnumChildWindows.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnumDisplayMonitors.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnumDisplayMonitors.cs
index f3f6335b0d4..86bfc6b26ba 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnumDisplayMonitors.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnumDisplayMonitors.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnumThreadWindows.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnumThreadWindows.cs
index 77765a60823..65d9b0e6d31 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnumThreadWindows.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnumThreadWindows.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnumWindows.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnumWindows.cs
index d14325980b2..7a911985f07 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnumWindows.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.EnumWindows.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.FillRect.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.FillRect.cs
index e567b30e9e7..1d166b346ff 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.FillRect.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.FillRect.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.FindWindowW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.FindWindowW.cs
index 4ab62744d83..8674e2bbac9 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.FindWindowW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.FindWindowW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GWL.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GWL.cs
index 5a682d62ba6..d349dd96c5f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GWL.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GWL.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetActiveWindow.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetActiveWindow.cs
index df520240daa..096514afae0 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetActiveWindow.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetActiveWindow.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetAncestor.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetAncestor.cs
index e2f10f14c18..ee953586bbb 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetAncestor.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetAncestor.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetAwarenessFromDpiAwarenessContext.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetAwarenessFromDpiAwarenessContext.cs
index d7d42948a43..8614dfb3e3a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetAwarenessFromDpiAwarenessContext.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetAwarenessFromDpiAwarenessContext.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetCapture.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetCapture.cs
index e4918329589..3045cb5a051 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetCapture.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetCapture.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetClassLong.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetClassLong.cs
index a9f2888269d..b89fec35f83 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetClassLong.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetClassLong.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetClientRect.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetClientRect.cs
index 0ce8bad7b68..eee0fe35592 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetClientRect.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetClientRect.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetClipboardFormatNameW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetClipboardFormatNameW.cs
index db7a4ee799d..febc2eab84a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetClipboardFormatNameW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetClipboardFormatNameW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetCursor.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetCursor.cs
index e85edc1d055..879072f2e93 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetCursor.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetCursor.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDC.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDC.cs
index a7635d766a7..8dd4f2dc8a6 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDC.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDC.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDCEx.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDCEx.cs
index 452b1dfd5ef..67932943281 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDCEx.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDCEx.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDcScope.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDcScope.cs
index 7fad991e059..52656044cc2 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDcScope.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDcScope.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDesktopWindow.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDesktopWindow.cs
index 76faf52fa0b..71f8b2d9edc 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDesktopWindow.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDesktopWindow.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDlgItem.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDlgItem.cs
index 69eeee4c6f1..bea80b4b560 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDlgItem.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDlgItem.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDlgItemInt.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDlgItemInt.cs
index 731ca357fcb..73d295dbab6 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDlgItemInt.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDlgItemInt.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDpiForWindow.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDpiForWindow.cs
index 8e1b6c9adee..92a77ac7835 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDpiForWindow.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetDpiForWindow.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetFocus.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetFocus.cs
index d7fea9a238f..fb350fd3f44 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetFocus.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetFocus.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetForegroundWindow.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetForegroundWindow.cs
index 439e732a404..e1bf5a0b147 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetForegroundWindow.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetForegroundWindow.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetGuiResources.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetGuiResources.cs
index c8e09d997a7..96cbf47be5f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetGuiResources.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetGuiResources.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Runtime.InteropServices;
-using System;
internal static partial class Interop
{
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetIconInfo.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetIconInfo.cs
index 2edfeb048ac..9e7cdfacae2 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetIconInfo.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetIconInfo.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetKeyboardLayout.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetKeyboardLayout.cs
index 5d9f67e918b..a629d4183d2 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetKeyboardLayout.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetKeyboardLayout.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetKeyboardLayoutList.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetKeyboardLayoutList.cs
index 825f84866e1..707784a0a92 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetKeyboardLayoutList.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetKeyboardLayoutList.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMenu.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMenu.cs
index 0f0216b2dd9..b32f3ee5fc8 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMenu.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMenu.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMenuItemCount.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMenuItemCount.cs
index f9a8ef01e54..ffa4423288c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMenuItemCount.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMenuItemCount.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMenuItemID.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMenuItemID.cs
index 46a65d700b4..3b759f7db5f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMenuItemID.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMenuItemID.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMenuItemInfoW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMenuItemInfoW.cs
index 1a1ba727e72..6b40f86a0ce 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMenuItemInfoW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMenuItemInfoW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMessage.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMessage.cs
index e51eef94038..a8b0d1e3354 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMessage.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMessage.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMonitorInfoW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMonitorInfoW.cs
index 0543fed59b5..2fdcfd16cfa 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMonitorInfoW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetMonitorInfoW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetParent.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetParent.cs
index 5bbe55c0f7f..a9482b70d1c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetParent.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetParent.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetProcessWindowStation.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetProcessWindowStation.cs
index e265c63e01a..012826584e8 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetProcessWindowStation.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetProcessWindowStation.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetScrollInfo.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetScrollInfo.cs
index 46b2aecf4db..02dff402b24 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetScrollInfo.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetScrollInfo.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetSubMenu.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetSubMenu.cs
index 43be071c4d0..477be09b8be 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetSubMenu.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetSubMenu.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetSystemMenu.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetSystemMenu.cs
index b5426dfb454..fa7eac744d1 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetSystemMenu.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetSystemMenu.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetThreadDpiAwarenessContext.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetThreadDpiAwarenessContext.cs
index ddeed3c01c7..91bebc1fbb0 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetThreadDpiAwarenessContext.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetThreadDpiAwarenessContext.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetUpdateRect.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetUpdateRect.cs
index 021efd30cd0..4d84b930fc5 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetUpdateRect.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetUpdateRect.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetUpdateRgn.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetUpdateRgn.cs
index c610ce3ad63..4ea4efc915c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetUpdateRgn.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetUpdateRgn.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetUserObjectInformationW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetUserObjectInformationW.cs
index 6f4f532b6c2..d63c6ef2cab 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetUserObjectInformationW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetUserObjectInformationW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindow.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindow.cs
index 109d78cb632..91283f7e8af 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindow.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindow.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowDpiAwarenessContext.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowDpiAwarenessContext.cs
index 9c227d0e2ab..c57c6890bc5 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowDpiAwarenessContext.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowDpiAwarenessContext.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowLong.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowLong.cs
index 53b8b5713c5..78777576a1b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowLong.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowLong.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowPlacement.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowPlacement.cs
index 81b7bcaa441..376e5c947d3 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowPlacement.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowPlacement.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowRect.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowRect.cs
index ba9f107f167..63bfc0cafc0 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowRect.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowRect.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowRgn.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowRgn.cs
index 58b2f11242a..9a3d787730e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowRgn.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowRgn.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowText.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowText.cs
index 6ae3a8104ce..ab7cf3f0e63 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowText.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowText.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Buffers;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowThreadProcessId.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowThreadProcessId.cs
index b345d49c6a9..feb009da0b9 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowThreadProcessId.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.GetWindowThreadProcessId.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.HELPINFO.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.HELPINFO.cs
index 32643d4a3b8..9bd845b2e41 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.HELPINFO.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.HELPINFO.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.HIGHCONTRASTW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.HIGHCONTRASTW.cs
index a277ecc00e3..3deb2d78b2a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.HIGHCONTRASTW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.HIGHCONTRASTW.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.HOOKPROC.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.HOOKPROC.cs
index 464481a19c6..c977f93f22c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.HOOKPROC.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.HOOKPROC.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.HideCaret.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.HideCaret.cs
index 9b0309ab24c..0d0f2a1f4af 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.HideCaret.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.HideCaret.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.InvalidateRect.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.InvalidateRect.cs
index c8c5765bd42..7729ea2a298 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.InvalidateRect.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.InvalidateRect.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.InvalidateRgn.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.InvalidateRgn.cs
index 456f98abfbb..74871ed5bd0 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.InvalidateRgn.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.InvalidateRgn.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsChild.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsChild.cs
index 3deba81102b..40df29abee3 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsChild.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsChild.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsDialogMessageW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsDialogMessageW.cs
index 43804568222..4f627e7d083 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsDialogMessageW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsDialogMessageW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsValidDpiAwarenessContext.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsValidDpiAwarenessContext.cs
index 7b7f70358d6..dafce1d14a0 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsValidDpiAwarenessContext.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsValidDpiAwarenessContext.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsWindow.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsWindow.cs
index 39bbf4df91e..b6b65685b2a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsWindow.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsWindow.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsWindowEnabled.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsWindowEnabled.cs
index 252b6043941..3c165996bf2 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsWindowEnabled.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsWindowEnabled.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsWindowUnicode.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsWindowUnicode.cs
index ed1a983f98c..32073edb1d9 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsWindowUnicode.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsWindowUnicode.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsWindowVisible.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsWindowVisible.cs
index 5e459fa0349..c083fc20a0e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsWindowVisible.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsWindowVisible.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsZoomed.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsZoomed.cs
index 490fe857f1b..4c21cf5455b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsZoomed.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.IsZoomed.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.KEYBDINPUT.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.KEYBDINPUT.cs
index 818dd3831b8..618146989f4 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.KEYBDINPUT.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.KEYBDINPUT.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.KEYEVENTF.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.KEYEVENTF.cs
index 8cb40be9beb..41595256c8f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.KEYEVENTF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.KEYEVENTF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.KillTimer.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.KillTimer.cs
index 8dd7af78eaa..420cf47432a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.KillTimer.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.KillTimer.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.LBS.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.LBS.cs
index 2b42a5bebf5..9c8a64c1ce4 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.LBS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.LBS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.LOGFONTW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.LOGFONTW.cs
index 824216645c6..f6b37c6cb85 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.LOGFONTW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.LOGFONTW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.LWA.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.LWA.cs
index 6e79c6ebecb..44005ee0337 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.LWA.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.LWA.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.LoadCursorW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.LoadCursorW.cs
index e95d26edf2d..2ac10417ddf 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.LoadCursorW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.LoadCursorW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MB.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MB.cs
index 093b6f524fe..8454c0fe3eb 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MB.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MB.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MDITILE.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MDITILE.cs
index af5ed3fa79e..1166ee59e09 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MDITILE.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MDITILE.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MEASUREITEMSTRUCT.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MEASUREITEMSTRUCT.cs
index 16debf3b1f4..92ef4a70ac3 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MEASUREITEMSTRUCT.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MEASUREITEMSTRUCT.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MENUITEMINFOW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MENUITEMINFOW.cs
index 0b00f0df214..baf361b1da1 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MENUITEMINFOW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MENUITEMINFOW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MF.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MF.cs
index d35bd253fb0..551373ac462 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MFS.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MFS.cs
index 5034b2a5f68..d1d90c6d13c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MFS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MFS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MFT.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MFT.cs
index f0e0bc0e840..83952353651 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MFT.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MFT.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MIIM.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MIIM.cs
index de1afe4d4c5..1c4fbb10284 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MIIM.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MIIM.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MK.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MK.cs
index b94af173d23..87eab362ae9 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MK.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MK.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MONITORENUMPROC.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MONITORENUMPROC.cs
index d345032595b..b708e8b9b3d 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MONITORENUMPROC.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MONITORENUMPROC.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MONITORINFOF.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MONITORINFOF.cs
index 5cae2195895..f5e9103aa6b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MONITORINFOF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MONITORINFOF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MOUSEEVENTF.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MOUSEEVENTF.cs
index 40955b96df1..16b984d9a21 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MOUSEEVENTF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MOUSEEVENTF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MOUSEHOOKSTRUCT.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MOUSEHOOKSTRUCT.cs
index 68cf2562b25..2d3c27ae869 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MOUSEHOOKSTRUCT.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MOUSEHOOKSTRUCT.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MOUSEINPUT.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MOUSEINPUT.cs
index 1b9fbfff692..1ee0fb9e50d 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MOUSEINPUT.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MOUSEINPUT.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MSG.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MSG.cs
index a60dbcb1d0a..98853a205dd 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MSG.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MSG.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MWMO.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MWMO.cs
index a64d8d09ebf..ecf4943b951 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MWMO.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MWMO.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MapWindowPoints.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MapWindowPoints.cs
index b3c3288441e..325c8fdb1e2 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MapWindowPoints.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MapWindowPoints.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MessageBoxW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MessageBoxW.cs
index 2c4f3ebd34b..13429015a3f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MessageBoxW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MessageBoxW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MonitorFromPoint.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MonitorFromPoint.cs
index b213be381bb..cd8f9df5825 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MonitorFromPoint.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MonitorFromPoint.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MonitorFromRect.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MonitorFromRect.cs
index 9859a9f81d9..c0a25911d20 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MonitorFromRect.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MonitorFromRect.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MonitorFromWindow.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MonitorFromWindow.cs
index d8b40ec87d5..92f7a16c879 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MonitorFromWindow.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MonitorFromWindow.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MsgWaitForMultipleObjectsEx.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MsgWaitForMultipleObjectsEx.cs
index 18d0c8aef20..a51006e6931 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MsgWaitForMultipleObjectsEx.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.MsgWaitForMultipleObjectsEx.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.NMHDR.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.NMHDR.cs
index 249c1df1b97..ac280f4f6b8 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.NMHDR.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.NMHDR.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ODA.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ODA.cs
index 88f471d9b87..5482e01572b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ODA.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ODA.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ODS.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ODS.cs
index c6211f1d6f8..a2a8565e786 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ODS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ODS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.OpenInputDesktop.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.OpenInputDesktop.cs
index 78d9df87998..1c63ea53386 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.OpenInputDesktop.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.OpenInputDesktop.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.PAINTSTRUCT.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.PAINTSTRUCT.cs
index e0a331ef64f..ffecb295edc 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.PAINTSTRUCT.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.PAINTSTRUCT.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.PRF.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.PRF.cs
index 46c2a8c489b..23972109566 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.PRF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.PRF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.PeekMessageW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.PeekMessageW.cs
index 473afcae685..9b574afb999 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.PeekMessageW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.PeekMessageW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.PostMessageW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.PostMessageW.cs
index 311330a037e..71579fcd426 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.PostMessageW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.PostMessageW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.PostThreadMessageW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.PostThreadMessageW.cs
index d3df8cf8a2a..7fcd10b7767 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.PostThreadMessageW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.PostThreadMessageW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.QS.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.QS.cs
index e77338d30fd..4453b21ede9 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.QS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.QS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.RedrawWindow.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.RedrawWindow.cs
index b237c936a2a..4c2cded7665 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.RedrawWindow.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.RedrawWindow.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ReleaseDC.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ReleaseDC.cs
index 57d5968d1ac..79b7bfb09c9 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ReleaseDC.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ReleaseDC.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.RemoveMenuItem.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.RemoveMenuItem.cs
index 9b1e4d73fc1..0a9c224d19d 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.RemoveMenuItem.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.RemoveMenuItem.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SBS.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SBS.cs
index aaa5ce9efb8..670ba290b5f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SBS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SBS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SIF.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SIF.cs
index 5ff05572583..680906e47f3 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SIF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SIF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SS.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SS.cs
index d6a8bd24a3e..3aead23e85d 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SW.cs
index ea2daa35a4a..4e1465e29b9 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SW.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SWP.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SWP.cs
index 5ac148d9b73..63c4fc1208e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SWP.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SWP.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ScreenToClient.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ScreenToClient.cs
index 9cabbca2684..18a996f90a7 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ScreenToClient.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ScreenToClient.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ScrollSW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ScrollSW.cs
index 3df0873eada..ec7facffc87 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ScrollSW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ScrollSW.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ScrollWindow.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ScrollWindow.cs
index 549d4e2bf9d..289a656dae7 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ScrollWindow.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ScrollWindow.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ScrollWindowEx.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ScrollWindowEx.cs
index 121c14bb303..53a92acbe27 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ScrollWindowEx.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ScrollWindowEx.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SendDlgItemMessageW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SendDlgItemMessageW.cs
index fd80e0cfa56..53406f86a9a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SendDlgItemMessageW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SendDlgItemMessageW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SendInput.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SendInput.cs
index 7ee36a5263c..088b6621fb7 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SendInput.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SendInput.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SendMessageTimeoutW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SendMessageTimeoutW.cs
index ef42c440a6c..c02f923bb15 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SendMessageTimeoutW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SendMessageTimeoutW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SendMessageW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SendMessageW.cs
index a1e50d76eb2..982407f35f7 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SendMessageW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SendMessageW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetActiveWindow.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetActiveWindow.cs
index 8f9b228585b..bdb45afd480 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetActiveWindow.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetActiveWindow.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetCapture.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetCapture.cs
index 8657f24afe6..294e4a7b2f4 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetCapture.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetCapture.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetClassLong.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetClassLong.cs
index 4d26404bba9..e71539e33e9 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetClassLong.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetClassLong.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetCursor.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetCursor.cs
index b32d6f7aa66..73413c77af8 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetCursor.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetCursor.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetFocus.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetFocus.cs
index 7909ddb0ba4..e016d50c6dd 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetFocus.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetFocus.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetForegroundWindow.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetForegroundWindow.cs
index 444a5455208..25c2eeeab84 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetForegroundWindow.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetForegroundWindow.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetLayeredWindowAttributes.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetLayeredWindowAttributes.cs
index f485d97cb72..153880aea79 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetLayeredWindowAttributes.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetLayeredWindowAttributes.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetMenu.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetMenu.cs
index e6937bf814b..c3196fbc6f4 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetMenu.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetMenu.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetMenuDefaultItem.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetMenuDefaultItem.cs
index 9825fed11e2..f6486f658e2 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetMenuDefaultItem.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetMenuDefaultItem.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetParent.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetParent.cs
index 0fe148de583..a7bcb218984 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetParent.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetParent.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetProcessDpiAwarenessContext.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetProcessDpiAwarenessContext.cs
index cfe5f90c4af..655133f0546 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetProcessDpiAwarenessContext.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetProcessDpiAwarenessContext.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetScrollInfo.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetScrollInfo.cs
index 91ee1863fcd..833172e8ea7 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetScrollInfo.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetScrollInfo.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetScrollPos.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetScrollPos.cs
index 4edc06e92cf..57189476ada 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetScrollPos.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetScrollPos.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetThreadDpiAwarenessContext.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetThreadDpiAwarenessContext.cs
index c6ab2ab3140..41244dee134 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetThreadDpiAwarenessContext.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetThreadDpiAwarenessContext.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetTimer.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetTimer.cs
index 853e43ea5a8..70fc6004e30 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetTimer.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetTimer.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowLong.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowLong.cs
index f69ec19cfb2..6af4be45dc0 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowLong.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowLong.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowPlacement.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowPlacement.cs
index 6d69b2117d4..2850f35ed89 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowPlacement.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowPlacement.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowPos.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowPos.cs
index 1052f8092ba..3105988f420 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowPos.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowPos.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowRgn.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowRgn.cs
index 310b05a4639..31a9612ec9e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowRgn.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowRgn.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowText.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowText.cs
index 4aee9c38de1..f6efcb7836d 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowText.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowText.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowsHookExW.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowsHookExW.cs
index 6d5e63a66d6..b93fe448a8d 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowsHookExW.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.SetWindowsHookExW.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ShowCaret.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ShowCaret.cs
index fe74df4f6f3..64e13194b4a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ShowCaret.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ShowCaret.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ShowWindow.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ShowWindow.cs
index e51a17e1b85..d013671dd0f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ShowWindow.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ShowWindow.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.TME.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.TME.cs
index 7baeca087e5..46c1b718f29 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.TME.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.TME.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.TrackMouseEvent.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.TrackMouseEvent.cs
index 2fa0256fea8..273b6d4dd62 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.TrackMouseEvent.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.TrackMouseEvent.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.TranslateMDISysAccel.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.TranslateMDISysAccel.cs
index 8ca086c69d9..80ad2658d32 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.TranslateMDISysAccel.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.TranslateMDISysAccel.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.UISF.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.UISF.cs
index 36ce5e6086a..2b9b44fe3ba 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.UISF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.UISF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.UnhookWindowsHookEx.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.UnhookWindowsHookEx.cs
index ed214826cd8..ecf38a2683e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.UnhookWindowsHookEx.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.UnhookWindowsHookEx.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.UpdateWindow.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.UpdateWindow.cs
index 3ea565ce96b..ca4bf820aa8 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.UpdateWindow.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.UpdateWindow.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ValidateRect.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ValidateRect.cs
index 293751e57ec..a84a559d352 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ValidateRect.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.ValidateRect.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WINDOWPOS.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WINDOWPOS.cs
index 01e817cd6e9..50744fcaa67 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WINDOWPOS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WINDOWPOS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WNDCLASS.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WNDCLASS.cs
index 1d9cdd8470f..8babc877b25 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WNDCLASS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WNDCLASS.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WNDPROC.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WNDPROC.cs
index 9e1fb1ec7bc..f60f343fbac 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WNDPROC.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WNDPROC.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WPF.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WPF.cs
index bfe29455664..0d39ba779ea 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WPF.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WPF.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WS.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WS.cs
index 41e71ce8943..4481482a270 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WS.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WS.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WS_EX.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WS_EX.cs
index 81a810cb577..904472ab9d4 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WS_EX.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WS_EX.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
internal static partial class User32
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WindowFromDC.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WindowFromDC.cs
index ba182ad4a4f..90a619ea208 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WindowFromDC.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WindowFromDC.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WindowFromPoint.cs b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WindowFromPoint.cs
index 199982016d0..91c57d54f2e 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WindowFromPoint.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/User32/Interop.WindowFromPoint.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.CloseThemeData.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.CloseThemeData.cs
index cf3e0766066..d6f2e3d45a1 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.CloseThemeData.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.CloseThemeData.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.DrawThemeBackground.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.DrawThemeBackground.cs
index bfdb383715e..75115e8937a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.DrawThemeBackground.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.DrawThemeBackground.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.DrawThemeEdge.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.DrawThemeEdge.cs
index c7a649f4a2b..c7216cc77a0 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.DrawThemeEdge.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.DrawThemeEdge.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.DrawThemeParentBackground.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.DrawThemeParentBackground.cs
index 931842ae6ce..7793dc29845 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.DrawThemeParentBackground.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.DrawThemeParentBackground.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.DrawThemeText.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.DrawThemeText.cs
index 462b48eadaa..5ab4c8fa96c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.DrawThemeText.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.DrawThemeText.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeBackgroundContentRect.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeBackgroundContentRect.cs
index 0290a471b29..1c6ac6245e0 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeBackgroundContentRect.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeBackgroundContentRect.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeBackgroundExtent.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeBackgroundExtent.cs
index 84abb402599..438a2376631 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeBackgroundExtent.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeBackgroundExtent.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeBackgroundRegion.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeBackgroundRegion.cs
index 7ec65970451..d51596411b2 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeBackgroundRegion.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeBackgroundRegion.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeBool.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeBool.cs
index dd122f34453..268e1c79230 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeBool.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeBool.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeColor.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeColor.cs
index c011b635fbe..96f4d3cc1aa 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeColor.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeColor.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeDocumentationProperty.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeDocumentationProperty.cs
index fac1219f649..2985b45eaff 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeDocumentationProperty.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeDocumentationProperty.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeEnumValue.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeEnumValue.cs
index 34caa6d4314..467766d0748 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeEnumValue.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeEnumValue.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeFilename.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeFilename.cs
index a6365a99224..6b0064cd21b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeFilename.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeFilename.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeFont.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeFont.cs
index af31607e28c..6be49397449 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeFont.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeFont.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeInt.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeInt.cs
index 4a00750c7d5..213c4bd8311 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeInt.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeInt.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeMargins.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeMargins.cs
index 89c91cc1262..504802dce2b 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeMargins.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeMargins.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemePartSize.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemePartSize.cs
index 91670814023..4868ada3b88 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemePartSize.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemePartSize.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
using System.Windows.Forms.VisualStyles;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemePosition.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemePosition.cs
index 5945a8f6e16..90b9e50e38d 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemePosition.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemePosition.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeString.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeString.cs
index 4934d1638fd..431039a4f3a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeString.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeString.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeSysBool.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeSysBool.cs
index cbd719550ee..92218311b6f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeSysBool.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeSysBool.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeSysInt.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeSysInt.cs
index c499a443ec0..de57f1dd631 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeSysInt.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeSysInt.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeTextExtent.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeTextExtent.cs
index a81080b92be..6d26a5ce047 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeTextExtent.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeTextExtent.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeTextMetrics.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeTextMetrics.cs
index 3012465a6f4..3d68956c904 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeTextMetrics.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.GetThemeTextMetrics.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
using System.Windows.Forms.VisualStyles;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.HitTestThemeBackground.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.HitTestThemeBackground.cs
index 8aa87b08f54..fc576ced8b1 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.HitTestThemeBackground.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.HitTestThemeBackground.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.IsThemeBackgroundPartiallyTransparent.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.IsThemeBackgroundPartiallyTransparent.cs
index 443cdeafeef..332a381948a 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.IsThemeBackgroundPartiallyTransparent.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.IsThemeBackgroundPartiallyTransparent.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.IsThemePartDefined.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.IsThemePartDefined.cs
index 57b3c6a2949..b2b4e238cd8 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.IsThemePartDefined.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.IsThemePartDefined.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.OpenThemeData.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.OpenThemeData.cs
index 534451687c5..5a8487c4b67 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.OpenThemeData.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.OpenThemeData.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.OpenThemeDataScope.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.OpenThemeDataScope.cs
index 6f9bfec833a..df12f52f442 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.OpenThemeDataScope.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.OpenThemeDataScope.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
public static partial class UxTheme
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.STAP.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.STAP.cs
index d7ef53c6703..4a6e8dcb031 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.STAP.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.STAP.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
public static partial class UxTheme
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.SetWindowTheme.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.SetWindowTheme.cs
index 8a6e9300213..c32a0d4fc72 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.SetWindowTheme.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.SetWindowTheme.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal static partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.TMT.cs b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.TMT.cs
index 229bd75daa9..585590e6474 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.TMT.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UxTheme/Interop.TMT.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal static partial class Interop
{
public static partial class UxTheme
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/VSSDK/Interop.CTLBLDTYPE.cs b/src/System.Windows.Forms.Primitives/src/Interop/VSSDK/Interop.CTLBLDTYPE.cs
index 69795aac586..3d99bfa29c5 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/VSSDK/Interop.CTLBLDTYPE.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/VSSDK/Interop.CTLBLDTYPE.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-
internal partial class Interop
{
internal static partial class VSSDK
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/VSSDK/Interop.ICategorizeProperties.cs b/src/System.Windows.Forms.Primitives/src/Interop/VSSDK/Interop.ICategorizeProperties.cs
index 4274d5bfb47..4d1ae61893c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/VSSDK/Interop.ICategorizeProperties.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/VSSDK/Interop.ICategorizeProperties.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/VSSDK/Interop.IProvidePropertyBuilder.cs b/src/System.Windows.Forms.Primitives/src/Interop/VSSDK/Interop.IProvidePropertyBuilder.cs
index 0c2cc585e2a..809b7a84379 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/VSSDK/Interop.IProvidePropertyBuilder.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/VSSDK/Interop.IProvidePropertyBuilder.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/VSSDK/Interop.IVSMDPerPropertyBrowsing.cs b/src/System.Windows.Forms.Primitives/src/Interop/VSSDK/Interop.IVSMDPerPropertyBrowsing.cs
index df7416c7eef..469b86b82a4 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/VSSDK/Interop.IVSMDPerPropertyBrowsing.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/VSSDK/Interop.IVSMDPerPropertyBrowsing.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/VSSDK/Interop.IVsPerPropertyBrowsing.cs b/src/System.Windows.Forms.Primitives/src/Interop/VSSDK/Interop.IVsPerPropertyBrowsing.cs
index 796b2f3323b..8b562ab266c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/VSSDK/Interop.IVsPerPropertyBrowsing.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/VSSDK/Interop.IVsPerPropertyBrowsing.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
internal partial class Interop
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/WinFormsComWrappers.IStreamVtbl.cs b/src/System.Windows.Forms.Primitives/src/Interop/WinFormsComWrappers.IStreamVtbl.cs
index a31551897fe..ae83e1ffa0f 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/WinFormsComWrappers.IStreamVtbl.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/WinFormsComWrappers.IStreamVtbl.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-using System.IO;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/WinFormsComWrappers.PictureWrapper.cs b/src/System.Windows.Forms.Primitives/src/Interop/WinFormsComWrappers.PictureWrapper.cs
index 21398f0a6a6..6b361854858 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/WinFormsComWrappers.PictureWrapper.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/WinFormsComWrappers.PictureWrapper.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Diagnostics;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/WinFormsComWrappers.cs b/src/System.Windows.Forms.Primitives/src/Interop/WinFormsComWrappers.cs
index 3b16c9a0a08..3df240018a4 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/WinFormsComWrappers.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/WinFormsComWrappers.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Collections;
using System.Diagnostics;
using System.Runtime.CompilerServices;
diff --git a/src/System.Windows.Forms.Primitives/src/Microsoft/Win32/SafeHandles/CoTaskMemSafeHandle.cs b/src/System.Windows.Forms.Primitives/src/Microsoft/Win32/SafeHandles/CoTaskMemSafeHandle.cs
index cf0cacb9a4d..d07bccceb8b 100644
--- a/src/System.Windows.Forms.Primitives/src/Microsoft/Win32/SafeHandles/CoTaskMemSafeHandle.cs
+++ b/src/System.Windows.Forms.Primitives/src/Microsoft/Win32/SafeHandles/CoTaskMemSafeHandle.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
namespace Microsoft.Win32.SafeHandles
diff --git a/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Automation/UiaTextProvider.cs b/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Automation/UiaTextProvider.cs
index 4445c2e4302..c1ab16f78cd 100644
--- a/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Automation/UiaTextProvider.cs
+++ b/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Automation/UiaTextProvider.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using static Interop.UiaCore;
using static Interop.User32;
diff --git a/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Automation/UiaTextRange.cs b/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Automation/UiaTextRange.cs
index 6aa4bb8e4f9..a7d03624c53 100644
--- a/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Automation/UiaTextRange.cs
+++ b/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Automation/UiaTextRange.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
diff --git a/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/FileDialogCustomPlacesCollection.cs b/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/FileDialogCustomPlacesCollection.cs
index 0dac1565ce9..ae29f254e82 100644
--- a/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/FileDialogCustomPlacesCollection.cs
+++ b/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/FileDialogCustomPlacesCollection.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections.ObjectModel;
-using System.IO;
using static Interop.Shell32;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Internals/ThemingScope.cs b/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Internals/ThemingScope.cs
index 620fa4646f4..19c2d3ecd59 100644
--- a/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Internals/ThemingScope.cs
+++ b/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Internals/ThemingScope.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.IO;
using static Interop;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/ObjectCache.cs b/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/ObjectCache.cs
index d63b0fbc10f..22b9510145f 100644
--- a/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/ObjectCache.cs
+++ b/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/ObjectCache.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Threading;
-
namespace System.Windows.Forms
{
///
diff --git a/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/RefCountedCache.CacheEntry.cs b/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/RefCountedCache.CacheEntry.cs
index a056a3c9b04..efa0abc1b8c 100644
--- a/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/RefCountedCache.CacheEntry.cs
+++ b/src/System.Windows.Forms.Primitives/src/System/Windows/Forms/RefCountedCache.CacheEntry.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Diagnostics;
-using System.Threading;
namespace System.Windows.Forms
{
diff --git a/src/System.Windows.Forms.Primitives/tests/TestUtilities/DeviceContextState.cs b/src/System.Windows.Forms.Primitives/tests/TestUtilities/DeviceContextState.cs
index 7b8979b4ed2..0cb0af113cf 100644
--- a/src/System.Windows.Forms.Primitives/tests/TestUtilities/DeviceContextState.cs
+++ b/src/System.Windows.Forms.Primitives/tests/TestUtilities/DeviceContextState.cs
@@ -4,7 +4,6 @@
#nullable enable
-using System.Collections.Generic;
using System.Drawing;
using System.Numerics;
using System.Windows.Forms.Metafiles;
diff --git a/src/System.Windows.Forms.Primitives/tests/TestUtilities/Extensions/TheoryExtensions.cs b/src/System.Windows.Forms.Primitives/tests/TestUtilities/Extensions/TheoryExtensions.cs
index d55c628c802..5e281ba496d 100644
--- a/src/System.Windows.Forms.Primitives/tests/TestUtilities/Extensions/TheoryExtensions.cs
+++ b/src/System.Windows.Forms.Primitives/tests/TestUtilities/Extensions/TheoryExtensions.cs
@@ -3,8 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
using Xunit;
namespace System
diff --git a/src/System.Windows.Forms.Primitives/tests/TestUtilities/MallocSpy.cs b/src/System.Windows.Forms.Primitives/tests/TestUtilities/MallocSpy.cs
index 4578b019215..640f128d3da 100644
--- a/src/System.Windows.Forms.Primitives/tests/TestUtilities/MallocSpy.cs
+++ b/src/System.Windows.Forms.Primitives/tests/TestUtilities/MallocSpy.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using static Interop;
namespace System
diff --git a/src/System.Windows.Forms.Primitives/tests/TestUtilities/MallocSpyScope.cs b/src/System.Windows.Forms.Primitives/tests/TestUtilities/MallocSpyScope.cs
index 8e8b98979b0..6f0446d0fb0 100644
--- a/src/System.Windows.Forms.Primitives/tests/TestUtilities/MallocSpyScope.cs
+++ b/src/System.Windows.Forms.Primitives/tests/TestUtilities/MallocSpyScope.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Threading;
using static Interop;
namespace System
diff --git a/src/System.Windows.Forms.Primitives/tests/TestUtilities/Metafiles/Validators/SkipTypesValidator.cs b/src/System.Windows.Forms.Primitives/tests/TestUtilities/Metafiles/Validators/SkipTypesValidator.cs
index 302e3e330d4..e9d283a837e 100644
--- a/src/System.Windows.Forms.Primitives/tests/TestUtilities/Metafiles/Validators/SkipTypesValidator.cs
+++ b/src/System.Windows.Forms.Primitives/tests/TestUtilities/Metafiles/Validators/SkipTypesValidator.cs
@@ -4,7 +4,6 @@
#nullable enable
-using System.Linq;
using static Interop;
namespace System.Windows.Forms.Metafiles
diff --git a/src/System.Windows.Forms.Primitives/tests/TestUtilities/NoAssertContext.cs b/src/System.Windows.Forms.Primitives/tests/TestUtilities/NoAssertContext.cs
index 1a20423c65e..cc7fd0a2b0c 100644
--- a/src/System.Windows.Forms.Primitives/tests/TestUtilities/NoAssertContext.cs
+++ b/src/System.Windows.Forms.Primitives/tests/TestUtilities/NoAssertContext.cs
@@ -4,7 +4,6 @@
using System.Collections.Concurrent;
using System.Diagnostics;
-using System.Threading;
namespace System
{
diff --git a/src/System.Windows.Forms.Primitives/tests/TestUtilities/PlatformDetection.Windows.cs b/src/System.Windows.Forms.Primitives/tests/TestUtilities/PlatformDetection.Windows.cs
index 357717526fa..b5bba0f115d 100644
--- a/src/System.Windows.Forms.Primitives/tests/TestUtilities/PlatformDetection.Windows.cs
+++ b/src/System.Windows.Forms.Primitives/tests/TestUtilities/PlatformDetection.Windows.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.IO;
using System.Runtime.InteropServices;
using System.Security;
using Microsoft.Win32;
diff --git a/src/System.Windows.Forms.Primitives/tests/TestUtilities/PlatformDetection.cs b/src/System.Windows.Forms.Primitives/tests/TestUtilities/PlatformDetection.cs
index 8f789dfb32e..7e10ab40c0e 100644
--- a/src/System.Windows.Forms.Primitives/tests/TestUtilities/PlatformDetection.cs
+++ b/src/System.Windows.Forms.Primitives/tests/TestUtilities/PlatformDetection.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.IO;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms.Primitives/tests/TestUtilities/SystemCOLORs.cs b/src/System.Windows.Forms.Primitives/tests/TestUtilities/SystemCOLORs.cs
index 3470c8972bc..07e7795d3f8 100644
--- a/src/System.Windows.Forms.Primitives/tests/TestUtilities/SystemCOLORs.cs
+++ b/src/System.Windows.Forms.Primitives/tests/TestUtilities/SystemCOLORs.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using static Interop;
namespace System
diff --git a/src/System.Windows.Forms.Primitives/tests/TestUtilities/Win32/WindowClass.cs b/src/System.Windows.Forms.Primitives/tests/TestUtilities/Win32/WindowClass.cs
index 08007fcb227..44232882f18 100644
--- a/src/System.Windows.Forms.Primitives/tests/TestUtilities/Win32/WindowClass.cs
+++ b/src/System.Windows.Forms.Primitives/tests/TestUtilities/Win32/WindowClass.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.ComponentModel;
-using System.Linq;
using System.Reflection;
using System.Runtime.InteropServices;
using static Interop;
diff --git a/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/ComCtl32/LVITEMWTests.cs b/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/ComCtl32/LVITEMWTests.cs
index 54bcd63e778..83e51cecc1e 100644
--- a/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/ComCtl32/LVITEMWTests.cs
+++ b/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/ComCtl32/LVITEMWTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop.ComCtl32;
diff --git a/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/Ole32/CADWORDTests.cs b/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/Ole32/CADWORDTests.cs
index 58d032e9693..9cd405db8ce 100644
--- a/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/Ole32/CADWORDTests.cs
+++ b/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/Ole32/CADWORDTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Runtime.InteropServices;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/Ole32/CALPOLESTRTests.cs b/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/Ole32/CALPOLESTRTests.cs
index 70c2fcd92a7..cf2bbac3656 100644
--- a/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/Ole32/CALPOLESTRTests.cs
+++ b/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/Ole32/CALPOLESTRTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Runtime.InteropServices;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/Oleaut32/SAFEARRAYTests.cs b/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/Oleaut32/SAFEARRAYTests.cs
index 46de747bef6..d97b1cb1c44 100644
--- a/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/Oleaut32/SAFEARRAYTests.cs
+++ b/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/Oleaut32/SAFEARRAYTests.cs
@@ -4,7 +4,6 @@
#nullable disable
-using System.Collections.Generic;
using System.Runtime.InteropServices;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/Oleaut32/VARIANTTests.cs b/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/Oleaut32/VARIANTTests.cs
index 56d0cd4471d..53f909ffb02 100644
--- a/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/Oleaut32/VARIANTTests.cs
+++ b/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/Oleaut32/VARIANTTests.cs
@@ -4,7 +4,6 @@
#nullable disable
-using System.Collections.Generic;
using System.Runtime.InteropServices;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/Shell32/ShellItemTests.cs b/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/Shell32/ShellItemTests.cs
index 2d66466f3f0..8d621143290 100644
--- a/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/Shell32/ShellItemTests.cs
+++ b/src/System.Windows.Forms.Primitives/tests/UnitTests/Interop/Shell32/ShellItemTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.IO;
using System.Runtime.InteropServices;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Automation/UiaTextProviderTests.cs b/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Automation/UiaTextProviderTests.cs
index 216cbbd7230..d7e799a7b04 100644
--- a/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Automation/UiaTextProviderTests.cs
+++ b/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Automation/UiaTextProviderTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms.Automation;
using Moq;
diff --git a/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Automation/UiaTextRangeTests.cs b/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Automation/UiaTextRangeTests.cs
index 326ee1f45b3..d665fe9aaf1 100644
--- a/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Automation/UiaTextRangeTests.cs
+++ b/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Automation/UiaTextRangeTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Runtime.InteropServices;
using System.Windows.Forms.Automation;
diff --git a/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/FileDialogCustomPlaceTests.cs b/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/FileDialogCustomPlaceTests.cs
index 95efe579ae9..f64819afb84 100644
--- a/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/FileDialogCustomPlaceTests.cs
+++ b/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/FileDialogCustomPlaceTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/SinglyLinkedListTests.cs b/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/SinglyLinkedListTests.cs
index dcc2218916b..67acbc31cb1 100644
--- a/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/SinglyLinkedListTests.cs
+++ b/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/SinglyLinkedListTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms.PrivateSourceGenerators/src/System.Windows.Forms.PrivateSourceGenerators.csproj b/src/System.Windows.Forms.PrivateSourceGenerators/src/System.Windows.Forms.PrivateSourceGenerators.csproj
index 92e97330fb0..62eb690b7f6 100644
--- a/src/System.Windows.Forms.PrivateSourceGenerators/src/System.Windows.Forms.PrivateSourceGenerators.csproj
+++ b/src/System.Windows.Forms.PrivateSourceGenerators/src/System.Windows.Forms.PrivateSourceGenerators.csproj
@@ -7,11 +7,11 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/src/System.Windows.Forms.PrivateSourceGenerators/src/System/Windows/Forms/SourceGenerators/EnumValidationGenerator.cs b/src/System.Windows.Forms.PrivateSourceGenerators/src/System/Windows/Forms/SourceGenerators/EnumValidationGenerator.cs
index 389da68bbe2..891c233cbdc 100644
--- a/src/System.Windows.Forms.PrivateSourceGenerators/src/System/Windows/Forms/SourceGenerators/EnumValidationGenerator.cs
+++ b/src/System.Windows.Forms.PrivateSourceGenerators/src/System/Windows/Forms/SourceGenerators/EnumValidationGenerator.cs
@@ -184,7 +184,9 @@ private static IEnumerable GetEnumValidationInfo(Compilation
INamedTypeSymbol? flagsAttributeType = compilation.GetTypeByMetadataName("System.FlagsAttribute");
- var foundTypes = new HashSet();
+#pragma warning disable RS1024 // Compare symbols correctly, see https://github.com/dotnet/roslyn-analyzers/issues/3427 and https://github.com/dotnet/roslyn-analyzers/issues/4539
+ var foundTypes = new HashSet(SymbolEqualityComparer.Default);
+#pragma warning restore RS1024 // Compare symbols correctly
foreach (SyntaxNode argument in argumentsToValidate)
{
diff --git a/src/System.Windows.Forms.PrivateSourceGenerators/tests/UnitTests/EnumValidationTests.cs b/src/System.Windows.Forms.PrivateSourceGenerators/tests/UnitTests/EnumValidationTests.cs
index 7d05bc33fb0..1a1b26e7f1e 100644
--- a/src/System.Windows.Forms.PrivateSourceGenerators/tests/UnitTests/EnumValidationTests.cs
+++ b/src/System.Windows.Forms.PrivateSourceGenerators/tests/UnitTests/EnumValidationTests.cs
@@ -2,9 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Collections.Immutable;
-using System.Linq;
using System.Reflection;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp;
diff --git a/src/System.Windows.Forms.PrivateSourceGenerators/tests/UnitTests/System.Windows.Forms.PrivateSourceGenerators.Tests.csproj b/src/System.Windows.Forms.PrivateSourceGenerators/tests/UnitTests/System.Windows.Forms.PrivateSourceGenerators.Tests.csproj
index 6e32366df1c..bf32c849168 100644
--- a/src/System.Windows.Forms.PrivateSourceGenerators/tests/UnitTests/System.Windows.Forms.PrivateSourceGenerators.Tests.csproj
+++ b/src/System.Windows.Forms.PrivateSourceGenerators/tests/UnitTests/System.Windows.Forms.PrivateSourceGenerators.Tests.csproj
@@ -10,11 +10,11 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/src/System.Windows.Forms/src/System/Drawing/Design/UITypeEditor.cs b/src/System.Windows.Forms/src/System/Drawing/Design/UITypeEditor.cs
index 3d13939b7c9..6a24bad0187 100644
--- a/src/System.Windows.Forms/src/System/Drawing/Design/UITypeEditor.cs
+++ b/src/System.Windows.Forms/src/System/Drawing/Design/UITypeEditor.cs
@@ -9,7 +9,6 @@
using System.Collections.Specialized;
using System.ComponentModel;
using System.Drawing.Imaging;
-using System.IO;
namespace System.Drawing.Design
{
diff --git a/src/System.Windows.Forms/src/System/Resources/AssemblyNamesTypeResolutionService.cs b/src/System.Windows.Forms/src/System/Resources/AssemblyNamesTypeResolutionService.cs
index ed9510983c0..c92330a78c4 100644
--- a/src/System.Windows.Forms/src/System/Resources/AssemblyNamesTypeResolutionService.cs
+++ b/src/System.Windows.Forms/src/System/Resources/AssemblyNamesTypeResolutionService.cs
@@ -5,10 +5,7 @@
#nullable disable
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel.Design;
-using System.IO;
-using System.Linq;
using System.Reflection;
namespace System.Resources
diff --git a/src/System.Windows.Forms/src/System/Resources/ResXDataNode.cs b/src/System.Windows.Forms/src/System/Resources/ResXDataNode.cs
index 7e064eac272..ec6f3a1db08 100644
--- a/src/System.Windows.Forms/src/System/Resources/ResXDataNode.cs
+++ b/src/System.Windows.Forms/src/System/Resources/ResXDataNode.cs
@@ -9,7 +9,6 @@
using System.Diagnostics;
using System.Drawing;
using System.Globalization;
-using System.IO;
using System.Reflection;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
diff --git a/src/System.Windows.Forms/src/System/Resources/ResXFileRef.cs b/src/System.Windows.Forms/src/System/Resources/ResXFileRef.cs
index 22a029dc841..03d2df3137c 100644
--- a/src/System.Windows.Forms/src/System/Resources/ResXFileRef.cs
+++ b/src/System.Windows.Forms/src/System/Resources/ResXFileRef.cs
@@ -6,7 +6,6 @@
using System.ComponentModel;
using System.Globalization;
-using System.IO;
using System.Text;
namespace System.Resources
diff --git a/src/System.Windows.Forms/src/System/Resources/ResXResourceReader.cs b/src/System.Windows.Forms/src/System/Resources/ResXResourceReader.cs
index 5bb8faf3e2f..723570841b4 100644
--- a/src/System.Windows.Forms/src/System/Resources/ResXResourceReader.cs
+++ b/src/System.Windows.Forms/src/System/Resources/ResXResourceReader.cs
@@ -9,7 +9,6 @@
using System.ComponentModel.Design;
using System.Drawing;
using System.Globalization;
-using System.IO;
using System.Reflection;
using System.Runtime.Serialization;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms/src/System/Resources/ResXResourceSet.cs b/src/System.Windows.Forms/src/System/Resources/ResXResourceSet.cs
index 3956886ab93..8dd7c029f7b 100644
--- a/src/System.Windows.Forms/src/System/Resources/ResXResourceSet.cs
+++ b/src/System.Windows.Forms/src/System/Resources/ResXResourceSet.cs
@@ -4,8 +4,6 @@
#nullable disable
-using System.IO;
-
namespace System.Resources
{
///
diff --git a/src/System.Windows.Forms/src/System/Resources/ResXResourceWriter.cs b/src/System.Windows.Forms/src/System/Resources/ResXResourceWriter.cs
index d53444f4881..3cc92eb8c83 100644
--- a/src/System.Windows.Forms/src/System/Resources/ResXResourceWriter.cs
+++ b/src/System.Windows.Forms/src/System/Resources/ResXResourceWriter.cs
@@ -6,7 +6,6 @@
using System.Collections;
using System.Diagnostics;
-using System.IO;
using System.Reflection;
using System.Text;
using System.Xml;
diff --git a/src/System.Windows.Forms/src/System/Resources/ResxFileRef.Converter.cs b/src/System.Windows.Forms/src/System/Resources/ResxFileRef.Converter.cs
index 791e2ff0776..64953b99ce9 100644
--- a/src/System.Windows.Forms/src/System/Resources/ResxFileRef.Converter.cs
+++ b/src/System.Windows.Forms/src/System/Resources/ResxFileRef.Converter.cs
@@ -8,7 +8,6 @@
using System.Diagnostics;
using System.Drawing;
using System.Globalization;
-using System.IO;
using System.Reflection;
using System.Text;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/AccessibleRoleControlTypeMap.cs b/src/System.Windows.Forms/src/System/Windows/Forms/AccessibleRoleControlTypeMap.cs
index 2603b1b180b..5b0d6a8311d 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/AccessibleRoleControlTypeMap.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/AccessibleRoleControlTypeMap.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using static Interop.UiaCore;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Application.ComponentManager.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Application.ComponentManager.cs
index 0c8808699e3..5ddfdfd23fa 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Application.ComponentManager.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Application.ComponentManager.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Application.ThreadContext.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Application.ThreadContext.cs
index 93f0971f2c7..9879bb15fd6 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Application.ThreadContext.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Application.ThreadContext.cs
@@ -5,12 +5,10 @@
#nullable disable
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-using System.Threading;
using static Interop;
using static Interop.Mso;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Application.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Application.cs
index b7bbf32a86a..7ffad06b721 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Application.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Application.cs
@@ -8,11 +8,9 @@
using System.Diagnostics;
using System.Drawing;
using System.Globalization;
-using System.IO;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Text;
-using System.Threading;
using System.Windows.Forms.VisualStyles;
using Microsoft.Win32;
using static Interop;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/AutomationMessages.cs b/src/System.Windows.Forms/src/System/Windows/Forms/AutomationMessages.cs
index 5b69e06ad35..0c85c6714f6 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/AutomationMessages.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/AutomationMessages.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.Diagnostics;
-using System.IO;
using static Interop;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.ConnectionPointCookie.cs b/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.ConnectionPointCookie.cs
index c63036a1845..f0b0ecd6ee2 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.ConnectionPointCookie.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.ConnectionPointCookie.cs
@@ -7,7 +7,6 @@
using System.Diagnostics;
using System.Globalization;
using System.Runtime.InteropServices;
-using System.Threading;
using static Interop;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.OleInterfaces.cs b/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.OleInterfaces.cs
index 988e7d4cf9c..6593d4cb1e6 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.OleInterfaces.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.OleInterfaces.cs
@@ -11,7 +11,6 @@
using System.Globalization;
using System.Reflection;
using System.Runtime.InteropServices;
-using System.Threading;
using static Interop;
using static Interop.Ole32;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.PropertyBagStream.cs b/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.PropertyBagStream.cs
index c819ef2fdcc..c125ad138f7 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.PropertyBagStream.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.PropertyBagStream.cs
@@ -6,7 +6,6 @@
using System.Collections;
using System.Diagnostics;
-using System.IO;
using System.Runtime.Serialization.Formatters.Binary;
using static Interop;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.State.cs b/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.State.cs
index abf5ec59916..f8be6e9ba36 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.State.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.State.cs
@@ -7,7 +7,6 @@
using System.ComponentModel;
using System.Diagnostics;
using System.Globalization;
-using System.IO;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;
using static Interop;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.StateConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.StateConverter.cs
index 6ae3f84e8ac..acb1840f4cc 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.StateConverter.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.StateConverter.cs
@@ -6,7 +6,6 @@
using System.ComponentModel;
using System.Globalization;
-using System.IO;
namespace System.Windows.Forms
{
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.cs b/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.cs
index 470f32acc7b..e9bb575461e 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.Collections;
-using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
using System.ComponentModel.Design;
@@ -13,10 +12,8 @@
using System.Drawing;
using System.Drawing.Imaging;
using System.Globalization;
-using System.IO;
using System.Reflection;
using System.Runtime.InteropServices;
-using System.Threading;
using static Interop;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/BindingSource.cs b/src/System.Windows.Forms/src/System/Windows/Forms/BindingSource.cs
index b3d3a08f206..424194820d8 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/BindingSource.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/BindingSource.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing.Design;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Clipboard.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Clipboard.cs
index dfd5037755f..b8dc9b2373f 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Clipboard.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Clipboard.cs
@@ -6,9 +6,7 @@
using System.Collections.Specialized;
using System.Drawing;
-using System.IO;
using System.Runtime.InteropServices;
-using System.Threading;
using static Interop;
using IComDataObject = System.Runtime.InteropServices.ComTypes.IDataObject;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxItemAccessibleObjectCollection.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxItemAccessibleObjectCollection.cs
index 30a99bda144..12289dacdec 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxItemAccessibleObjectCollection.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxItemAccessibleObjectCollection.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using static System.Windows.Forms.ComboBox.ObjectCollection;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ObjectCollection.EntryEnumerator.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ObjectCollection.EntryEnumerator.cs
index 66854cc9cad..d11902d0204 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ObjectCollection.EntryEnumerator.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ObjectCollection.EntryEnumerator.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
namespace System.Windows.Forms
{
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ObjectCollection.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ObjectCollection.cs
index 435fe0925c2..ca305ae05b1 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ObjectCollection.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ObjectCollection.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Globalization;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.cs
index 637db194049..c6e7b00ca3d 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.cs
@@ -6,14 +6,12 @@
using System.Buffers;
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
using System.Drawing.Design;
using System.Globalization;
using System.Runtime.InteropServices;
-using System.Threading;
using System.Windows.Forms.Layout;
using static System.Windows.Forms.ComboBox.ObjectCollection;
using static Interop;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/ComNativeDescriptor.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/ComNativeDescriptor.cs
index 2adfdbafa78..46880aca80f 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/ComNativeDescriptor.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComponentModel/COM2Interop/ComNativeDescriptor.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Control.ActiveXImpl.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Control.ActiveXImpl.cs
index 0cfb48d5ff6..6ca4003679d 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Control.ActiveXImpl.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Control.ActiveXImpl.cs
@@ -10,7 +10,6 @@
using System.Diagnostics;
using System.Drawing;
using System.Globalization;
-using System.IO;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Control.ControlCollection.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Control.ControlCollection.cs
index 51b2b45336e..34f913babb6 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Control.ControlCollection.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Control.ControlCollection.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Globalization;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Control.ControlTabOrderHolder.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Control.ControlTabOrderHolder.cs
index f20642e2351..53e515e3a2c 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Control.ControlTabOrderHolder.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Control.ControlTabOrderHolder.cs
@@ -4,8 +4,6 @@
#nullable disable
-using System.Collections.Generic;
-
namespace System.Windows.Forms
{
public partial class Control
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Control.Ime.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Control.Ime.cs
index d315c5b4ea8..abbd6db9adb 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Control.Ime.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Control.Ime.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Globalization;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Control.ThreadMethodEntry.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Control.ThreadMethodEntry.cs
index 813d811b199..850d9417612 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Control.ThreadMethodEntry.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Control.ThreadMethodEntry.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Threading;
-
namespace System.Windows.Forms
{
public partial class Control
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
index 2b1e749b1c7..bda0bb9bba1 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design;
using System.ComponentModel.Design.Serialization;
@@ -17,7 +16,6 @@
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.ComTypes;
using System.Text;
-using System.Threading;
using System.Windows.Forms.Automation;
using System.Windows.Forms.Layout;
using Accessibility;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Cursor.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Cursor.cs
index 742a6b5180b..da17d39ff4b 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Cursor.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Cursor.cs
@@ -6,7 +6,6 @@
using System.Diagnostics;
using System.Drawing;
using System.Drawing.Design;
-using System.IO;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;
using static Interop;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/CursorConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/CursorConverter.cs
index 833b5f175f1..af65cb1d09d 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/CursorConverter.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/CursorConverter.cs
@@ -9,7 +9,6 @@
using System.ComponentModel.Design.Serialization;
using System.Diagnostics;
using System.Globalization;
-using System.IO;
using System.Reflection;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.cs
index 2d50242de3b..96d84f00502 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.cs
@@ -4,12 +4,10 @@
#nullable disable
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
using System.Globalization;
-using System.IO;
using System.Text;
using static Interop;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewColumnHeaderCell.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewColumnHeaderCell.cs
index 5891971879a..6341e59f451 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewColumnHeaderCell.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewColumnHeaderCell.cs
@@ -8,7 +8,6 @@
using System.Diagnostics;
using System.Drawing;
using System.Globalization;
-using System.IO;
using System.Text;
using System.Windows.Forms.VisualStyles;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRowCollection.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRowCollection.cs
index 067394693e2..8e940698641 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRowCollection.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRowCollection.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design.Serialization;
using System.Diagnostics;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRowHeaderCell.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRowHeaderCell.cs
index 55c31c2a199..9faef51b74e 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRowHeaderCell.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRowHeaderCell.cs
@@ -8,7 +8,6 @@
using System.Drawing;
using System.Drawing.Imaging;
using System.Globalization;
-using System.IO;
using System.Text;
using System.Windows.Forms.VisualStyles;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataObject.DataStore.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataObject.DataStore.cs
index 8fd78484925..9c2b3574d40 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataObject.DataStore.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataObject.DataStore.cs
@@ -5,14 +5,11 @@
#nullable disable
using System.Collections;
-using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
using System.Globalization;
-using System.IO;
-using System.Linq;
using System.Runtime.Serialization;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataObject.FormatEnumerator.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataObject.FormatEnumerator.cs
index 51565be7629..47038af4a2f 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataObject.FormatEnumerator.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataObject.FormatEnumerator.cs
@@ -4,7 +4,6 @@
#nullable disable
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Runtime.InteropServices.ComTypes;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataObject.OleConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataObject.OleConverter.cs
index 893496eaf5b..65f0a3b3524 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataObject.OleConverter.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataObject.OleConverter.cs
@@ -4,12 +4,9 @@
#nullable disable
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
-using System.IO;
-using System.Linq;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.ComTypes;
using System.Runtime.Serialization;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataObject.cs
index c6bab51aa09..38ba8cf5c17 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataObject.cs
@@ -11,7 +11,6 @@
#if DEBUG
using System.Globalization;
#endif
-using System.IO;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.ComTypes;
using System.Runtime.Serialization;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataStreamFromComStream.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataStreamFromComStream.cs
index d7ae981b3af..5dfe2058a5c 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataStreamFromComStream.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataStreamFromComStream.cs
@@ -4,7 +4,6 @@
#nullable disable
-using System.IO;
using static Interop;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.ErrorWindow.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.ErrorWindow.cs
index 43fbf0bddf9..d7855a09ec8 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.ErrorWindow.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.ErrorWindow.cs
@@ -4,7 +4,6 @@
#nullable disable
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/FileDialog.Vista.cs b/src/System.Windows.Forms/src/System/Windows/Forms/FileDialog.Vista.cs
index 16031694956..061a426e602 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/FileDialog.Vista.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/FileDialog.Vista.cs
@@ -2,12 +2,9 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
-using System.IO;
using System.Runtime.InteropServices;
-using System.Threading;
using static Interop;
using static Interop.Shell32;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/FileDialog.cs b/src/System.Windows.Forms/src/System/Windows/Forms/FileDialog.cs
index fc2d73c6ccc..19f9ea15639 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/FileDialog.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/FileDialog.cs
@@ -4,13 +4,10 @@
#nullable disable
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing.Design;
-using System.IO;
using System.Runtime.InteropServices;
-using System.Threading;
using static Interop;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/FolderBrowserDialog.cs b/src/System.Windows.Forms/src/System/Windows/Forms/FolderBrowserDialog.cs
index 60ca06fed37..9ce5ded4ced 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/FolderBrowserDialog.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/FolderBrowserDialog.cs
@@ -7,7 +7,6 @@
using System.Buffers;
using System.ComponentModel;
using System.Drawing.Design;
-using System.IO;
using System.Runtime.InteropServices;
using Microsoft.Win32.SafeHandles;
using static Interop;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Form.EnumThreadWindowsCallback.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Form.EnumThreadWindowsCallback.cs
index d376e68e52e..67e5f9229ef 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Form.EnumThreadWindowsCallback.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Form.EnumThreadWindowsCallback.cs
@@ -4,7 +4,6 @@
#nullable disable
-using System.Collections.Generic;
using System.Runtime.InteropServices;
using static Interop;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Help.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Help.cs
index fa614e404f8..a36755ff0cb 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Help.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Help.cs
@@ -8,7 +8,6 @@
using System.Diagnostics;
using System.Drawing;
using System.Globalization;
-using System.IO;
using System.Runtime.InteropServices;
using static Interop;
using static Interop.Hhctl;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/HtmlShim.cs b/src/System.Windows.Forms/src/System/Windows/Forms/HtmlShim.cs
index 4193e790eee..f97f6a65b32 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/HtmlShim.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/HtmlShim.cs
@@ -4,7 +4,6 @@
#nullable disable
-using System.Collections.Generic;
using System.ComponentModel;
using static Interop.Mshtml;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/HtmlShimManager.cs b/src/System.Windows.Forms/src/System/Windows/Forms/HtmlShimManager.cs
index 0e027f3d039..6c14a0daa0a 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/HtmlShimManager.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/HtmlShimManager.cs
@@ -4,7 +4,6 @@
#nullable disable
-using System.Collections.Generic;
using System.Diagnostics;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/IFileReaderService.cs b/src/System.Windows.Forms/src/System/Windows/Forms/IFileReaderService.cs
index 946a87ce94a..38433fc50f2 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/IFileReaderService.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/IFileReaderService.cs
@@ -4,8 +4,6 @@
#nullable disable
-using System.IO;
-
namespace System.Windows.Forms
{
public interface IFileReaderService
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/IKeyboardToolTip.cs b/src/System.Windows.Forms/src/System/Windows/Forms/IKeyboardToolTip.cs
index 27f49fa6e6c..6e4fbe15edd 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/IKeyboardToolTip.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/IKeyboardToolTip.cs
@@ -4,7 +4,6 @@
#nullable disable
-using System.Collections.Generic;
using System.Drawing;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ImageListStreamer.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ImageListStreamer.cs
index 21c5ed42edc..c8a1a4a09b9 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ImageListStreamer.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ImageListStreamer.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.Diagnostics;
-using System.IO;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;
using static Interop;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Gdi/ScreenDcCache.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Gdi/ScreenDcCache.cs
index 2ed1a2276c2..4ec9a256037 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Gdi/ScreenDcCache.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Internal/Gdi/ScreenDcCache.cs
@@ -5,7 +5,6 @@
using System.Diagnostics;
using System.Drawing;
using System.Numerics;
-using System.Threading;
using static Interop;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ItemArray.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ItemArray.cs
index 8af759e334e..42528d2a1af 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ItemArray.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ItemArray.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using static System.Windows.Forms.ItemArray;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/KeyboardToolTipStateMachine.cs b/src/System.Windows.Forms/src/System/Windows/Forms/KeyboardToolTipStateMachine.cs
index 3f37cc394a3..fb7d804b9cd 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/KeyboardToolTipStateMachine.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/KeyboardToolTipStateMachine.cs
@@ -4,8 +4,6 @@
#nullable disable
-using System.Collections.Generic;
-using System.Threading;
using static Interop;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/KeysConverter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/KeysConverter.cs
index 1013ec42772..6358243e36c 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/KeysConverter.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/KeysConverter.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Globalization;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.LinkComparer.cs b/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.LinkComparer.cs
index 3f973255f72..ba0e3a34e78 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.LinkComparer.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.LinkComparer.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
-
namespace System.Windows.Forms
{
public partial class LinkLabel
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.cs b/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.cs
index 3adcd5c429c..97c3bf0c3c6 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.cs
@@ -4,7 +4,6 @@
#nullable disable
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListBindingHelper.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListBindingHelper.cs
index c38cfbaf377..7bfd2e68bf3 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ListBindingHelper.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListBindingHelper.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.AccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.AccessibleObject.cs
index 2a4fd65dbd1..24e3865dc46 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.AccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.AccessibleObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using static Interop;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListView.ListViewAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListView.ListViewAccessibleObject.cs
index 0ff209ef1ab..7f2f21ff274 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ListView.ListViewAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListView.ListViewAccessibleObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using static Interop;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListView.ListViewItemCollection.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListView.ListViewItemCollection.cs
index c685960eb66..b3679cc9fcc 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ListView.ListViewItemCollection.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListView.ListViewItemCollection.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListView.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListView.cs
index d22d80a3c09..e0559b0bb0d 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ListView.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListView.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design;
using System.Diagnostics;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewGroup.ListViewGroupAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewGroup.ListViewGroupAccessibleObject.cs
index 677f7531156..f0baf923256 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewGroup.ListViewGroupAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewGroup.ListViewGroupAccessibleObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using static System.Windows.Forms.ListView;
using static Interop;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.IKeyboardToolTip.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.IKeyboardToolTip.cs
index 511fd51cc14..f2387005b25 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.IKeyboardToolTip.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.IKeyboardToolTip.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemDetailsAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemDetailsAccessibleObject.cs
index c6b49f951c7..7d29e76c669 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemDetailsAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemDetailsAccessibleObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using static Interop;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MergeHistory.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MergeHistory.cs
index cad2fe86f4e..5e3eeb9d317 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MergeHistory.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MergeHistory.cs
@@ -4,8 +4,6 @@
#nullable disable
-using System.Collections.Generic;
-
namespace System.Windows.Forms
{
internal class MergeHistory
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarBodyAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarBodyAccessibleObject.cs
index b399c64b4e4..053859e1a18 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarBodyAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarBodyAccessibleObject.cs
@@ -2,10 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
-using System.Linq;
using static Interop;
using static Interop.ComCtl32;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarRowAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarRowAccessibleObject.cs
index 20acf17b6b2..b06746781c4 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarRowAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarRowAccessibleObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Globalization;
using static Interop;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.MonthCalendarAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.MonthCalendarAccessibleObject.cs
index 7c2c98083c2..780c5ba2b62 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.MonthCalendarAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.MonthCalendarAccessibleObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using static Interop;
using static Interop.ComCtl32;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.cs
index 6194c686ca7..0a46435057f 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.cs
@@ -4,12 +4,10 @@
#nullable disable
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
using System.Globalization;
-using System.Linq;
using System.Runtime.InteropServices;
using System.Windows.Forms.Layout;
using Microsoft.Win32;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/NativeWindow.cs b/src/System.Windows.Forms/src/System/Windows/Forms/NativeWindow.cs
index ed9691cd1fc..1050da24f50 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/NativeWindow.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/NativeWindow.cs
@@ -4,7 +4,6 @@
#nullable disable
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Globalization;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/NumericUpDownAccelerationCollection.cs b/src/System.Windows.Forms/src/System/Windows/Forms/NumericUpDownAccelerationCollection.cs
index f9ac75d347a..4f0999829ad 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/NumericUpDownAccelerationCollection.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/NumericUpDownAccelerationCollection.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/OpenFileDialog.cs b/src/System.Windows.Forms/src/System/Windows/Forms/OpenFileDialog.cs
index cecde6a470a..c15eb547373 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/OpenFileDialog.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/OpenFileDialog.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.ComponentModel;
-using System.IO;
using System.Runtime.InteropServices;
using static Interop;
using static Interop.Shell32;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PictureBox.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PictureBox.cs
index aa0af328776..ca0b2e38430 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/PictureBox.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/PictureBox.cs
@@ -8,11 +8,8 @@
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
-using System.IO;
using System.Net;
using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
using System.Windows.Forms.Layout;
using static Interop;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintControllerWithStatusDialog.BackgroundThread.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintControllerWithStatusDialog.BackgroundThread.cs
index fa41955fb42..27982dfea38 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintControllerWithStatusDialog.BackgroundThread.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintControllerWithStatusDialog.BackgroundThread.cs
@@ -4,8 +4,6 @@
#nullable disable
-using System.Threading;
-
namespace System.Windows.Forms
{
public partial class PrintControllerWithStatusDialog
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ProfessionalColorTable.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ProfessionalColorTable.cs
index 5a179793c88..784f6460bb9 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ProfessionalColorTable.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ProfessionalColorTable.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms.VisualStyles;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/GridEntryComparer.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/GridEntryComparer.cs
index 83cb781c88d..1b7e09e8a93 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/GridEntryComparer.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/GridEntryComparer.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
-
namespace System.Windows.Forms.PropertyGridInternal
{
internal class GridEntryComparer : IComparer
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/MergePropertyDescriptor.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/MergePropertyDescriptor.cs
index b7e5c291fe4..f56ec132e1b 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/MergePropertyDescriptor.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/MergePropertyDescriptor.cs
@@ -9,7 +9,6 @@
using System.ComponentModel.Design.Serialization;
using System.Diagnostics;
using System.Globalization;
-using System.IO;
using System.Runtime.Serialization.Formatters.Binary;
namespace System.Windows.Forms.PropertyGridInternal
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/RelatedCurrencyManager.cs b/src/System.Windows.Forms/src/System/Windows/Forms/RelatedCurrencyManager.cs
index 826a36da054..38432a95b32 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/RelatedCurrencyManager.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/RelatedCurrencyManager.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/RichTextBox.cs b/src/System.Windows.Forms/src/System/Windows/Forms/RichTextBox.cs
index dd19036b8f0..5f7612fca85 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/RichTextBox.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/RichTextBox.cs
@@ -9,7 +9,6 @@
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
-using System.IO;
using System.Runtime.InteropServices;
using System.Text;
using System.Windows.Forms.Layout;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/SaveFileDialog.cs b/src/System.Windows.Forms/src/System/Windows/Forms/SaveFileDialog.cs
index e04761e1db9..557748a66bd 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/SaveFileDialog.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/SaveFileDialog.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.ComponentModel;
-using System.IO;
using System.Runtime.InteropServices;
using static Interop;
using static Interop.Shell32;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Screen.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Screen.cs
index d99f78727e3..fe5d28aa061 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Screen.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Screen.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.Drawing;
-using System.Threading;
using Microsoft.Win32;
using static Interop;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/SendKeys.cs b/src/System.Windows.Forms/src/System/Windows/Forms/SendKeys.cs
index c7cf517f813..9d8299fc28d 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/SendKeys.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/SendKeys.cs
@@ -4,11 +4,9 @@
#nullable disable
-using System.Collections.Generic;
using System.ComponentModel;
using System.Globalization;
using System.Security;
-using System.Threading;
using static Interop;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TabPage.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TabPage.cs
index 6b14e6ad47c..ddf96a95f22 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/TabPage.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/TabPage.cs
@@ -4,7 +4,6 @@
#nullable disable
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TableLayoutSettings.TableLayoutSettingsStub.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TableLayoutSettings.TableLayoutSettingsStub.cs
index b35183afe2e..b1b716385e0 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/TableLayoutSettings.TableLayoutSettingsStub.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/TableLayoutSettings.TableLayoutSettingsStub.cs
@@ -4,7 +4,6 @@
#nullable disable
-using System.Collections.Generic;
using System.ComponentModel;
using System.Windows.Forms.Layout;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TableLayoutSettings.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TableLayoutSettings.cs
index 9898d9faad1..5a9b13537c2 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/TableLayoutSettings.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/TableLayoutSettings.cs
@@ -4,7 +4,6 @@
#nullable disable
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Runtime.Serialization;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TaskDialog.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TaskDialog.cs
index c44bb34bb54..33759ef4cf0 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/TaskDialog.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/TaskDialog.cs
@@ -2,11 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
-using System.IO;
-using System.Linq;
using System.Runtime.InteropServices;
using static Interop;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TaskDialogButtonCollection.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TaskDialogButtonCollection.cs
index aaf5b2b1520..24bc763b729 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/TaskDialogButtonCollection.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/TaskDialogButtonCollection.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Collections.ObjectModel;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TaskDialogPage.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TaskDialogPage.cs
index 61b83c41c92..9ea3b5ebd25 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/TaskDialogPage.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/TaskDialogPage.cs
@@ -2,9 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
-using System.Linq;
using static Interop;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TaskDialogRadioButtonCollection.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TaskDialogRadioButtonCollection.cs
index 74902048173..95a563b9e67 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/TaskDialogRadioButtonCollection.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/TaskDialogRadioButtonCollection.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Collections.ObjectModel;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStrip.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStrip.cs
index 1dc63ca1c6d..5e5ed455f51 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStrip.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStrip.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design.Serialization;
using System.Diagnostics;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropTargetManager.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropTargetManager.cs
index d88e9a5e76a..430d1933c89 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropTargetManager.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropTargetManager.cs
@@ -9,7 +9,6 @@
using System.Drawing;
using System.Globalization;
using System.Runtime.InteropServices;
-using System.Threading;
using static Interop;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripItem.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripItem.cs
index fa463da73d8..1e3a81e6200 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripItem.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripItem.cs
@@ -4,7 +4,6 @@
#nullable disable
-using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
using System.Diagnostics;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripItemCollection.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripItemCollection.cs
index 6287da06b4a..7394649d014 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripItemCollection.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripItemCollection.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Drawing.Design;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripManager.ModalMenuFilter.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripManager.ModalMenuFilter.cs
index bc92078e71e..35ca81768dd 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripManager.ModalMenuFilter.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripManager.ModalMenuFilter.cs
@@ -4,7 +4,6 @@
#nullable disable
-using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripManager.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripManager.cs
index d15623b4e95..4a39e265a14 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripManager.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripManager.cs
@@ -6,7 +6,6 @@
using System.Collections;
using System.Collections.Concurrent;
-using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Globalization;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripSettingsManager.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripSettingsManager.cs
index 59beb25affc..979a5e0a485 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripSettingsManager.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripSettingsManager.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.Collections;
-using System.Collections.Generic;
using System.Diagnostics;
using System.Text;
using System.Text.RegularExpressions;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolTip.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolTip.cs
index 52db9f364b8..70d3306d8be 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolTip.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolTip.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TreeNode.IKeyboardToolTip.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TreeNode.IKeyboardToolTip.cs
index 52eec12e3e0..4298d0c593a 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/TreeNode.IKeyboardToolTip.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/TreeNode.IKeyboardToolTip.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TreeNode.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TreeNode.cs
index 2a7535946fd..f6c90c4f6dd 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/TreeNode.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/TreeNode.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TreeNodeCollection.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TreeNodeCollection.cs
index e9111435744..28b16dc733c 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/TreeNodeCollection.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/TreeNodeCollection.cs
@@ -5,7 +5,6 @@
#nullable disable
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing.Design;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/WebBrowser.cs b/src/System.Windows.Forms/src/System/Windows/Forms/WebBrowser.cs
index 6cc04f04ae3..4e2acc8a99b 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/WebBrowser.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/WebBrowser.cs
@@ -7,7 +7,6 @@
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
-using System.IO;
using System.Runtime.InteropServices;
using System.Text;
using static Interop;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/WebBrowserBase.cs b/src/System.Windows.Forms/src/System/Windows/Forms/WebBrowserBase.cs
index a7da6e0f9ff..68a8e98c719 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/WebBrowserBase.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/WebBrowserBase.cs
@@ -12,7 +12,6 @@
using System.Globalization;
using System.Reflection;
using System.Runtime.InteropServices;
-using System.Threading;
using static Interop;
namespace System.Windows.Forms
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/WindowsFormsSynchronizationContext.cs b/src/System.Windows.Forms/src/System/Windows/Forms/WindowsFormsSynchronizationContext.cs
index 5ad4eba59ba..4d9f384bd51 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/WindowsFormsSynchronizationContext.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/WindowsFormsSynchronizationContext.cs
@@ -6,7 +6,6 @@
using System.ComponentModel;
using System.Diagnostics;
-using System.Threading;
namespace System.Windows.Forms
{
diff --git a/src/System.Windows.Forms/tests/AccessibilityTests/CommonControls1.cs b/src/System.Windows.Forms/tests/AccessibilityTests/CommonControls1.cs
index cc0b11eedca..62ca497bf49 100644
--- a/src/System.Windows.Forms/tests/AccessibilityTests/CommonControls1.cs
+++ b/src/System.Windows.Forms/tests/AccessibilityTests/CommonControls1.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Windows.Forms;
namespace AccessibilityTests
diff --git a/src/System.Windows.Forms/tests/AccessibilityTests/ContainersTesting.cs b/src/System.Windows.Forms/tests/AccessibilityTests/ContainersTesting.cs
index e3e67e881c6..2d64e9b990c 100644
--- a/src/System.Windows.Forms/tests/AccessibilityTests/ContainersTesting.cs
+++ b/src/System.Windows.Forms/tests/AccessibilityTests/ContainersTesting.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Windows.Forms;
namespace AccessibilityTests
diff --git a/src/System.Windows.Forms/tests/AccessibilityTests/DataBindingExample.cs b/src/System.Windows.Forms/tests/AccessibilityTests/DataBindingExample.cs
index 6a248d5b179..3a96ce1e3e1 100644
--- a/src/System.Windows.Forms/tests/AccessibilityTests/DataBindingExample.cs
+++ b/src/System.Windows.Forms/tests/AccessibilityTests/DataBindingExample.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms/tests/AccessibilityTests/DataControls.cs b/src/System.Windows.Forms/tests/AccessibilityTests/DataControls.cs
index 2a85e0c3746..6ec3d5dd0dc 100644
--- a/src/System.Windows.Forms/tests/AccessibilityTests/DataControls.cs
+++ b/src/System.Windows.Forms/tests/AccessibilityTests/DataControls.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Data;
using System.Windows.Forms;
using System.Windows.Forms.Automation;
diff --git a/src/System.Windows.Forms/tests/AccessibilityTests/DialogsTesting.cs b/src/System.Windows.Forms/tests/AccessibilityTests/DialogsTesting.cs
index 33d9dff5e07..5f2685db4a7 100644
--- a/src/System.Windows.Forms/tests/AccessibilityTests/DialogsTesting.cs
+++ b/src/System.Windows.Forms/tests/AccessibilityTests/DialogsTesting.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Windows.Forms;
namespace AccessibilityTests
diff --git a/src/System.Windows.Forms/tests/AccessibilityTests/Main.cs b/src/System.Windows.Forms/tests/AccessibilityTests/Main.cs
index 5a87ddb4230..25a4bc9869c 100644
--- a/src/System.Windows.Forms/tests/AccessibilityTests/Main.cs
+++ b/src/System.Windows.Forms/tests/AccessibilityTests/Main.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Windows.Forms;
namespace AccessibilityTests
diff --git a/src/System.Windows.Forms/tests/AccessibilityTests/MenuForm.cs b/src/System.Windows.Forms/tests/AccessibilityTests/MenuForm.cs
index e91118c4f54..987329029bf 100644
--- a/src/System.Windows.Forms/tests/AccessibilityTests/MenuForm.cs
+++ b/src/System.Windows.Forms/tests/AccessibilityTests/MenuForm.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Windows.Forms;
namespace AccessibilityTests
diff --git a/src/System.Windows.Forms/tests/AccessibilityTests/PrintingTesting.cs b/src/System.Windows.Forms/tests/AccessibilityTests/PrintingTesting.cs
index 38d46f98d0e..eef5c7c85a5 100644
--- a/src/System.Windows.Forms/tests/AccessibilityTests/PrintingTesting.cs
+++ b/src/System.Windows.Forms/tests/AccessibilityTests/PrintingTesting.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms/tests/AccessibilityTests/Program.cs b/src/System.Windows.Forms/tests/AccessibilityTests/Program.cs
index a80ddfe18d4..a2c8546d03f 100644
--- a/src/System.Windows.Forms/tests/AccessibilityTests/Program.cs
+++ b/src/System.Windows.Forms/tests/AccessibilityTests/Program.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Windows.Forms;
namespace AccessibilityTests
diff --git a/src/System.Windows.Forms/tests/AccessibilityTests/RemainingControls.cs b/src/System.Windows.Forms/tests/AccessibilityTests/RemainingControls.cs
index e7a55de00f5..0a1f6cb4d95 100644
--- a/src/System.Windows.Forms/tests/AccessibilityTests/RemainingControls.cs
+++ b/src/System.Windows.Forms/tests/AccessibilityTests/RemainingControls.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Windows.Forms;
namespace AccessibilityTests
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DemoConsole/CustomControls/CustomButtonDesignerActionList.cs b/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DemoConsole/CustomControls/CustomButtonDesignerActionList.cs
index 2ca2b2f3746..c70b50f6f89 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DemoConsole/CustomControls/CustomButtonDesignerActionList.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DemoConsole/CustomControls/CustomButtonDesignerActionList.cs
@@ -1,5 +1,4 @@
using System.ComponentModel;
-using System;
using System.ComponentModel.Design;
using System.Drawing;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DemoConsole/MainForm.cs b/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DemoConsole/MainForm.cs
index 638c86f81cc..1f88475e791 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DemoConsole/MainForm.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DemoConsole/MainForm.cs
@@ -1,10 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
+using System.Drawing;
using System.Windows.Forms;
using System.ComponentModel.Design;
using DesignSurfaceExt;
+using Timer = System.Windows.Forms.Timer;
namespace TestConsole
{
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DemoConsole/Program.cs b/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DemoConsole/Program.cs
index 316ed5496b3..cf24d505622 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DemoConsole/Program.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DemoConsole/Program.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Windows.Forms;
+using System.Windows.Forms;
namespace TestConsole
{
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DesignSurfaceExt/DesignSurfaceExt.cs b/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DesignSurfaceExt/DesignSurfaceExt.cs
index 6fdb95d16b3..2b6cdd267cc 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DesignSurfaceExt/DesignSurfaceExt.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DesignSurfaceExt/DesignSurfaceExt.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.Design;
+using System.ComponentModel.Design;
using System.Drawing;
using System.ComponentModel;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DesignSurfaceExt/DesignerSerializationServiceImpl.cs b/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DesignSurfaceExt/DesignerSerializationServiceImpl.cs
index eb211b8e55a..d026797d79e 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DesignSurfaceExt/DesignerSerializationServiceImpl.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DesignSurfaceExt/DesignerSerializationServiceImpl.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Windows.Forms;
+using System.Windows.Forms;
using System.ComponentModel.Design.Serialization;
using System.Collections;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DesignSurfaceExt/NameCreationServiceImp.cs b/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DesignSurfaceExt/NameCreationServiceImp.cs
index 84d095b9e49..cf9ac793b0b 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DesignSurfaceExt/NameCreationServiceImp.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DesignSurfaceExt/NameCreationServiceImp.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.Design.Serialization;
+using System.ComponentModel.Design.Serialization;
using System.ComponentModel;
//- NameCreationServiceImp - Implementing INameCreationService
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DesignSurfaceExt/TabOrderHooker.cs b/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DesignSurfaceExt/TabOrderHooker.cs
index 6f6f74478b1..1c7d8ec1e95 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DesignSurfaceExt/TabOrderHooker.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DesignSurfaceExt/TabOrderHooker.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.Design;
+using System.ComponentModel.Design;
using System.Reflection;
namespace DesignSurfaceExt
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DesignSurfaceExt/UndoEngineExt.cs b/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DesignSurfaceExt/UndoEngineExt.cs
index 6bdada6561d..a6b51d7ba44 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DesignSurfaceExt/UndoEngineExt.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DesignSurfaceExt/UndoEngineExt.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.Design;
+using System.ComponentModel.Design;
namespace DesignSurfaceExt
{
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/ImageListTests/MauiImageListTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/ImageListTests/MauiImageListTests.cs
index 229ce5dde8a..1ed475d13fb 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/ImageListTests/MauiImageListTests.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/ImageListTests/MauiImageListTests.cs
@@ -4,9 +4,7 @@
using System.ComponentModel;
using System.Diagnostics;
-using System.IO;
using System.Runtime.InteropServices;
-using System.Threading;
using System.Windows.Forms.IntegrationTests.Common;
using ReflectTools;
using WFCTestLib.Log;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiButtonTests/MauiButtonTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiButtonTests/MauiButtonTests.cs
index b2632073b1d..3bc78c94649 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiButtonTests/MauiButtonTests.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiButtonTests/MauiButtonTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Threading;
using System.Windows.Forms.IntegrationTests.Common;
using ReflectTools;
using WFCTestLib.Log;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiComboBoxTests/DerivedComboBox.cs b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiComboBoxTests/DerivedComboBox.cs
index 4c7aebc4f64..de0ad555bcb 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiComboBoxTests/DerivedComboBox.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiComboBoxTests/DerivedComboBox.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
-
namespace System.Windows.Forms.IntegrationTests.MauiTests
{
public class DerivedComboBox : ComboBox
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiComboBoxTests/MauiComboBoxTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiComboBoxTests/MauiComboBoxTests.cs
index bfb8b683267..22df9dafca9 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiComboBoxTests/MauiComboBoxTests.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiComboBoxTests/MauiComboBoxTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Drawing;
-using System.Threading;
using System.Windows.Forms.IntegrationTests.Common;
using ReflectTools;
using WFCTestLib.Log;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiLabelTests/MauiLabelTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiLabelTests/MauiLabelTests.cs
index d5907dc8bf6..95606ce985a 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiLabelTests/MauiLabelTests.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiLabelTests/MauiLabelTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Drawing;
-using System.Threading;
using System.Windows.Forms.IntegrationTests.Common;
using ReflectTools;
using WFCTestLib.Log;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiListViewTests/MauiListViewTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiListViewTests/MauiListViewTests.cs
index 06929116330..0a47cfc3b08 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiListViewTests/MauiListViewTests.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiListViewTests/MauiListViewTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Drawing;
-using System.Threading;
using System.Windows.Forms.IntegrationTests.Common;
using ReflectTools;
using WFCTestLib.Log;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiMonthCalendarTests/MauiMonthCalendarTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiMonthCalendarTests/MauiMonthCalendarTests.cs
index 59b4f878eea..95fa5b618df 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiMonthCalendarTests/MauiMonthCalendarTests.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiMonthCalendarTests/MauiMonthCalendarTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Drawing;
-using System.Threading;
using System.Windows.Forms.IntegrationTests.Common;
using ReflectTools;
using WFCTestLib.Log;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiPrintPreviewDialogTests/MauiPrintPreviewDialogTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiPrintPreviewDialogTests/MauiPrintPreviewDialogTests.cs
index cd781471019..0a5ec3b2e95 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiPrintPreviewDialogTests/MauiPrintPreviewDialogTests.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiPrintPreviewDialogTests/MauiPrintPreviewDialogTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Threading;
using System.Windows.Forms.IntegrationTests.Common;
using ReflectTools;
using WFCTestLib.Log;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiPropertyGridViewTests/PropertyGridViewRowsAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiPropertyGridViewTests/PropertyGridViewRowsAccessibleObjectTests.cs
index 326e15aa280..10e482a035b 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiPropertyGridViewTests/PropertyGridViewRowsAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiPropertyGridViewTests/PropertyGridViewRowsAccessibleObjectTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Drawing;
-using System.Threading;
using System.Windows.Forms.IntegrationTests.Common;
using System.Windows.Forms.PropertyGridInternal;
using ReflectTools;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiRichTextBoxTests/MauiRichTextBoxTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiRichTextBoxTests/MauiRichTextBoxTests.cs
index f4290029ac9..14baab9cca5 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiRichTextBoxTests/MauiRichTextBoxTests.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiRichTextBoxTests/MauiRichTextBoxTests.cs
@@ -4,7 +4,6 @@
using System.Drawing;
using System.Runtime.InteropServices;
-using System.Threading;
using System.Windows.Forms.IntegrationTests.Common;
using ReflectTools;
using WFCTestLib.Log;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiScrollBarTests/MauiScrollBarTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiScrollBarTests/MauiScrollBarTests.cs
index 70f6e32b57a..2c9fb12da69 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiScrollBarTests/MauiScrollBarTests.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiScrollBarTests/MauiScrollBarTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Drawing;
-using System.Threading;
using System.Windows.Forms.IntegrationTests.Common;
using ReflectTools;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiTabControlTests/MauiTabControlTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiTabControlTests/MauiTabControlTests.cs
index 7e227a33ea7..e5353c8c20b 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiTabControlTests/MauiTabControlTests.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiTabControlTests/MauiTabControlTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Drawing;
-using System.Threading;
using System.Windows.Forms.IntegrationTests.Common;
using ReflectTools;
using WFCTestLib.Log;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiTestsHelper/MouseHelper.cs b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiTestsHelper/MouseHelper.cs
index 9de8aadf052..ae34bc67256 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiTestsHelper/MouseHelper.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiTestsHelper/MouseHelper.cs
@@ -4,7 +4,6 @@
using System.Drawing;
using System.Runtime.InteropServices;
-using System.Threading;
using static Interop;
using static Interop.User32;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiToolStripTests/MauiToolStripDropDownTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiToolStripTests/MauiToolStripDropDownTests.cs
index c9aac3ce3a0..183a5f2554e 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiToolStripTests/MauiToolStripDropDownTests.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiToolStripTests/MauiToolStripDropDownTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Threading;
using System.Windows.Forms.IntegrationTests.Common;
using ReflectTools;
using WFCTestLib.Log;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/System.Windows.Forms.IntegrationTests.Common/TestDataSources.cs b/src/System.Windows.Forms/tests/IntegrationTests/System.Windows.Forms.IntegrationTests.Common/TestDataSources.cs
index 528a757fcbe..ac3bd8640df 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/System.Windows.Forms.IntegrationTests.Common/TestDataSources.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/System.Windows.Forms.IntegrationTests.Common/TestDataSources.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
-
namespace System.Windows.Forms.IntegrationTests.Common
{
public static class TestDataSources
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/System.Windows.Forms.IntegrationTests.Common/TestHelpers.cs b/src/System.Windows.Forms/tests/IntegrationTests/System.Windows.Forms.IntegrationTests.Common/TestHelpers.cs
index 744c3d19eb8..ece85512e84 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/System.Windows.Forms.IntegrationTests.Common/TestHelpers.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/System.Windows.Forms.IntegrationTests.Common/TestHelpers.cs
@@ -4,9 +4,7 @@
using System.Diagnostics;
using System.Globalization;
-using System.IO;
using System.Reflection;
-using System.Threading;
using Newtonsoft.Json.Linq;
using static Interop.User32;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/System.Windows.Forms.Maui.IntegrationTests/MauiDataAttribute.cs b/src/System.Windows.Forms/tests/IntegrationTests/System.Windows.Forms.Maui.IntegrationTests/MauiDataAttribute.cs
index 144a0533382..69e93569e6c 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/System.Windows.Forms.Maui.IntegrationTests/MauiDataAttribute.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/System.Windows.Forms.Maui.IntegrationTests/MauiDataAttribute.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
-using System.Linq;
using System.Reflection;
using Xunit;
using Xunit.Sdk;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/System.Windows.Forms.Maui.IntegrationTests/MauiTestHelper.cs b/src/System.Windows.Forms/tests/IntegrationTests/System.Windows.Forms.Maui.IntegrationTests/MauiTestHelper.cs
index c6b7a82f52f..333ecb21ee7 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/System.Windows.Forms.Maui.IntegrationTests/MauiTestHelper.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/System.Windows.Forms.Maui.IntegrationTests/MauiTestHelper.cs
@@ -2,9 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
using System.Reflection;
using System.Windows.Forms.IntegrationTests.Common;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/System.Windows.Forms.Maui.IntegrationTests/MauiTestRunner.cs b/src/System.Windows.Forms/tests/IntegrationTests/System.Windows.Forms.Maui.IntegrationTests/MauiTestRunner.cs
index 3a39adbddba..cd170b66833 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/System.Windows.Forms.Maui.IntegrationTests/MauiTestRunner.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/System.Windows.Forms.Maui.IntegrationTests/MauiTestRunner.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.IO;
using System.Windows.Forms.IntegrationTests.Common;
using System.Xml.Serialization;
using static Interop.User32;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Buttons.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Buttons.cs
index 77a72446eeb..afa953bf23e 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Buttons.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Buttons.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Windows.Forms;
namespace WinformsControlsTest
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Calendar.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Calendar.cs
index 886ebb8506d..0fd1f8891a3 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Calendar.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Calendar.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Windows.Forms;
using static System.Windows.Forms.DateTimePicker;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/CollectionEditors.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/CollectionEditors.cs
index a9c39b46d14..51161a5c8c7 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/CollectionEditors.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/CollectionEditors.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Drawing;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ComboBoxes.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ComboBoxes.cs
index 920affde52b..1f5e452fa81 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ComboBoxes.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ComboBoxes.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Windows.Forms;
using System.Windows.Forms.IntegrationTests.Common;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ComboBoxesWithScrollBars.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ComboBoxesWithScrollBars.cs
index 85c6891bd95..4db47e75c7c 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ComboBoxesWithScrollBars.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ComboBoxesWithScrollBars.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/CurrentDPILabel.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/CurrentDPILabel.cs
index 10b451ebdce..d989ab9eedd 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/CurrentDPILabel.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/CurrentDPILabel.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.ComponentModel;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/DataGridViewInVirtualModeTest.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/DataGridViewInVirtualModeTest.cs
index 947ca870260..56457c8b179 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/DataGridViewInVirtualModeTest.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/DataGridViewInVirtualModeTest.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-using System.Collections.Generic;
using System.Windows.Forms;
namespace WinformsControlsTest
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/DataGridViewTest.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/DataGridViewTest.cs
index dca1d1bb2f0..905366eec33 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/DataGridViewTest.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/DataGridViewTest.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Dialogs.ClientGuidConverter.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Dialogs.ClientGuidConverter.cs
index ca3d48aead3..95c67efe07c 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Dialogs.ClientGuidConverter.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Dialogs.ClientGuidConverter.cs
@@ -4,7 +4,6 @@
#nullable enable
-using System;
using System.ComponentModel;
using System.Globalization;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Dialogs.ExposedClientGuidMetadata.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Dialogs.ExposedClientGuidMetadata.cs
index 0e7f5c5e92a..e7e52301519 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Dialogs.ExposedClientGuidMetadata.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Dialogs.ExposedClientGuidMetadata.cs
@@ -4,7 +4,6 @@
#nullable enable
-using System;
using System.ComponentModel;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Dialogs.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Dialogs.cs
index 02904126380..210f2c4b66c 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Dialogs.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Dialogs.cs
@@ -4,7 +4,6 @@
#nullable enable
-using System;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ErrorProviderTest.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ErrorProviderTest.cs
index 5f835fffec3..121ca469a32 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ErrorProviderTest.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ErrorProviderTest.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Windows.Forms;
namespace WinformsControlsTest
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/FileDialog.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/FileDialog.cs
index 39f15f20774..235f099b735 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/FileDialog.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/FileDialog.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Windows.Forms;
namespace WinformsControlsTest
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/FormBorderStyles.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/FormBorderStyles.cs
index d685f3f5faf..9f9bdc02369 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/FormBorderStyles.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/FormBorderStyles.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Windows.Forms;
namespace WindowsFormsApp1
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ListViewTest.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ListViewTest.cs
index 4e3a683052c..b55d0e4cf27 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ListViewTest.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ListViewTest.cs
@@ -2,10 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Diagnostics;
using System.Drawing;
-using System.IO;
using System.Windows.Forms;
namespace WinformsControlsTest
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MainForm.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MainForm.cs
index a51221eea2f..0f142ad7fa4 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MainForm.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MainForm.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MdiChild.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MdiChild.cs
index 154ca2b2c1a..58c8204fa28 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MdiChild.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MdiChild.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Windows.Forms;
namespace WinformsControlsTest
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MdiParent.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MdiParent.cs
index 4dd8f550fed..f8e00455a76 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MdiParent.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MdiParent.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Runtime.InteropServices;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MenuStripAndCheckedListBox.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MenuStripAndCheckedListBox.cs
index b0e54485f5a..d2e4ec66e5b 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MenuStripAndCheckedListBox.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MenuStripAndCheckedListBox.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MessageBoxes.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MessageBoxes.cs
index 9aea67635a3..b5372b3355e 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MessageBoxes.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MessageBoxes.cs
@@ -4,7 +4,6 @@
#nullable enable
-using System;
using System.Windows.Forms;
namespace WinformsControlsTest
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MultipleControls.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MultipleControls.cs
index 546a4f7e37d..8a703147c95 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MultipleControls.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/MultipleControls.cs
@@ -2,10 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.ComponentModel;
using System.Drawing;
-using System.Threading;
using System.Windows.Forms;
namespace WinformsControlsTest
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/PictureBoxes.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/PictureBoxes.cs
index f85b67fab2c..28749c57af8 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/PictureBoxes.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/PictureBoxes.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.ComponentModel;
using System.Windows.Forms;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Program.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Program.cs
index d93e5bf5770..9897a4187df 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Program.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/Program.cs
@@ -2,9 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Drawing;
-using System.Threading;
using System.Windows.Forms;
namespace WinformsControlsTest
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/RichTextBoxes.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/RichTextBoxes.cs
index 0d1f445cb52..863697c39d9 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/RichTextBoxes.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/RichTextBoxes.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-using System.IO;
using System.Windows.Forms;
namespace WinformsControlsTest
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ScalingBeforeChanges.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ScalingBeforeChanges.cs
index 6a58e05ddcc..908cecc1dfc 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ScalingBeforeChanges.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ScalingBeforeChanges.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Diagnostics;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ScrollBars.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ScrollBars.cs
index 765879d38e3..813a2237208 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ScrollBars.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ScrollBars.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Windows.Forms;
namespace WinformsControlsTest
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/TaskDialogSamples.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/TaskDialogSamples.cs
index a25801a35d2..1eb04a7066e 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/TaskDialogSamples.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/TaskDialogSamples.cs
@@ -2,13 +2,11 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
-using System.Threading.Tasks;
using System.Windows.Forms;
+using Timer = System.Windows.Forms.Timer;
namespace WinformsControlsTest
{
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/TrackBars.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/TrackBars.cs
index 318c9ac9903..e937d73ae66 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/TrackBars.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/TrackBars.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
using System.Windows.Forms;
namespace WinformsControlsTest
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/UserControls/UserControlWithObjectCollectionEditor.cs b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/UserControls/UserControlWithObjectCollectionEditor.cs
index 16336fef849..4d2dff1f61a 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/UserControls/UserControlWithObjectCollectionEditor.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/UserControls/UserControlWithObjectCollectionEditor.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System;
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design;
using System.Drawing.Design;
diff --git a/src/System.Windows.Forms/tests/InteropTests/AccessibleObjectTests.cs b/src/System.Windows.Forms/tests/InteropTests/AccessibleObjectTests.cs
index b175ad5f5f6..6f6790aedd3 100644
--- a/src/System.Windows.Forms/tests/InteropTests/AccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/InteropTests/AccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Runtime.InteropServices;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/TestUtilities/BinarySerialization.cs b/src/System.Windows.Forms/tests/TestUtilities/BinarySerialization.cs
index 8ae6eb83462..8183108036a 100644
--- a/src/System.Windows.Forms/tests/TestUtilities/BinarySerialization.cs
+++ b/src/System.Windows.Forms/tests/TestUtilities/BinarySerialization.cs
@@ -2,9 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.Serialization.Formatters;
diff --git a/src/System.Windows.Forms/tests/TestUtilities/ScrollBarTestHelper.cs b/src/System.Windows.Forms/tests/TestUtilities/ScrollBarTestHelper.cs
index d1d4e00b477..80af9e704e8 100644
--- a/src/System.Windows.Forms/tests/TestUtilities/ScrollBarTestHelper.cs
+++ b/src/System.Windows.Forms/tests/TestUtilities/ScrollBarTestHelper.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
-
namespace System.Windows.Forms.TestUtilities
{
public static class ScrollBarTestHelper
diff --git a/src/System.Windows.Forms/tests/TestUtilities/ThreadExceptionFixture.cs b/src/System.Windows.Forms/tests/TestUtilities/ThreadExceptionFixture.cs
index 565f00f16d5..70ac6d33f74 100644
--- a/src/System.Windows.Forms/tests/TestUtilities/ThreadExceptionFixture.cs
+++ b/src/System.Windows.Forms/tests/TestUtilities/ThreadExceptionFixture.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Runtime.ExceptionServices;
-using System.Threading;
using System.Windows.Forms;
namespace System
diff --git a/src/System.Windows.Forms/tests/TestUtilities/TrackBarTestHelper.cs b/src/System.Windows.Forms/tests/TestUtilities/TrackBarTestHelper.cs
index 4d0fa58efa9..d205ead72e5 100644
--- a/src/System.Windows.Forms/tests/TestUtilities/TrackBarTestHelper.cs
+++ b/src/System.Windows.Forms/tests/TestUtilities/TrackBarTestHelper.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
-
namespace System.Windows.Forms.TestUtilities
{
///
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/CheckBox.CheckBoxAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/CheckBox.CheckBoxAccessibleObjectTests.cs
index 9afc50d6cda..1d0fca8b8af 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/CheckBox.CheckBoxAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/CheckBox.CheckBoxAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop.UiaCore;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/CheckedListBoxAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/CheckedListBoxAccessibleObjectTests.cs
index 0493a71eca5..198f0bed708 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/CheckedListBoxAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/CheckedListBoxAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/DataGridView.DataGridViewEditingPanelAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/DataGridView.DataGridViewEditingPanelAccessibleObjectTests.cs
index 58a4764bb8c..6ab828108c5 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/DataGridView.DataGridViewEditingPanelAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/DataGridView.DataGridViewEditingPanelAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/DataGridViewAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/DataGridViewAccessibleObjectTests.cs
index 2198a3330c2..a5dd0e3dbd3 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/DataGridViewAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/DataGridViewAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Reflection;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/DomainUpDownAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/DomainUpDownAccessibleObjectTests.cs
index 6a46a0a822d..7ab4b3dc16d 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/DomainUpDownAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/DomainUpDownAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/GroupBoxAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/GroupBoxAccessibleObjectTests.cs
index c8566a93e0e..d0abb9e3681 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/GroupBoxAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/GroupBoxAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/HScrollBar.HScrollBarAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/HScrollBar.HScrollBarAccessibleObjectTests.cs
index 214e475935f..3b039f0098a 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/HScrollBar.HScrollBarAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/HScrollBar.HScrollBarAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/LabelAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/LabelAccessibleObjectTests.cs
index 6b053719e16..e986a9ffe74 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/LabelAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/LabelAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ListBoxAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ListBoxAccessibleObjectTests.cs
index 4ff35233fa4..a0e46b84587 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ListBoxAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ListBoxAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/MenuStrip.MenuStripAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/MenuStrip.MenuStripAccessibleObjectTests.cs
index b4cf9a5a74b..fa1b5b73f8a 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/MenuStrip.MenuStripAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/MenuStrip.MenuStripAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
using static Interop.UiaCore;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/MonthCalendar.CalendarAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/MonthCalendar.CalendarAccessibleObjectTests.cs
index f897e62a5d6..b53970fc39e 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/MonthCalendar.CalendarAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/MonthCalendar.CalendarAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
using static System.Windows.Forms.MonthCalendar;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/MonthCalendar.CalendarBodyAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/MonthCalendar.CalendarBodyAccessibleObjectTests.cs
index e8b5998f875..b241f8a0bc9 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/MonthCalendar.CalendarBodyAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/MonthCalendar.CalendarBodyAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
using static System.Windows.Forms.MonthCalendar;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/MonthCalendar.CalendarCellAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/MonthCalendar.CalendarCellAccessibleObjectTests.cs
index bd10e430bbb..432866aa418 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/MonthCalendar.CalendarCellAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/MonthCalendar.CalendarCellAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
using static System.Windows.Forms.MonthCalendar;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/MonthCalendar.MonthCalendarAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/MonthCalendar.MonthCalendarAccessibleObjectTests.cs
index c0cc78ee4f3..5c766edd970 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/MonthCalendar.MonthCalendarAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/MonthCalendar.MonthCalendarAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static System.Windows.Forms.MonthCalendar;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/NumericUpDownAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/NumericUpDownAccessibleObjectTests.cs
index 00d9b0303fb..b06bb3a92a8 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/NumericUpDownAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/NumericUpDownAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/PictureBox.PictureBoxAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/PictureBox.PictureBoxAccessibleObjectTests.cs
index edcbcbf98c3..0fb8093ac5a 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/PictureBox.PictureBoxAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/PictureBox.PictureBoxAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
using static Interop.UiaCore;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ProgressBarAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ProgressBarAccessibleObjectTests.cs
index 00bc54d84a1..a5354684237 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ProgressBarAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ProgressBarAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Accessibility;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/PropertyGrid.PropertyGridAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/PropertyGrid.PropertyGridAccessibleObjectTests.cs
index 0e3ba8f166f..8cec8f4b108 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/PropertyGrid.PropertyGridAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/PropertyGrid.PropertyGridAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Windows.Forms.PropertyGridInternal;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/RadioButton.RadioButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/RadioButton.RadioButtonAccessibleObjectTests.cs
index 9aaf1517d3e..21279cc604d 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/RadioButton.RadioButtonAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/RadioButton.RadioButtonAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
using static Interop.UiaCore;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ScrollBar.ScrollBarAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ScrollBar.ScrollBarAccessibleObjectTests.cs
index 53c8f478868..d395fd338aa 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ScrollBar.ScrollBarAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ScrollBar.ScrollBarAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
using static Interop.UiaCore;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/Splitter.SplitterAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/Splitter.SplitterAccessibleObjectTests.cs
index d6e80e802d9..6c05032413e 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/Splitter.SplitterAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/Splitter.SplitterAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
using static Interop.UiaCore;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/StatusStrip.StatusStripAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/StatusStrip.StatusStripAccessibleObjectTests.cs
index eec4777ea55..c74e4180d7f 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/StatusStrip.StatusStripAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/StatusStrip.StatusStripAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
using static Interop.UiaCore;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/TextBoxAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/TextBoxAccessibleObjectTests.cs
index fa82454cb07..4f1de87565e 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/TextBoxAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/TextBoxAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests.AccessibleObjects
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/TextBoxBaseAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/TextBoxBaseAccessibleObjectTests.cs
index 94f79e3ade9..c5ba86a043b 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/TextBoxBaseAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/TextBoxBaseAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ToolStripAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ToolStripAccessibleObjectTests.cs
index 5bce5ad4b47..b01eb01f096 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ToolStripAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ToolStripAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ToolStripControlHost.ToolStripHostedControlAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ToolStripControlHost.ToolStripHostedControlAccessibleObjectTests.cs
index c3a3174c074..a7500e10fe0 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ToolStripControlHost.ToolStripHostedControlAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ToolStripControlHost.ToolStripHostedControlAccessibleObjectTests.cs
@@ -2,9 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
-using System.Linq;
using Xunit;
using static Interop.UiaCore;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ToolStripItemAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ToolStripItemAccessibleObjectTests.cs
index b424c257667..4ee4fe5a7d8 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ToolStripItemAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/ToolStripItemAccessibleObjectTests.cs
@@ -2,9 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
-using System.Linq;
using Xunit;
using static Interop.UiaCore;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/TrackBar.TrackBarAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/TrackBar.TrackBarAccessibleObjectTests.cs
index 9d5615f8975..1ef38480402 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/TrackBar.TrackBarAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/TrackBar.TrackBarAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Runtime.InteropServices;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/TrackBar.TrackBarFirstButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/TrackBar.TrackBarFirstButtonAccessibleObjectTests.cs
index 8e4a05eaf1d..9f871e9fb2c 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/TrackBar.TrackBarFirstButtonAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/TrackBar.TrackBarFirstButtonAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/TrackBar.TrackBarLastButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/TrackBar.TrackBarLastButtonAccessibleObjectTests.cs
index 741a31e1e2f..1e51071f836 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/TrackBar.TrackBarLastButtonAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/TrackBar.TrackBarLastButtonAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/VScrollBar.VScrollBarAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/VScrollBar.VScrollBarAccessibleObjectTests.cs
index 1f3109fb552..69553c04e56 100644
--- a/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/VScrollBar.VScrollBarAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/AccessibleObjects/VScrollBar.VScrollBarAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/BindingNavigatorTests.cs b/src/System.Windows.Forms/tests/UnitTests/BindingNavigatorTests.cs
index 90ef1a73695..f2505662fcf 100644
--- a/src/System.Windows.Forms/tests/UnitTests/BindingNavigatorTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/BindingNavigatorTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using Moq;
diff --git a/src/System.Windows.Forms/tests/UnitTests/CheckedListBoxTests.cs b/src/System.Windows.Forms/tests/UnitTests/CheckedListBoxTests.cs
index f1fbf750fdb..d63e70d184a 100644
--- a/src/System.Windows.Forms/tests/UnitTests/CheckedListBoxTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/CheckedListBoxTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/DataStreamFromComStreamTests.cs b/src/System.Windows.Forms/tests/UnitTests/DataStreamFromComStreamTests.cs
index b0b1f8bf2b5..57962638b64 100644
--- a/src/System.Windows.Forms/tests/UnitTests/DataStreamFromComStreamTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/DataStreamFromComStreamTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.IO;
using Moq;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/SerializableAttributeTests.cs b/src/System.Windows.Forms/tests/UnitTests/SerializableAttributeTests.cs
index d9817b97cd4..9dbf5869a30 100644
--- a/src/System.Windows.Forms/tests/UnitTests/SerializableAttributeTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/SerializableAttributeTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests.Serialization
diff --git a/src/System.Windows.Forms/tests/UnitTests/SerializableTypesTests.cs b/src/System.Windows.Forms/tests/UnitTests/SerializableTypesTests.cs
index eb5cc4fd9ed..207fd3dd6de 100644
--- a/src/System.Windows.Forms/tests/UnitTests/SerializableTypesTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/SerializableTypesTests.cs
@@ -2,9 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
-using System.IO;
using System.Runtime.InteropServices;
using System.Text;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Drawing/Design/PaintValueEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Drawing/Design/PaintValueEventArgsTests.cs
index 3f5081adc12..f975bf382a7 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Drawing/Design/PaintValueEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Drawing/Design/PaintValueEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using Moq;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Drawing/Design/PropertyValueUIItemTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Drawing/Design/PropertyValueUIItemTests.cs
index 78478e05a20..aed7e270416 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Drawing/Design/PropertyValueUIItemTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Drawing/Design/PropertyValueUIItemTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Drawing/Design/UITypeEditorTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Drawing/Design/UITypeEditorTests.cs
index 278d4082f28..bceb9d172c3 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Drawing/Design/UITypeEditorTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Drawing/Design/UITypeEditorTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using Moq;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Resources/ResXFileRef.ConverterTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Resources/ResXFileRef.ConverterTests.cs
index d28ffc10890..612c484d07a 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Resources/ResXFileRef.ConverterTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Resources/ResXFileRef.ConverterTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Drawing;
-using System.IO;
using System.Text;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Resources/ResXResourceSetTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Resources/ResXResourceSetTests.cs
index 55998e4dce4..b706225308c 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Resources/ResXResourceSetTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Resources/ResXResourceSetTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.IO;
using Xunit;
namespace System.Resources.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Resources/ResXResourceWriterTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Resources/ResXResourceWriterTests.cs
index dfe2b926101..8180fed02c5 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Resources/ResXResourceWriterTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Resources/ResXResourceWriterTests.cs
@@ -3,8 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
-using System.IO;
using Xunit;
namespace System.Resources.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjectTests.cs
index 0657aa071bc..746750927f8 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Runtime.InteropServices;
using Accessibility;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleRoleControlTypeMapTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleRoleControlTypeMapTests.cs
index 5a7cade33e7..0c961a3655f 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleRoleControlTypeMapTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleRoleControlTypeMapTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop.UiaCore;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ApplicationContextTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ApplicationContextTests.cs
index cc7b7cc752a..81879f900f7 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ApplicationContextTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ApplicationContextTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Moq;
using Moq.Protected;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ApplicationTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ApplicationTests.cs
index 40bad4b168e..33df7ed1ebb 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ApplicationTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ApplicationTests.cs
@@ -2,12 +2,9 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Globalization;
-using System.IO;
-using System.Threading;
using System.Windows.Forms.VisualStyles;
using Microsoft.DotNet.RemoteExecutor;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxHost.ConnectionPointCookieTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxHost.ConnectionPointCookieTests.cs
index f9bb5f8d4fa..c746d2b4142 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxHost.ConnectionPointCookieTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxHost.ConnectionPointCookieTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxHostTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxHostTests.cs
index bb86f79c4d3..beabdceddaf 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxHostTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxHostTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design;
using System.Drawing;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingCompleteEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingCompleteEventArgsTests.cs
index fb2e37027be..3ed1a4bc83c 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingCompleteEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingCompleteEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingContextTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingContextTests.cs
index 445000dfec1..59aae2e0e42 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingContextTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingContextTests.cs
@@ -3,9 +3,7 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
-using System.Linq;
using System.Reflection;
using Moq;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingManagerDataErrorEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingManagerDataErrorEventArgsTests.cs
index 50bc34485c4..0cf0d8ab27b 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingManagerDataErrorEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingManagerDataErrorEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingMemberInfoTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingMemberInfoTests.cs
index 410b480cc91..c921e15a936 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingMemberInfoTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingMemberInfoTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingSourceTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingSourceTests.cs
index 2ec1d0c4714..f4592405721 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingSourceTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingSourceTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using Moq;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingTests.cs
index 13bec06c0f2..6b3da664d5f 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Globalization;
using System.Security;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Button.ButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Button.ButtonAccessibleObjectTests.cs
index f2cdba5a4e7..a3ad983b8cb 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Button.ButtonAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Button.ButtonAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
using static Interop.UiaCore;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ButtonBase.ButtonBaseAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ButtonBase.ButtonBaseAccessibleObjectTests.cs
index 46e2d8a05d2..26f897ca622 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ButtonBase.ButtonBaseAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ButtonBase.ButtonBaseAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Windows.Forms.TestUtilities;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ButtonBaseTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ButtonBaseTests.cs
index 34733ca44f6..12dc28102fa 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ButtonBaseTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ButtonBaseTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design;
using System.Drawing;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ButtonRenderingTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ButtonRenderingTests.cs
index 7541ddce177..83fbb95129a 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ButtonRenderingTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ButtonRenderingTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms.Metafiles;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ButtonTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ButtonTests.cs
index 4d9538615f2..a6ed750cf55 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ButtonTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ButtonTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.Layout;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ClipboardTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ClipboardTests.cs
index 1c8a462771f..4adf0716ed1 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ClipboardTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ClipboardTests.cs
@@ -6,8 +6,6 @@
using System.ComponentModel;
using System.Drawing;
using System.Drawing.Imaging;
-using System.IO;
-using System.Threading;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColorDialogTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColorDialogTests.cs
index 0042126c5c3..8cf717cb93d 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColorDialogTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColorDialogTests.cs
@@ -2,10 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
-using System.Linq;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColumnHeaderCollectionTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColumnHeaderCollectionTests.cs
index 98c5bf73873..4a6e1341d7e 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColumnHeaderCollectionTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColumnHeaderCollectionTests.cs
@@ -3,9 +3,7 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
-using System.Linq;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColumnHeaderConverterTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColumnHeaderConverterTests.cs
index 5196d5c5a02..89ea0d708ec 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColumnHeaderConverterTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColumnHeaderConverterTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design.Serialization;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColumnHeaderTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColumnHeaderTests.cs
index b8e040db2c0..2a95b94dbaf 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColumnHeaderTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColumnHeaderTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using Moq;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColumnReorderedEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColumnReorderedEventArgsTests.cs
index b115aa330f2..82cd50c8461 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColumnReorderedEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ColumnReorderedEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxAccessibleObjectTests.cs
index 399deca7eb6..f7b9ed9b3be 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildDropDownButtonUiaProviderTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildDropDownButtonUiaProviderTests.cs
index 8a8e0a088e0..ffbbf2146d9 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildDropDownButtonUiaProviderTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildDropDownButtonUiaProviderTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildEditUiaProviderTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildEditUiaProviderTests.cs
index 7f9a243c841..fd5c3f170a6 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildEditUiaProviderTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildEditUiaProviderTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildListUiaProviderTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildListUiaProviderTests.cs
index d0e77f8fcf4..59a3687c331 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildListUiaProviderTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildListUiaProviderTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildTextUiaProviderTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildTextUiaProviderTests.cs
index 11d37a22095..6c6df7fbb47 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildTextUiaProviderTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxChildTextUiaProviderTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxItemAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxItemAccessibleObjectTests.cs
index b93b14927cd..3ed8245e5f8 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxItemAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxItemAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms.IntegrationTests.Common;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxUiaTextProviderTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxUiaTextProviderTests.cs
index 6d75ee7e263..c2d5a79cd70 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxUiaTextProviderTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBox.ComboBoxUiaTextProviderTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms.Automation;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBoxTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBoxTests.cs
index 39fe2783d7e..10f876f4185 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBoxTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ComboBoxTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using Moq;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/CommonDialogTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/CommonDialogTests.cs
index 74cda813e04..7480072cb0e 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/CommonDialogTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/CommonDialogTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Reflection;
using Microsoft.DotNet.RemoteExecutor;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ContainerControlTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ContainerControlTests.cs
index 9d3ca9dc5d0..1eed75c5836 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ContainerControlTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ContainerControlTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ContentsResizedEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ContentsResizedEventArgsTests.cs
index 40d778e64fb..c4b53d82241 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ContentsResizedEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ContentsResizedEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Control.ControlAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Control.ControlAccessibleObjectTests.cs
index 4ac7f9a63fc..a01eb3df16b 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Control.ControlAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Control.ControlAccessibleObjectTests.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
-using System.Linq;
using System.Runtime.Serialization;
using System.Windows.Forms.Automation;
using Accessibility;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlBindingsCollectionTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlBindingsCollectionTests.cs
index 77d794bd3e4..f0019002e62 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlBindingsCollectionTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlBindingsCollectionTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Globalization;
using Moq;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlEventArgsTests.cs
index 29e0aa7143a..bd8b831a9a8 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlPaintTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlPaintTests.cs
index a3b46b154cd..f1210005694 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlPaintTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlPaintTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Imaging;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlTests.ControlCollection.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlTests.ControlCollection.cs
index 37726249249..d267f2a0285 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlTests.ControlCollection.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlTests.ControlCollection.cs
@@ -3,10 +3,7 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.Drawing;
-using System.Linq;
-using System.Threading;
using System.Windows.Forms.Layout;
using Moq;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlTests.Handlers.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlTests.Handlers.cs
index c1480549e43..d5bca638272 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlTests.Handlers.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlTests.Handlers.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Drawing.Imaging;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlTests.Methods.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlTests.Methods.cs
index 08f42d2dc7b..c939fce4974 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlTests.Methods.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlTests.Methods.cs
@@ -2,13 +2,10 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design;
using System.Drawing;
-using System.Linq;
using System.Reflection;
-using System.Threading.Tasks;
using System.Windows.Forms.Layout;
using Moq;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlTests.Properties.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlTests.Properties.cs
index a1e00c78e72..2260bab6b4b 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlTests.Properties.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlTests.Properties.cs
@@ -2,13 +2,10 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Drawing.Imaging;
using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
using System.Windows.Forms.Layout;
using Moq;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlTests.cs
index 2ca48afde2b..11ed510f972 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ControlTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/CursorConverterTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/CursorConverterTests.cs
index 711de715eaf..ad7baaa3ff1 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/CursorConverterTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/CursorConverterTests.cs
@@ -2,11 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel.Design.Serialization;
using System.Drawing;
-using System.IO;
-using System.Linq;
using System.Reflection;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/CursorTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/CursorTests.cs
index e1fffaed493..e0d52613976 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/CursorTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/CursorTests.cs
@@ -2,9 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
-using System.IO;
using System.Windows.Forms.Design.Tests;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/CursorsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/CursorsTests.cs
index c5aa210b94d..71ffdd46adc 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/CursorsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/CursorsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Reflection;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataFormatsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataFormatsTests.cs
index 704a90c1598..d917d3fce57 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataFormatsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataFormatsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewAutoSizeColumnModeEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewAutoSizeColumnModeEventArgsTests.cs
index 2c8dd11e6f4..a538bd22017 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewAutoSizeColumnModeEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewAutoSizeColumnModeEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewAutoSizeColumnsModeEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewAutoSizeColumnsModeEventArgsTests.cs
index 6f3cce283d8..33f14a80db7 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewAutoSizeColumnsModeEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewAutoSizeColumnsModeEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellAccessibleObjectTests.cs
index 2cd7930a05f..35c9d7678c1 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Moq;
using Moq.Protected;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellContextMenuStripNeededEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellContextMenuStripNeededEventArgsTests.cs
index 7263094ce9e..c99d2626c3e 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellContextMenuStripNeededEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellContextMenuStripNeededEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellFormattingEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellFormattingEventArgsTests.cs
index e67a9b808d3..e0abf1f726b 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellFormattingEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellFormattingEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellMouseEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellMouseEventArgsTests.cs
index 72b08eedad3..2c98686c28e 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellMouseEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellMouseEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellPaintingEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellPaintingEventArgsTests.cs
index ebd65521933..55c98adb6fe 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellPaintingEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellPaintingEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellParsingEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellParsingEventArgsTests.cs
index c0b52d3fa25..ca23b8fe739 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellParsingEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellParsingEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellStyleTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellStyleTests.cs
index ec565781b3f..80a62b02ac8 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellStyleTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellStyleTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Globalization;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellTests.cs
index 16fec996eb6..136efe4d2aa 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewCellTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Globalization;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewColumnCollectionTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewColumnCollectionTests.cs
index 950d14a192f..9b06618e400 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewColumnCollectionTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewColumnCollectionTests.cs
@@ -3,9 +3,7 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
-using System.Linq;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewColumnDividerDoubleClickEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewColumnDividerDoubleClickEventArgsTests.cs
index e452be2b77f..673b29d792b 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewColumnDividerDoubleClickEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewColumnDividerDoubleClickEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewColumnStateChangedEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewColumnStateChangedEventArgsTests.cs
index 8ef4437b66b..78ae4e3d59e 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewColumnStateChangedEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewColumnStateChangedEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewColumnTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewColumnTests.cs
index 49f7162ea62..2c93ecc700e 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewColumnTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewColumnTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewComboBoxEditingControlAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewComboBoxEditingControlAccessibleObjectTests.cs
index 1e233bdea4c..5740ae1dd8d 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewComboBoxEditingControlAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewComboBoxEditingControlAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static System.Windows.Forms.DataGridViewComboBoxEditingControl;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewDataErrorEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewDataErrorEventArgsTests.cs
index 3f8cceb26b9..17e35693294 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewDataErrorEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewDataErrorEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewEditingControlShowingEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewEditingControlShowingEventArgsTests.cs
index 523ef350deb..bee21f1fd90 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewEditingControlShowingEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewEditingControlShowingEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewElementTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewElementTests.cs
index 2ad7b16e6e0..6a5bd576fac 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewElementTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewElementTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using Moq;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewHeaderCellTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewHeaderCellTests.cs
index 91421e008e7..102afcb642a 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewHeaderCellTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewHeaderCellTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms.VisualStyles;
using Microsoft.DotNet.RemoteExecutor;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowAccessibleObjectTests.cs
index 74d8c840d8c..7a2f8df1f38 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowCancelEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowCancelEventArgsTests.cs
index c873fd10785..7295c945afc 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowCancelEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowCancelEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowContextMenuStripNeededEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowContextMenuStripNeededEventArgsTests.cs
index d8a5e0b25ff..66b89db0533 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowContextMenuStripNeededEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowContextMenuStripNeededEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowDividerDoubleClickEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowDividerDoubleClickEventArgsTests.cs
index 4a52cf89901..1c33c15241c 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowDividerDoubleClickEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowDividerDoubleClickEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowPostPaintEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowPostPaintEventArgsTests.cs
index 48a5eab94b3..fa59ad3a15f 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowPostPaintEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowPostPaintEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowPrePaintEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowPrePaintEventArgsTests.cs
index 77de15412d8..1c6a2f64e14 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowPrePaintEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowPrePaintEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowStateChangedEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowStateChangedEventArgsTests.cs
index f1a7bee5925..83a2c0cec59 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowStateChangedEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowStateChangedEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowTests.cs
index 029bbc540e9..aa6cd394bc2 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewRowTests.cs
@@ -2,11 +2,9 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Globalization;
-using System.Linq;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewSelectedCellCollectionTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewSelectedCellCollectionTests.cs
index 2a53b5bcd17..4afc6859eb3 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewSelectedCellCollectionTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewSelectedCellCollectionTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewSelectedColumnCollectionTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewSelectedColumnCollectionTests.cs
index 3bf92e28d6a..45026bd729f 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewSelectedColumnCollectionTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewSelectedColumnCollectionTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewSelectedRowCollectionTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewSelectedRowCollectionTests.cs
index 71f103c5c0c..ec18ee9ac96 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewSelectedRowCollectionTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewSelectedRowCollectionTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewTests.cs
index 5f193dcb1c2..c35f42cbf85 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewTextBoxEditingControl.DataGridViewTextBoxEditingControlAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewTextBoxEditingControl.DataGridViewTextBoxEditingControlAccessibleObjectTests.cs
index 141bfe9ce94..628b75ac174 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewTextBoxEditingControl.DataGridViewTextBoxEditingControlAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewTextBoxEditingControl.DataGridViewTextBoxEditingControlAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static System.Windows.Forms.DataGridViewTextBoxEditingControl;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewTextBoxEditingControlTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewTextBoxEditingControlTests.cs
index 40385abaf80..86a5efee516 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewTextBoxEditingControlTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataGridViewTextBoxEditingControlTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataObjectTests.cs
index 6b16f954162..c6dc25c9863 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DataObjectTests.cs
@@ -2,12 +2,9 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
using System.Drawing;
-using System.IO;
-using System.Linq;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.ComTypes;
using System.Runtime.Serialization;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DateRangeEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DateRangeEventArgsTests.cs
index 806af12b7a5..f586a6794ff 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DateRangeEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DateRangeEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DateTimePicker.DateTimePickerAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DateTimePicker.DateTimePickerAccessibleObjectTests.cs
index 44f92b806f1..d37d02d3ad0 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DateTimePicker.DateTimePickerAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DateTimePicker.DateTimePickerAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static System.Windows.Forms.DateTimePicker;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/ComponentEditorPageTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/ComponentEditorPageTests.cs
index 8b2ac6856d1..51cbbd53f6c 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/ComponentEditorPageTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/ComponentEditorPageTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using Moq;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/DesignerAttributeTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/DesignerAttributeTests.cs
index c4a8148eee0..7836201696b 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/DesignerAttributeTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/DesignerAttributeTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Collections.Immutable;
using System.ComponentModel;
using System.ComponentModel.Design.Serialization;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/EventsTabTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/EventsTabTests.cs
index 37d8b28851e..51ebd97b01e 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/EventsTabTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/EventsTabTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design;
using Moq;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/PropertyTabTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/PropertyTabTests.cs
index 65dcd22156a..f8c9c2ca180 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/PropertyTabTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/PropertyTabTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using Moq;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/ToolStripItemDesignerAvailabilityAttributeTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/ToolStripItemDesignerAvailabilityAttributeTests.cs
index 36e865c71c7..7531afaba54 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/ToolStripItemDesignerAvailabilityAttributeTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/ToolStripItemDesignerAvailabilityAttributeTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/WindowsFormsComponentEditorTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/WindowsFormsComponentEditorTests.cs
index df3916b17df..f7bc6d387b0 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/WindowsFormsComponentEditorTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Design/WindowsFormsComponentEditorTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using Moq;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DockPaddingEdgesTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DockPaddingEdgesTests.cs
index a9aa817b28e..32f3a607a82 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DockPaddingEdgesTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DockPaddingEdgesTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DockingAttributeTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DockingAttributeTests.cs
index 19a590cff30..0ac1b27505c 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DockingAttributeTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DockingAttributeTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DomainUpDownTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DomainUpDownTests.cs
index 79df001ff55..24cd2641567 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DomainUpDownTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DomainUpDownTests.cs
@@ -2,10 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
-using System.Linq;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DragEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DragEventArgsTests.cs
index 550a68a9b4c..9807e6e574f 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DragEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DragEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawItemEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawItemEventArgsTests.cs
index e9f94729596..524ab8a3838 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawItemEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawItemEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawListViewColumnHeaderEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawListViewColumnHeaderEventArgsTests.cs
index 8c34e5d8605..f814777dbd6 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawListViewColumnHeaderEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawListViewColumnHeaderEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawListViewItemEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawListViewItemEventArgsTests.cs
index 5273400644b..020bf3a5f71 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawListViewItemEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawListViewItemEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawListViewSubItemEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawListViewSubItemEventArgsTests.cs
index 357c40f2dfb..cf9f98f8468 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawListViewSubItemEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawListViewSubItemEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawToolTipEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawToolTipEventArgsTests.cs
index f4c1e7c6c3b..72dc83f4751 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawToolTipEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawToolTipEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Moq;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawTreeNodeEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawTreeNodeEventArgsTests.cs
index 15972daa960..6c4f527be83 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawTreeNodeEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/DrawTreeNodeEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ErrorProviderTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ErrorProviderTests.cs
index 7588a2c1314..b83e5db5480 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ErrorProviderTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ErrorProviderTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design;
using System.Drawing;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FeatureSupportTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FeatureSupportTests.cs
index 00fbbbd8d92..2eed44dfe7b 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FeatureSupportTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FeatureSupportTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Reflection;
using Moq;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FileDialogTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FileDialogTests.cs
index 870fdcc9175..7ee0fecd272 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FileDialogTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FileDialogTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Runtime.InteropServices;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FlowLayoutPanelTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FlowLayoutPanelTests.cs
index e2b3123a030..dd73f80c52c 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FlowLayoutPanelTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FlowLayoutPanelTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FontCacheTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FontCacheTests.cs
index 8b71170fefa..a08f71963d1 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FontCacheTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FontCacheTests.cs
@@ -3,8 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Drawing;
-using System.Threading;
-using System.Threading.Tasks;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FontDialogTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FontDialogTests.cs
index d93baa34dfa..1f40d31b9dd 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FontDialogTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FontDialogTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Form.FormAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Form.FormAccessibleObjectTests.cs
index 75026a424fa..eccab3ff5d4 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Form.FormAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Form.FormAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static System.Windows.Forms.Form;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FormTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FormTests.cs
index fe342ed63ca..08dd3e434c4 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FormTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/FormTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using Moq;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/GroupBoxTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/GroupBoxTests.cs
index 84c0899ed96..8aa5431354b 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/GroupBoxTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/GroupBoxTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.Layout;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/HScrollPropertiesTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/HScrollPropertiesTests.cs
index 84979f686b4..8d129c0f111 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/HScrollPropertiesTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/HScrollPropertiesTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/HelpEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/HelpEventArgsTests.cs
index ba5ed192c04..1147bdb818d 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/HelpEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/HelpEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/HelpProviderTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/HelpProviderTests.cs
index be036ba1c78..c79f0f0ef4d 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/HelpProviderTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/HelpProviderTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/HtmlDocumentTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/HtmlDocumentTests.cs
index 535e9b6534f..61c77d70160 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/HtmlDocumentTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/HtmlDocumentTests.cs
@@ -2,12 +2,9 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
-using System.IO;
using System.Runtime.InteropServices;
using System.Text;
-using System.Threading.Tasks;
using System.Windows.Forms.TestUtilities;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/HtmlElementTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/HtmlElementTests.cs
index fd51e2104df..a478fe9af11 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/HtmlElementTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/HtmlElementTests.cs
@@ -2,12 +2,9 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
-using System.IO;
using System.Runtime.InteropServices;
using System.Text;
-using System.Threading.Tasks;
using System.Windows.Forms.TestUtilities;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ImageList.ImageCollectionTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ImageList.ImageCollectionTests.cs
index 60051cf1eb8..5e08422ef73 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ImageList.ImageCollectionTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ImageList.ImageCollectionTests.cs
@@ -3,10 +3,8 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Imaging;
-using System.Linq;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ImageListStreamerTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ImageListStreamerTests.cs
index 3df0d45d629..ef70b1ec0e6 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ImageListStreamerTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ImageListStreamerTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.IO;
using Xunit;
using static System.Windows.Forms.ImageList;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ImageListTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ImageListTests.cs
index ae7a4c9fe34..fbe11f2a894 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ImageListTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ImageListTests.cs
@@ -2,10 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
-using System.IO;
using System.Runtime.Serialization.Formatters.Binary;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/InputLanguageChangedEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/InputLanguageChangedEventArgsTests.cs
index fdada9e47da..a4d3d574d3d 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/InputLanguageChangedEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/InputLanguageChangedEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Globalization;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/InputLanguageChangingEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/InputLanguageChangingEventArgsTests.cs
index a167d6d38fc..92195bceb0d 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/InputLanguageChangingEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/InputLanguageChangingEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Globalization;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/InputLanguageTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/InputLanguageTests.cs
index 634f10ffe2d..563f0396b3b 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/InputLanguageTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/InputLanguageTests.cs
@@ -2,9 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Globalization;
-using System.Linq;
using System.Reflection;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/InvalidateEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/InvalidateEventArgsTests.cs
index a0e0da5fe8e..9ddab85c1c9 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/InvalidateEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/InvalidateEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ItemCheckedEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ItemCheckedEventArgsTests.cs
index 62299c52cfc..ea8895192d6 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ItemCheckedEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ItemCheckedEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LabelTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LabelTests.cs
index fe87fc1f867..85aba61ce71 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LabelTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LabelTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Layout/TableLayoutSettingsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Layout/TableLayoutSettingsTests.cs
index b5306468e69..a4a0af0fcee 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Layout/TableLayoutSettingsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/Layout/TableLayoutSettingsTests.cs
@@ -2,10 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Globalization;
-using System.IO;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
using Moq;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LayoutEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LayoutEventArgsTests.cs
index 11b27460b28..3e436ec3511 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LayoutEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LayoutEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkAreaConverterTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkAreaConverterTests.cs
index 60a8bfe6d62..503d35163dc 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkAreaConverterTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkAreaConverterTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design.Serialization;
using System.Globalization;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkAreaTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkAreaTests.cs
index 7b6ea9c6c4e..2d5fce4bd9c 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkAreaTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkAreaTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkConverterTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkConverterTests.cs
index edf28c70aca..ef2fda5d36a 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkConverterTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkConverterTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel.Design.Serialization;
using System.Globalization;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkLabel.LinkComparerTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkLabel.LinkComparerTests.cs
index deda6983512..9ff6a1fd6dd 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkLabel.LinkComparerTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkLabel.LinkComparerTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkLabel.LinkLabelAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkLabel.LinkLabelAccessibleObjectTests.cs
index 4af4ead9141..ef7cd133938 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkLabel.LinkLabelAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkLabel.LinkLabelAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static System.Windows.Forms.LinkLabel;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkLabelLinkClickedEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkLabelLinkClickedEventArgsTests.cs
index ab8187a1413..e8176392d0f 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkLabelLinkClickedEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/LinkLabelLinkClickedEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBindingHelperTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBindingHelperTests.cs
index 0ce42474cb1..7d9c94a8cfe 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBindingHelperTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBindingHelperTests.cs
@@ -3,10 +3,8 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Globalization;
-using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
using Moq;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBox.IntegerCollectionTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBox.IntegerCollectionTests.cs
index ecdb3011330..f73f1350afb 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBox.IntegerCollectionTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBox.IntegerCollectionTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Linq;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBox.ObjectCollectionTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBox.ObjectCollectionTests.cs
index cd81c72c92e..a7fd912651e 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBox.ObjectCollectionTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBox.ObjectCollectionTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Linq;
using Xunit;
using static Interop.User32;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBoxTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBoxTests.cs
index 493a0433406..cafe4841b11 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBoxTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListBoxTests.cs
@@ -3,10 +3,8 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
-using System.Linq;
using System.Runtime.InteropServices;
using Moq;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListControlTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListControlTests.cs
index 5d37fe4278e..8f445633205 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListControlTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListControlTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Globalization;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListVIew.ListViewAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListVIew.ListViewAccessibleObjectTests.cs
index f93e0c1fe22..e26e6fab4e6 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListVIew.ListViewAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListVIew.ListViewAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
using static System.Windows.Forms.ListViewGroup;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewGroup.ListViewGroupAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewGroup.ListViewGroupAccessibleObjectTests.cs
index c63de87a83c..8dac8b5c035 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewGroup.ListViewGroupAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewGroup.ListViewGroupAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Reflection;
using Microsoft.DotNet.RemoteExecutor;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewGroupCollectionTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewGroupCollectionTests.cs
index e8002298b66..a3a4ae09fab 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewGroupCollectionTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewGroupCollectionTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Linq;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewGroupConverterTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewGroupConverterTests.cs
index 05939d18bef..4f1104e2495 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewGroupConverterTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewGroupConverterTests.cs
@@ -2,10 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design.Serialization;
-using System.Linq;
using Moq;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewGroupTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewGroupTests.cs
index 49d06ef1686..87e73b346c7 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewGroupTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewGroupTests.cs
@@ -2,11 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
-using System.IO;
-using System.Linq;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
using Microsoft.DotNet.RemoteExecutor;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewHitTestInfoTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewHitTestInfoTests.cs
index 221db5059ff..62e3e9c904f 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewHitTestInfoTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewHitTestInfoTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewInsertionMarkTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewInsertionMarkTests.cs
index 9274ac3c59e..d45c1649efa 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewInsertionMarkTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewInsertionMarkTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Microsoft.DotNet.RemoteExecutor;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItem.IKeyboardToolTipTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItem.IKeyboardToolTipTests.cs
index 29f7deda324..0add39d3f58 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItem.IKeyboardToolTipTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItem.IKeyboardToolTipTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
using static System.Windows.Forms.ListViewItem;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItem.ListViewItemAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItem.ListViewItemAccessibleObjectTests.cs
index 2eaa0304f2b..f384948f472 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItem.ListViewItemAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItem.ListViewItemAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Reflection;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItem.ListViewSubItem.ListViewSubItemAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItem.ListViewSubItem.ListViewSubItemAccessibleObjectTests.cs
index 02e2141a7fc..6247835eb52 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItem.ListViewSubItem.ListViewSubItemAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItem.ListViewSubItem.ListViewSubItemAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
using static System.Windows.Forms.ListViewItem.ListViewSubItem;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItemConverterTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItemConverterTests.cs
index b102f50ab9f..b99359a3d0a 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItemConverterTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItemConverterTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design.Serialization;
using System.Drawing;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItemMouseHoverEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItemMouseHoverEventArgsTests.cs
index 3232acf6330..217d1ac10f8 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItemMouseHoverEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItemMouseHoverEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItemSelectionChangedEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItemSelectionChangedEventArgsTests.cs
index 2c29dcb4e38..952e60906f6 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItemSelectionChangedEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItemSelectionChangedEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItemTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItemTests.cs
index ad3a8a665ae..637505ef934 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItemTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewItemTests.cs
@@ -2,9 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
-using System.Linq;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewSubItemCollectionTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewSubItemCollectionTests.cs
index 532182c8f40..f1432cb0c61 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewSubItemCollectionTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewSubItemCollectionTests.cs
@@ -3,9 +3,7 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.Drawing;
-using System.Linq;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewSubItemConverterTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewSubItemConverterTests.cs
index 3a89af63087..668eb84f12d 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewSubItemConverterTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewSubItemConverterTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design.Serialization;
using System.Drawing;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewSubItemTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewSubItemTests.cs
index 614fbb900a7..f8aa0f67857 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewSubItemTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewSubItemTests.cs
@@ -2,9 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
-using System.IO;
using System.Runtime.Serialization.Formatters.Binary;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewTests.cs
index 0adbfc31c15..e1c89e0989c 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ListViewTests.cs
@@ -2,10 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
-using System.Linq;
using System.Windows.Forms.Automation;
using Microsoft.DotNet.RemoteExecutor;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MaskedTextBox.MaskedTextBoxAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MaskedTextBox.MaskedTextBoxAccessibleObjectTests.cs
index 714fbc3fec2..07a14507d0f 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MaskedTextBox.MaskedTextBoxAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MaskedTextBox.MaskedTextBoxAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MdiClientTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MdiClientTests.cs
index 514f8dd3f19..12764963b50 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MdiClientTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MdiClientTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using Moq;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MeasureItemEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MeasureItemEventArgsTests.cs
index 1db565d66be..eeeb52e31b7 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MeasureItemEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MeasureItemEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MenuStripTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MenuStripTests.cs
index d57cf128849..091d46d0235 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MenuStripTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MenuStripTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MessageTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MessageTests.cs
index 5962623ab11..2436a48f176 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MessageTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MessageTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Runtime.InteropServices;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MonthCalendarTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MonthCalendarTests.cs
index 4997825e151..e1c5d5041a8 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MonthCalendarTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/MonthCalendarTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Globalization;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/NativeWindowTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/NativeWindowTests.cs
index 39771951e51..c307accc9af 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/NativeWindowTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/NativeWindowTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/NodeLabelEditEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/NodeLabelEditEventArgsTests.cs
index be7ae039db4..5415104896e 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/NodeLabelEditEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/NodeLabelEditEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/NotifyIconTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/NotifyIconTests.cs
index b9a25bf1b90..cc1e6fc9c55 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/NotifyIconTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/NotifyIconTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using Moq;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/OSFeatureTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/OSFeatureTests.cs
index 4714c871c2d..2c40b19b4e5 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/OSFeatureTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/OSFeatureTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/OpacityConverterTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/OpacityConverterTests.cs
index 4014fb1fe1d..f38eeb82c97 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/OpacityConverterTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/OpacityConverterTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel.Design.Serialization;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/OwnerDrawPropertyBagTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/OwnerDrawPropertyBagTests.cs
index 7ab1e0384ea..dd99c258afc 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/OwnerDrawPropertyBagTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/OwnerDrawPropertyBagTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Drawing;
-using System.IO;
using System.Runtime.Serialization.Formatters.Binary;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PaddingConverterTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PaddingConverterTests.cs
index 55721899db9..8a3ec1c4fd4 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PaddingConverterTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PaddingConverterTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design.Serialization;
using System.Globalization;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PaddingTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PaddingTests.cs
index 9aca9eeeffb..89422938ef7 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PaddingTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PaddingTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PageSetupDialogTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PageSetupDialogTests.cs
index ede52fb4fcb..a9b24510782 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PageSetupDialogTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PageSetupDialogTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing.Printing;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PaintEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PaintEventArgsTests.cs
index 6734eed47a0..b6e1fb8b9fc 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PaintEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PaintEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PanelTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PanelTests.cs
index d8d7c51ffa6..2263a42af46 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PanelTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PanelTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.Layout;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PictureBoxTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PictureBoxTests.cs
index 430a0734585..044be069e8e 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PictureBoxTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PictureBoxTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using Moq;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PopupEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PopupEventArgsTests.cs
index d0ee3d1a279..f183ac826d0 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PopupEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PopupEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PowerStatusTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PowerStatusTests.cs
index 22175636775..c7f4f4e1dbe 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PowerStatusTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PowerStatusTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Linq;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ProfessionalColorTableTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ProfessionalColorTableTests.cs
index 013195f58f6..ad188300f5d 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ProfessionalColorTableTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ProfessionalColorTableTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Microsoft.DotNet.RemoteExecutor;
using Microsoft.Win32;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ProfessionalColorsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ProfessionalColorsTests.cs
index 67237c9a6be..69d265a2c61 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ProfessionalColorsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ProfessionalColorsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ProgressBarTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ProgressBarTests.cs
index 46e46da8da4..39d6104ce30 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ProgressBarTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ProgressBarTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using Moq;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyGridTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyGridTests.cs
index c1d21436afc..af221aceb90 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyGridTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyGridTests.cs
@@ -2,12 +2,10 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design;
using System.Drawing;
using System.Drawing.Design;
-using System.Linq;
using System.Windows.Forms.PropertyGridInternal;
using Moq;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyManagerTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyManagerTests.cs
index 20f08c17cb7..572eb56f398 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyManagerTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyManagerTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using Moq;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyTabChangedEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyTabChangedEventArgsTests.cs
index d294ae86c28..668ba9c9dd4 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyTabChangedEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyTabChangedEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Windows.Forms.Design;
using System.Windows.Forms.PropertyGridInternal;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyValueChangedEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyValueChangedEventArgsTests.cs
index c5f888b29bf..5d97a963887 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyValueChangedEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/PropertyValueChangedEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/QueryAccessibilityHelpEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/QueryAccessibilityHelpEventArgsTests.cs
index d5872023384..d5646b44022 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/QueryAccessibilityHelpEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/QueryAccessibilityHelpEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/RadioButtonTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/RadioButtonTests.cs
index e4c4c41b930..ccc30e0616a 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/RadioButtonTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/RadioButtonTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/RetrieveVirtualItemEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/RetrieveVirtualItemEventArgsTests.cs
index c1d600ed7cb..8221d0d1ce4 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/RetrieveVirtualItemEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/RetrieveVirtualItemEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/RichTextBoxTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/RichTextBoxTests.cs
index d03c44efc11..9e76e1d2dc8 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/RichTextBoxTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/RichTextBoxTests.cs
@@ -2,14 +2,10 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
-using System.IO;
-using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
-using System.Threading;
using System.Windows.Forms.TestUtilities;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ScreenDcCacheTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ScreenDcCacheTests.cs
index 5e116a54209..7f29747de54 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ScreenDcCacheTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ScreenDcCacheTests.cs
@@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Threading;
-using System.Threading.Tasks;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ScreenTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ScreenTests.cs
index 06ee816173e..5a356513644 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ScreenTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ScreenTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ScrollBarTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ScrollBarTests.cs
index 18d5e8948dd..d22168f2743 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ScrollBarTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ScrollBarTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ScrollPropertiesTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ScrollPropertiesTests.cs
index fa7acf17ea9..ec9823db904 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ScrollPropertiesTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ScrollPropertiesTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ScrollableControlTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ScrollableControlTests.cs
index cd59df49ea9..711df5d7173 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ScrollableControlTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ScrollableControlTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Drawing.Imaging;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SearchForVirtualItemEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SearchForVirtualItemEventArgsTests.cs
index c39872253fc..37386e54d66 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SearchForVirtualItemEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SearchForVirtualItemEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SelectedGridItemChangedEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SelectedGridItemChangedEventArgsTests.cs
index a629c5bf76a..335e4dad916 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SelectedGridItemChangedEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SelectedGridItemChangedEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SpecialFolderEnumConverterTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SpecialFolderEnumConverterTests.cs
index 9711b556b95..ab16bf9b847 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SpecialFolderEnumConverterTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SpecialFolderEnumConverterTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.ComponentModel;
-using System.Linq;
using Moq;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SplitContainer.SplitContainerAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SplitContainer.SplitContainerAccessibleObjectTests.cs
index 49f4f98cc55..4c0e1979bb4 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SplitContainer.SplitContainerAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SplitContainer.SplitContainerAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SplitterPanelTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SplitterPanelTests.cs
index 1507e87a958..806f794fed3 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SplitterPanelTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SplitterPanelTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SplitterTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SplitterTests.cs
index b94adb4a545..c4cf332eb75 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SplitterTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SplitterTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/StatusStripTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/StatusStripTests.cs
index 0d369e70da5..0a5fdb8169a 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/StatusStripTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/StatusStripTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SystemInformationTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SystemInformationTests.cs
index 65b97847593..b3b62e22c9f 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SystemInformationTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/SystemInformationTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControl.ControlCollectionTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControl.ControlCollectionTests.cs
index e7dfe36e021..07392070f68 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControl.ControlCollectionTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControl.ControlCollectionTests.cs
@@ -2,10 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
-using System.Linq;
using Moq;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControl.TabControlAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControl.TabControlAccessibleObjectTests.cs
index 80050e57f4d..d68932d3d18 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControl.TabControlAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControl.TabControlAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControl.TabPageCollectionTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControl.TabPageCollectionTests.cs
index 299d4893bb8..879febea15f 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControl.TabPageCollectionTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControl.TabPageCollectionTests.cs
@@ -3,10 +3,8 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
-using System.Linq;
using Moq;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControlCancelEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControlCancelEventArgsTests.cs
index 0248e837606..6434ef24663 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControlCancelEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControlCancelEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControlEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControlEventArgsTests.cs
index 510238f05ff..e29a088a0a8 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControlEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControlEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControlTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControlTests.cs
index b1e1d9581a6..fd91ef16fef 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControlTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabControlTests.cs
@@ -2,10 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
-using System.Linq;
using Moq;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabPage.TabPageAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabPage.TabPageAccessibleObjectTests.cs
index fe5efc82274..13e14719f2d 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabPage.TabPageAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabPage.TabPageAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabPageTests.TabPageControlCollection.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabPageTests.TabPageControlCollection.cs
index ce84484f543..ad7c51df23f 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabPageTests.TabPageControlCollection.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabPageTests.TabPageControlCollection.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Linq;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabPageTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabPageTests.cs
index 6c03b5d4ba3..e1d0429a006 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabPageTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TabPageTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design;
using System.Drawing;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutCellPaintEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutCellPaintEventArgsTests.cs
index bda7c3115c7..ed1b110d429 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutCellPaintEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutCellPaintEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutPanel.TableLayoutPanelAccessibleObectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutPanel.TableLayoutPanelAccessibleObectTests.cs
index 6e125a31851..acaf13f620a 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutPanel.TableLayoutPanelAccessibleObectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutPanel.TableLayoutPanelAccessibleObectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutPanelCellPositionTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutPanelCellPositionTests.cs
index 838036290a3..a48b9173b6d 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutPanelCellPositionTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutPanelCellPositionTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design.Serialization;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutPanelTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutPanelTests.cs
index 40375cb9be1..95c5f34a73b 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutPanelTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutPanelTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.Layout;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutStyleTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutStyleTests.cs
index 694f6e1dfaa..26dd16e120d 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutStyleTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TableLayoutStyleTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design.Serialization;
using System.Reflection;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TaskDialogTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TaskDialogTests.cs
index 22d4cdfbc41..165e3c79e4a 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TaskDialogTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TaskDialogTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Threading.Tasks;
using Microsoft.DotNet.RemoteExecutor;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TextBoxBase.TextBoxBaseUiaTextProviderTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TextBoxBase.TextBoxBaseUiaTextProviderTests.cs
index 2cacbb07512..79b6d491726 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TextBoxBase.TextBoxBaseUiaTextProviderTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TextBoxBase.TextBoxBaseUiaTextProviderTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms.Automation;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TextRendererTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TextRendererTests.cs
index f9572d1c0bf..32d7796e2aa 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TextRendererTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TextRendererTests.cs
@@ -2,12 +2,10 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Drawing.Imaging;
using System.Drawing.Text;
-using System.IO;
using System.Windows.Forms.Metafiles;
using Moq;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStrip.ToolStripAccessibleObjectWrapperForItemsOnOverflowTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStrip.ToolStripAccessibleObjectWrapperForItemsOnOverflowTests.cs
index a7ed5ac218d..1adfe69f0bd 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStrip.ToolStripAccessibleObjectWrapperForItemsOnOverflowTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStrip.ToolStripAccessibleObjectWrapperForItemsOnOverflowTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Reflection;
using Xunit;
using static System.Windows.Forms.ToolStripItem;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripArrowRenderEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripArrowRenderEventArgsTests.cs
index 69d0634a7b2..709785d5794 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripArrowRenderEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripArrowRenderEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripButton.ToolStripButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripButton.ToolStripButtonAccessibleObjectTests.cs
index 5389e997e49..aa8f8097777 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripButton.ToolStripButtonAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripButton.ToolStripButtonAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static System.Windows.Forms.ToolStripButton;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripButtonTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripButtonTests.cs
index bce6dce69d3..850fb5dc640 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripButtonTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripButtonTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripComboBox.ToolStripComboBoxControl.ToolStripComboBoxControlAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripComboBox.ToolStripComboBoxControl.ToolStripComboBoxControlAccessibleObjectTests.cs
index b45b221ab95..5ad807aea96 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripComboBox.ToolStripComboBoxControl.ToolStripComboBoxControlAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripComboBox.ToolStripComboBoxControl.ToolStripComboBoxControlAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static System.Windows.Forms.ToolStripComboBox;
using static System.Windows.Forms.ToolStripComboBox.ToolStripComboBoxControl;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripContentPanelRenderEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripContentPanelRenderEventArgsTests.cs
index 6291af283b6..d42d4f5efbe 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripContentPanelRenderEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripContentPanelRenderEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripContentPanelTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripContentPanelTests.cs
index 90c4b7155eb..917a9bfc64c 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripContentPanelTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripContentPanelTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using Moq;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripControlHostTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripControlHostTests.cs
index 7e3674c4e54..4cf6293f5e7 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripControlHostTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripControlHostTests.cs
@@ -2,11 +2,9 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.Design;
using System.Drawing;
-using System.IO;
using System.Reflection;
using Moq;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripDropDown.ToolStripDropDownAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripDropDown.ToolStripDropDownAccessibleObjectTests.cs
index e15da521cf4..f096450561f 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripDropDown.ToolStripDropDownAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripDropDown.ToolStripDropDownAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static System.Windows.Forms.ToolStripDropDown;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripDropDownButton.ToolStripDropDownButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripDropDownButton.ToolStripDropDownButtonAccessibleObjectTests.cs
index ac193059147..12009410d65 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripDropDownButton.ToolStripDropDownButtonAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripDropDownButton.ToolStripDropDownButtonAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static System.Windows.Forms.ToolStripDropDownButton;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripDropDownItemTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripDropDownItemTests.cs
index a35a10ad0ae..7954c875afb 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripDropDownItemTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripDropDownItemTests.cs
@@ -2,10 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
-using System.Linq;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripDropDownTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripDropDownTests.cs
index fbd3e1386c7..c6ce5436dc7 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripDropDownTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripDropDownTests.cs
@@ -2,10 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
-using System.Linq;
using Moq;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripGrip.ToolStripGripAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripGrip.ToolStripGripAccessibleObjectTests.cs
index 2925a99b85a..293d30b5ac2 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripGrip.ToolStripGripAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripGrip.ToolStripGripAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static System.Windows.Forms.ToolStripGrip;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripGripRenderEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripGripRenderEventArgsTests.cs
index 3999483c158..242d0c69774 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripGripRenderEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripGripRenderEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemClickedEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemClickedEventArgsTests.cs
index 59538ac7252..8df403fe3f3 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemClickedEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemClickedEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemEventArgsTests.cs
index ecf118d0539..ca12cb673f4 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemImageRenderEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemImageRenderEventArgsTests.cs
index 6b6e070b013..e4266ae9e23 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemImageRenderEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemImageRenderEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemRenderEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemRenderEventArgsTests.cs
index 027f111000e..8a04b7bcd1e 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemRenderEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemRenderEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemTests.cs
index 2f4235925ab..fa4f11b5aff 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemTests.cs
@@ -2,10 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
-using System.IO;
using System.Runtime.InteropServices.ComTypes;
using Moq;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemTextRenderEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemTextRenderEventArgsTests.cs
index 02fc012b12a..27b5248b386 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemTextRenderEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripItemTextRenderEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripLabel.ToolStripLabelAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripLabel.ToolStripLabelAccessibleObjectTests.cs
index e8a50d5a09f..b17f1c1323c 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripLabel.ToolStripLabelAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripLabel.ToolStripLabelAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static System.Windows.Forms.ToolStripLabel;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripMenuItem.ToolStripMenuItemAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripMenuItem.ToolStripMenuItemAccessibleObjectTests.cs
index b5565cd0092..d66de951de4 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripMenuItem.ToolStripMenuItemAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripMenuItem.ToolStripMenuItemAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static System.Windows.Forms.ToolStripMenuItem;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripMenuItemTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripMenuItemTests.cs
index 770271d6385..8cdff04dac8 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripMenuItemTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripMenuItemTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripNumericUpDown.ToolStripNumericUpDownAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripNumericUpDown.ToolStripNumericUpDownAccessibleObjectTests.cs
index 0c392acf654..a5e959bb2eb 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripNumericUpDown.ToolStripNumericUpDownAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripNumericUpDown.ToolStripNumericUpDownAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static System.Windows.Forms.ToolStripControlHost;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripOverflow.ToolStripOverflowAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripOverflow.ToolStripOverflowAccessibleObjectTests.cs
index b38084f675b..8c2f6069d93 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripOverflow.ToolStripOverflowAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripOverflow.ToolStripOverflowAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static System.Windows.Forms.ToolStripOverflow;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripOverflowButton.ToolStripOverflowButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripOverflowButton.ToolStripOverflowButtonAccessibleObjectTests.cs
index f23c27680e3..2e59caf6b6d 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripOverflowButton.ToolStripOverflowButtonAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripOverflowButton.ToolStripOverflowButtonAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static System.Windows.Forms.ToolStripOverflowButton;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripPanelRenderEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripPanelRenderEventArgsTests.cs
index 0fbb6e6554e..a0d1e8eb0c6 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripPanelRenderEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripPanelRenderEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripProgressBar.ToolStripProgressBarControl.ToolStripProgressBarControlAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripProgressBar.ToolStripProgressBarControl.ToolStripProgressBarControlAccessibleObjectTests.cs
index 4fb1177732b..1a40e202e3e 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripProgressBar.ToolStripProgressBarControl.ToolStripProgressBarControlAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripProgressBar.ToolStripProgressBarControl.ToolStripProgressBarControlAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static System.Windows.Forms.ToolStripProgressBar;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripRenderEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripRenderEventArgsTests.cs
index a7659ac373b..8cfe68adacc 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripRenderEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripRenderEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripRendererTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripRendererTests.cs
index 56f99285f97..542cd3c30a7 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripRendererTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripRendererTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripSeparator.ToolStripSeparatorAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripSeparator.ToolStripSeparatorAccessibleObjectTests.cs
index 557259b63c8..9d7f554e76c 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripSeparator.ToolStripSeparatorAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripSeparator.ToolStripSeparatorAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static System.Windows.Forms.ToolStripSeparator;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripSeparatorRenderEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripSeparatorRenderEventArgsTests.cs
index e2865d4c3fd..bf646dde143 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripSeparatorRenderEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripSeparatorRenderEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripSeparatorTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripSeparatorTests.cs
index b72a419e7b8..1058a87b735 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripSeparatorTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripSeparatorTests.cs
@@ -2,10 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
-using System.IO;
using Moq;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripSplitButton.ToolStripSplitButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripSplitButton.ToolStripSplitButtonAccessibleObjectTests.cs
index 88bd68fbb4a..022fa487170 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripSplitButton.ToolStripSplitButtonAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripSplitButton.ToolStripSplitButtonAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static System.Windows.Forms.ToolStripSplitButton;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripSplitButtonTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripSplitButtonTests.cs
index 3ac1ba56270..bc71da1fed9 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripSplitButtonTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripSplitButtonTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripStatusLabel.ToolStripStatusLabelAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripStatusLabel.ToolStripStatusLabelAccessibleObjectTests.cs
index 7dc905d81ee..04067f4a8ed 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripStatusLabel.ToolStripStatusLabelAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripStatusLabel.ToolStripStatusLabelAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static System.Windows.Forms.ToolStripStatusLabel;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripTests.cs
index 3d72f4b35da..4ff443b660d 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripTests.cs
@@ -2,13 +2,10 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Drawing.Imaging;
-using System.Linq;
using System.Runtime.InteropServices;
-using System.Threading;
using Moq;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripTextBox.ToolStripTextBoxControlAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripTextBox.ToolStripTextBoxControlAccessibleObjectTests.cs
index 1460646c141..9e64b9edd50 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripTextBox.ToolStripTextBoxControlAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolStripTextBox.ToolStripTextBoxControlAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Reflection;
using Xunit;
using static System.Windows.Forms.Control;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolTipTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolTipTests.cs
index 6b51beb056d..387afcddd70 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolTipTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/ToolTipTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using Moq;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeNode.IKeyboardToolTipTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeNode.IKeyboardToolTipTests.cs
index 0bfbcc26744..ba2513c4745 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeNode.IKeyboardToolTipTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeNode.IKeyboardToolTipTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeNodeMouseClickEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeNodeMouseClickEventArgsTests.cs
index 8d594b02b51..bb376cb0f88 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeNodeMouseClickEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeNodeMouseClickEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.Drawing;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeNodeMouseHoverEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeNodeMouseHoverEventArgsTests.cs
index 66a36237c89..1bb3e92efef 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeNodeMouseHoverEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeNodeMouseHoverEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeNodeTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeNodeTests.cs
index d860bd12110..9a248017e27 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeNodeTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeNodeTests.cs
@@ -2,10 +2,8 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
-using System.Linq;
using System.Runtime.Serialization;
using System.Windows.Forms.TestUtilities;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeViewCancelEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeViewCancelEventArgsTests.cs
index 613bea10f56..d5b7d1c4439 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeViewCancelEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeViewCancelEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeViewEventArgsTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeViewEventArgsTests.cs
index b3e639e067e..929bf664715 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeViewEventArgsTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeViewEventArgsTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeViewHitTestInfoTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeViewHitTestInfoTests.cs
index 884cf9b5bfe..110aa95d282 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeViewHitTestInfoTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeViewHitTestInfoTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeViewImageIndexConverterTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeViewImageIndexConverterTests.cs
index 46ce4741eb5..a2ceed57cba 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeViewImageIndexConverterTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeViewImageIndexConverterTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static System.ComponentModel.TypeConverter;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeViewTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeViewTests.cs
index 5351b95cf2b..d41dc6337fb 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeViewTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/TreeViewTests.cs
@@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.
using System.Collections;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using Moq;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObjectTests.cs
index c007ccaea0d..8320c5c2808 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static System.Windows.Forms.UpDownBase;
using static System.Windows.Forms.UpDownBase.UpDownButtons;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/UpDownBase.UpDownEdit.UpDownEditAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/UpDownBase.UpDownEdit.UpDownEditAccessibleObjectTests.cs
index f23bb279ccd..231fae19991 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/UpDownBase.UpDownEdit.UpDownEditAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/UpDownBase.UpDownEdit.UpDownEditAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/UpDownBaseTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/UpDownBaseTests.cs
index 6f0922e9eb8..65862f8d91f 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/UpDownBaseTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/UpDownBaseTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/UserControlTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/UserControlTests.cs
index 07d5ee2f7dd..91c3e2a68a8 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/UserControlTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/UserControlTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.Layout;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/VScrollPropertiesTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/VScrollPropertiesTests.cs
index 323ae6af09f..28ffcb4ef8d 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/VScrollPropertiesTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/VScrollPropertiesTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/VisualStyles/VisualStyleElementTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/VisualStyles/VisualStyleElementTests.cs
index fddb393f88c..73bc7dd14bc 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/VisualStyles/VisualStyleElementTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/VisualStyles/VisualStyleElementTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Xunit;
namespace System.Windows.Forms.VisualStyles.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/VisualStyles/VisualStyleRendererTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/VisualStyles/VisualStyleRendererTests.cs
index 0c5bd4f96ed..fe5a69d50f1 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/VisualStyles/VisualStyleRendererTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/VisualStyles/VisualStyleRendererTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/WebBrowserTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/WebBrowserTests.cs
index 5373ca085ef..e4c04463a5c 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/WebBrowserTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/WebBrowserTests.cs
@@ -2,13 +2,10 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
-using System.IO;
using System.Runtime.InteropServices;
using System.Text;
-using System.Threading.Tasks;
using System.Windows.Forms.TestUtilities;
using Xunit;
using static Interop;
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/WindowsFormsSynchronizationContextTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/WindowsFormsSynchronizationContextTests.cs
index b50070bf42e..4fce742beda 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/WindowsFormsSynchronizationContextTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/WindowsFormsSynchronizationContextTests.cs
@@ -2,9 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
-using System.Threading;
using Xunit;
namespace System.Windows.Forms.Tests
diff --git a/src/System.Windows.Forms/tests/UnitTests/TestAccessorTests.cs b/src/System.Windows.Forms/tests/UnitTests/TestAccessorTests.cs
index 03a97676ec2..d1f5e63976d 100644
--- a/src/System.Windows.Forms/tests/UnitTests/TestAccessorTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/TestAccessorTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using Microsoft.CSharp.RuntimeBinder;
using Xunit;
diff --git a/src/System.Windows.Forms/tests/UnitTests/TextBoxBaseTests.cs b/src/System.Windows.Forms/tests/UnitTests/TextBoxBaseTests.cs
index b8a28b18c68..ff7b8abd355 100644
--- a/src/System.Windows.Forms/tests/UnitTests/TextBoxBaseTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/TextBoxBaseTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms/tests/UnitTests/TextBoxTests.cs b/src/System.Windows.Forms/tests/UnitTests/TextBoxTests.cs
index d9338a61ecf..51f61b53e38 100644
--- a/src/System.Windows.Forms/tests/UnitTests/TextBoxTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/TextBoxTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Runtime.InteropServices;
diff --git a/src/System.Windows.Forms/tests/UnitTests/TrackBarTests.cs b/src/System.Windows.Forms/tests/UnitTests/TrackBarTests.cs
index 2639bf38561..8341d2ad39d 100644
--- a/src/System.Windows.Forms/tests/UnitTests/TrackBarTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/TrackBarTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms.TestUtilities;
diff --git a/src/System.Windows.Forms/tests/UnitTests/WebBrowserBaseTests.cs b/src/System.Windows.Forms/tests/UnitTests/WebBrowserBaseTests.cs
index 07018dc774d..fe1a242ebdf 100644
--- a/src/System.Windows.Forms/tests/UnitTests/WebBrowserBaseTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/WebBrowserBaseTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using Moq;