diff --git a/Directory.Build.props b/Directory.Build.props
index 78322aac0e..5f171c78f3 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -6,6 +6,7 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/dotnet/command-line-api</PackageProjectUrl>
     <LangVersion>latest</LangVersion>
+    <ImplicitUsings>true</ImplicitUsings>
     <TreatWarningsAsErrors Condition="'$(TreatWarningsAsErrors)' == '' and '$(ContinuousIntegrationBuild)' == 'true'">true</TreatWarningsAsErrors>
   </PropertyGroup>
 
diff --git a/src/Common/ArgumentBuilder.cs b/src/Common/ArgumentBuilder.cs
index 5c24853f32..4607cb179f 100644
--- a/src/Common/ArgumentBuilder.cs
+++ b/src/Common/ArgumentBuilder.cs
@@ -1,5 +1,3 @@
-
-using System;
 using System.CommandLine;
 using System.Reflection;
 
diff --git a/src/System.CommandLine.ApiCompatibility.Tests/ApiContract.cs b/src/System.CommandLine.ApiCompatibility.Tests/ApiContract.cs
index 5a7374af58..e2f8fa5775 100644
--- a/src/System.CommandLine.ApiCompatibility.Tests/ApiContract.cs
+++ b/src/System.CommandLine.ApiCompatibility.Tests/ApiContract.cs
@@ -1,9 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Text;
diff --git a/src/System.CommandLine.ApiCompatibility.Tests/LocalizationTests.cs b/src/System.CommandLine.ApiCompatibility.Tests/LocalizationTests.cs
index 3d730759b1..07940bc4e3 100644
--- a/src/System.CommandLine.ApiCompatibility.Tests/LocalizationTests.cs
+++ b/src/System.CommandLine.ApiCompatibility.Tests/LocalizationTests.cs
@@ -1,5 +1,4 @@
 using System.Globalization;
-using System.Linq;
 using Xunit;
 
 namespace System.CommandLine.ApiCompatibility.Tests
diff --git a/src/System.CommandLine.Suggest.Tests/DotnetSuggestEndToEndTests.cs b/src/System.CommandLine.Suggest.Tests/DotnetSuggestEndToEndTests.cs
index 7e08fc8d65..99c6108119 100644
--- a/src/System.CommandLine.Suggest.Tests/DotnetSuggestEndToEndTests.cs
+++ b/src/System.CommandLine.Suggest.Tests/DotnetSuggestEndToEndTests.cs
@@ -3,8 +3,6 @@
 
 using FluentAssertions;
 using System.CommandLine.Tests.Utility;
-using System.IO;
-using System.Linq;
 using System.Text;
 using Xunit.Abstractions;
 using static System.Environment;
diff --git a/src/System.CommandLine.Suggest.Tests/FileEnumeratorTests.cs b/src/System.CommandLine.Suggest.Tests/FileEnumeratorTests.cs
index 6c6902dcf9..6b35f88854 100644
--- a/src/System.CommandLine.Suggest.Tests/FileEnumeratorTests.cs
+++ b/src/System.CommandLine.Suggest.Tests/FileEnumeratorTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.IO;
 using FluentAssertions;
 using Xunit;
 
diff --git a/src/System.CommandLine.Suggest.Tests/FileSuggestionProviderTests.cs b/src/System.CommandLine.Suggest.Tests/FileSuggestionProviderTests.cs
index 275e0de17f..43e57580be 100644
--- a/src/System.CommandLine.Suggest.Tests/FileSuggestionProviderTests.cs
+++ b/src/System.CommandLine.Suggest.Tests/FileSuggestionProviderTests.cs
@@ -1,6 +1,4 @@
-using System.IO;
-
-namespace System.CommandLine.Suggest.Tests
+namespace System.CommandLine.Suggest.Tests
 {
     public class FileSuggestionProviderTests : SuggestionRegistrationTest, IDisposable
     {
diff --git a/src/System.CommandLine.Suggest.Tests/GlobalToolsSuggestionRegistrationTests.cs b/src/System.CommandLine.Suggest.Tests/GlobalToolsSuggestionRegistrationTests.cs
index d3ef83b775..9762187315 100644
--- a/src/System.CommandLine.Suggest.Tests/GlobalToolsSuggestionRegistrationTests.cs
+++ b/src/System.CommandLine.Suggest.Tests/GlobalToolsSuggestionRegistrationTests.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
-using System.IO;
 using FluentAssertions;
 using Xunit;
 
diff --git a/src/System.CommandLine.Suggest.Tests/SuggestionDispatcherTests.cs b/src/System.CommandLine.Suggest.Tests/SuggestionDispatcherTests.cs
index fa7c4841d2..ddf55714d9 100644
--- a/src/System.CommandLine.Suggest.Tests/SuggestionDispatcherTests.cs
+++ b/src/System.CommandLine.Suggest.Tests/SuggestionDispatcherTests.cs
@@ -2,11 +2,8 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Parsing;
-using System.IO;
-using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using FluentAssertions;
 using Xunit;
 
diff --git a/src/System.CommandLine.Suggest.Tests/SuggestionRegistrationTest.cs b/src/System.CommandLine.Suggest.Tests/SuggestionRegistrationTest.cs
index 7e4aefa367..084f741038 100644
--- a/src/System.CommandLine.Suggest.Tests/SuggestionRegistrationTest.cs
+++ b/src/System.CommandLine.Suggest.Tests/SuggestionRegistrationTest.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.IO;
 using FluentAssertions;
 using Xunit;
 
diff --git a/src/System.CommandLine.Suggest.Tests/SuggestionShellScriptHandlerTest.cs b/src/System.CommandLine.Suggest.Tests/SuggestionShellScriptHandlerTest.cs
index 0ca6f6805e..69a38e89de 100644
--- a/src/System.CommandLine.Suggest.Tests/SuggestionShellScriptHandlerTest.cs
+++ b/src/System.CommandLine.Suggest.Tests/SuggestionShellScriptHandlerTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.IO;
-using System.Threading.Tasks;
 using FluentAssertions;
 using Xunit;
 
diff --git a/src/System.CommandLine.Suggest.Tests/TestSuggestionRegistration.cs b/src/System.CommandLine.Suggest.Tests/TestSuggestionRegistration.cs
index 2d0760becc..9325450c55 100644
--- a/src/System.CommandLine.Suggest.Tests/TestSuggestionRegistration.cs
+++ b/src/System.CommandLine.Suggest.Tests/TestSuggestionRegistration.cs
@@ -1,10 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
 namespace System.CommandLine.Suggest.Tests
 {
     internal class TestSuggestionRegistration : ISuggestionRegistration
diff --git a/src/System.CommandLine.Suggest/CombineSuggestionRegistration.cs b/src/System.CommandLine.Suggest/CombineSuggestionRegistration.cs
index 28def8f4f9..3b55110c76 100644
--- a/src/System.CommandLine.Suggest/CombineSuggestionRegistration.cs
+++ b/src/System.CommandLine.Suggest/CombineSuggestionRegistration.cs
@@ -1,10 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
 namespace System.CommandLine.Suggest
 {
     public class CombineSuggestionRegistration : ISuggestionRegistration
diff --git a/src/System.CommandLine.Suggest/DotnetMuxer.cs b/src/System.CommandLine.Suggest/DotnetMuxer.cs
index 92612e7044..c1de5c2d89 100644
--- a/src/System.CommandLine.Suggest/DotnetMuxer.cs
+++ b/src/System.CommandLine.Suggest/DotnetMuxer.cs
@@ -3,7 +3,6 @@
 
 #if NET6_0_OR_GREATER
 
-using System.IO;
 using System.Runtime.InteropServices;
 
 namespace System.CommandLine.Suggest;
diff --git a/src/System.CommandLine.Suggest/DotnetProfileDirectory.cs b/src/System.CommandLine.Suggest/DotnetProfileDirectory.cs
index 98f7a2d396..732fcde4c5 100644
--- a/src/System.CommandLine.Suggest/DotnetProfileDirectory.cs
+++ b/src/System.CommandLine.Suggest/DotnetProfileDirectory.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.IO;
 using System.Runtime.InteropServices;
 
 namespace System.CommandLine.Suggest
diff --git a/src/System.CommandLine.Suggest/FileEnumerator.cs b/src/System.CommandLine.Suggest/FileEnumerator.cs
index 2fea3e1993..e1a3cf9ef0 100644
--- a/src/System.CommandLine.Suggest/FileEnumerator.cs
+++ b/src/System.CommandLine.Suggest/FileEnumerator.cs
@@ -1,10 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
 namespace System.CommandLine.Suggest
 {
     public static class  FileEnumerator
diff --git a/src/System.CommandLine.Suggest/FileSuggestionRegistration.cs b/src/System.CommandLine.Suggest/FileSuggestionRegistration.cs
index 1b832a26a9..278aed371c 100644
--- a/src/System.CommandLine.Suggest/FileSuggestionRegistration.cs
+++ b/src/System.CommandLine.Suggest/FileSuggestionRegistration.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
-using System.IO;
 using System.Text;
 using static System.Environment;
 
diff --git a/src/System.CommandLine.Suggest/GlobalToolsSuggestionRegistration.cs b/src/System.CommandLine.Suggest/GlobalToolsSuggestionRegistration.cs
index a04481f0fd..ba81212131 100644
--- a/src/System.CommandLine.Suggest/GlobalToolsSuggestionRegistration.cs
+++ b/src/System.CommandLine.Suggest/GlobalToolsSuggestionRegistration.cs
@@ -1,10 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
 namespace System.CommandLine.Suggest
 {
     public class GlobalToolsSuggestionRegistration : ISuggestionRegistration
diff --git a/src/System.CommandLine.Suggest/ISuggestionRegistration.cs b/src/System.CommandLine.Suggest/ISuggestionRegistration.cs
index bd0e84e7c1..bddaba6813 100644
--- a/src/System.CommandLine.Suggest/ISuggestionRegistration.cs
+++ b/src/System.CommandLine.Suggest/ISuggestionRegistration.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.IO;
-
-namespace System.CommandLine.Suggest
+namespace System.CommandLine.Suggest
 {
     public interface ISuggestionRegistration
     {
diff --git a/src/System.CommandLine.Suggest/Program.cs b/src/System.CommandLine.Suggest/Program.cs
index 42182a849c..615b045b4b 100644
--- a/src/System.CommandLine.Suggest/Program.cs
+++ b/src/System.CommandLine.Suggest/Program.cs
@@ -1,10 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-
 namespace System.CommandLine.Suggest
 {
     public class Program
diff --git a/src/System.CommandLine.Suggest/SuggestionDispatcher.cs b/src/System.CommandLine.Suggest/SuggestionDispatcher.cs
index 512712a41f..3f07b08ec2 100644
--- a/src/System.CommandLine.Suggest/SuggestionDispatcher.cs
+++ b/src/System.CommandLine.Suggest/SuggestionDispatcher.cs
@@ -1,13 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using System.CommandLine.Completions;
-
 namespace System.CommandLine.Suggest
 {
     public class SuggestionDispatcher
diff --git a/src/System.CommandLine.Suggest/SuggestionShellScriptHandler.cs b/src/System.CommandLine.Suggest/SuggestionShellScriptHandler.cs
index 5b42745ce5..bcdedf625c 100644
--- a/src/System.CommandLine.Suggest/SuggestionShellScriptHandler.cs
+++ b/src/System.CommandLine.Suggest/SuggestionShellScriptHandler.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.IO;
 using System.Reflection;
 
 namespace System.CommandLine.Suggest
diff --git a/src/System.CommandLine.Suggest/SuggestionStore.cs b/src/System.CommandLine.Suggest/SuggestionStore.cs
index ac93972eb1..86fc7eef43 100644
--- a/src/System.CommandLine.Suggest/SuggestionStore.cs
+++ b/src/System.CommandLine.Suggest/SuggestionStore.cs
@@ -3,8 +3,6 @@
 
 using System.ComponentModel;
 using System.Diagnostics;
-using System.IO;
-using System.Threading.Tasks;
 
 namespace System.CommandLine.Suggest
 {
diff --git a/src/System.CommandLine.Tests/ArgumentTests.cs b/src/System.CommandLine.Tests/ArgumentTests.cs
index 8672fbd379..d84e8bab7b 100644
--- a/src/System.CommandLine.Tests/ArgumentTests.cs
+++ b/src/System.CommandLine.Tests/ArgumentTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using FluentAssertions;
-using System.Linq;
 using FluentAssertions.Execution;
 using Xunit;
 
diff --git a/src/System.CommandLine.Tests/Binding/TestModels.cs b/src/System.CommandLine.Tests/Binding/TestModels.cs
index 49cd584e22..1eddd5858d 100644
--- a/src/System.CommandLine.Tests/Binding/TestModels.cs
+++ b/src/System.CommandLine.Tests/Binding/TestModels.cs
@@ -1,10 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-
 namespace System.CommandLine.Tests.Binding
 {
     public class ClassWithMultiLetterCtorParameters
diff --git a/src/System.CommandLine.Tests/Binding/TypeConversionTests.cs b/src/System.CommandLine.Tests/Binding/TypeConversionTests.cs
index 454942a873..7beebe4b57 100644
--- a/src/System.CommandLine.Tests/Binding/TypeConversionTests.cs
+++ b/src/System.CommandLine.Tests/Binding/TypeConversionTests.cs
@@ -3,10 +3,7 @@
 
 using FluentAssertions;
 using System.Collections;
-using System.Collections.Generic;
 using System.CommandLine.Utility;
-using System.IO;
-using System.Linq;
 using System.Net;
 using FluentAssertions.Execution;
 using Xunit;
diff --git a/src/System.CommandLine.Tests/CommandTests.cs b/src/System.CommandLine.Tests/CommandTests.cs
index cc3a81e7b1..ab60faca36 100644
--- a/src/System.CommandLine.Tests/CommandTests.cs
+++ b/src/System.CommandLine.Tests/CommandTests.cs
@@ -3,7 +3,6 @@
 
 using FluentAssertions;
 using System.CommandLine.Parsing;
-using System.Linq;
 using Xunit;
 
 namespace System.CommandLine.Tests
diff --git a/src/System.CommandLine.Tests/CompilationTests.cs b/src/System.CommandLine.Tests/CompilationTests.cs
index a5daaeec0a..e8176e7b97 100644
--- a/src/System.CommandLine.Tests/CompilationTests.cs
+++ b/src/System.CommandLine.Tests/CompilationTests.cs
@@ -5,7 +5,6 @@
 
 using System.CommandLine.Suggest;
 using System.CommandLine.Tests.Utility;
-using System.IO;
 using System.Text;
 using FluentAssertions;
 using Microsoft.DotNet.PlatformAbstractions;
diff --git a/src/System.CommandLine.Tests/CompletionTests.cs b/src/System.CommandLine.Tests/CompletionTests.cs
index 84d931f863..b566a4d7b5 100644
--- a/src/System.CommandLine.Tests/CompletionTests.cs
+++ b/src/System.CommandLine.Tests/CompletionTests.cs
@@ -3,8 +3,6 @@
 
 using System.CommandLine.Completions;
 using System.CommandLine.Tests.Utility;
-using System.IO;
-using System.Linq;
 using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/src/System.CommandLine.Tests/CustomParsingTests.cs b/src/System.CommandLine.Tests/CustomParsingTests.cs
index fe706a04cb..0bde2370d5 100644
--- a/src/System.CommandLine.Tests/CustomParsingTests.cs
+++ b/src/System.CommandLine.Tests/CustomParsingTests.cs
@@ -1,13 +1,9 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.CommandLine.Parsing;
 using System.CommandLine.Tests.Utility;
-using System.IO;
-using System.Linq;
 using System.Net;
-using System.Threading.Tasks;
 using FluentAssertions;
 using Xunit;
 
diff --git a/src/System.CommandLine.Tests/DirectiveTests.cs b/src/System.CommandLine.Tests/DirectiveTests.cs
index 9d2851726d..a82d18d1c0 100644
--- a/src/System.CommandLine.Tests/DirectiveTests.cs
+++ b/src/System.CommandLine.Tests/DirectiveTests.cs
@@ -2,8 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Parsing;
-using System.Linq;
-using System.Threading.Tasks;
 using FluentAssertions;
 using FluentAssertions.Execution;
 using Xunit;
diff --git a/src/System.CommandLine.Tests/EnvironmentVariableDirectiveTests.cs b/src/System.CommandLine.Tests/EnvironmentVariableDirectiveTests.cs
index 47ee79f8ce..4a95b5e65b 100644
--- a/src/System.CommandLine.Tests/EnvironmentVariableDirectiveTests.cs
+++ b/src/System.CommandLine.Tests/EnvironmentVariableDirectiveTests.cs
@@ -1,9 +1,6 @@
 using System.CommandLine.Help;
 using System.CommandLine.Invocation;
 using FluentAssertions;
-using System.Linq;
-using System.Threading.Tasks;
-
 using Xunit;
 
 namespace System.CommandLine.Tests
diff --git a/src/System.CommandLine.Tests/GetValueByNameParserTests.cs b/src/System.CommandLine.Tests/GetValueByNameParserTests.cs
index b787337c16..9505a44761 100644
--- a/src/System.CommandLine.Tests/GetValueByNameParserTests.cs
+++ b/src/System.CommandLine.Tests/GetValueByNameParserTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using FluentAssertions;
-using System.Collections.Generic;
 using Xunit;
 
 namespace System.CommandLine.Tests;
diff --git a/src/System.CommandLine.Tests/Help/HelpBuilderExtensions.cs b/src/System.CommandLine.Tests/Help/HelpBuilderExtensions.cs
index 6fbc826bd0..db67525f79 100644
--- a/src/System.CommandLine.Tests/Help/HelpBuilderExtensions.cs
+++ b/src/System.CommandLine.Tests/Help/HelpBuilderExtensions.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Help;
-using System.IO;
 
 namespace System.CommandLine.Tests.Help
 {
diff --git a/src/System.CommandLine.Tests/Help/HelpBuilderTests.Approval.cs b/src/System.CommandLine.Tests/Help/HelpBuilderTests.Approval.cs
index 0cb2b097ce..3d7e5b539c 100644
--- a/src/System.CommandLine.Tests/Help/HelpBuilderTests.Approval.cs
+++ b/src/System.CommandLine.Tests/Help/HelpBuilderTests.Approval.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using Xunit;
-using System.IO;
 using ApprovalTests;
 using ApprovalTests.Reporters;
 
diff --git a/src/System.CommandLine.Tests/Help/HelpBuilderTests.Customization.cs b/src/System.CommandLine.Tests/Help/HelpBuilderTests.Customization.cs
index 22cced02a0..7e43d2bdd3 100644
--- a/src/System.CommandLine.Tests/Help/HelpBuilderTests.Customization.cs
+++ b/src/System.CommandLine.Tests/Help/HelpBuilderTests.Customization.cs
@@ -1,10 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.CommandLine.Help;
-using System.IO;
-using System.Linq;
 using FluentAssertions;
 using Xunit;
 using static System.Environment;
diff --git a/src/System.CommandLine.Tests/Help/HelpBuilderTests.cs b/src/System.CommandLine.Tests/Help/HelpBuilderTests.cs
index 4a735a4aad..8756c98341 100644
--- a/src/System.CommandLine.Tests/Help/HelpBuilderTests.cs
+++ b/src/System.CommandLine.Tests/Help/HelpBuilderTests.cs
@@ -2,10 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using FluentAssertions;
-using System.Collections.Generic;
 using System.CommandLine.Help;
-using System.IO;
-using System.Linq;
 using Xunit;
 using static System.Environment;
 
diff --git a/src/System.CommandLine.Tests/HelpOptionTests.cs b/src/System.CommandLine.Tests/HelpOptionTests.cs
index 401656ce0c..7a56f8e2ae 100644
--- a/src/System.CommandLine.Tests/HelpOptionTests.cs
+++ b/src/System.CommandLine.Tests/HelpOptionTests.cs
@@ -5,8 +5,6 @@
 using System.CommandLine.Help;
 using System.CommandLine.Invocation;
 using System.CommandLine.Tests.Utility;
-using System.IO;
-using System.Threading.Tasks;
 using Xunit;
 
 namespace System.CommandLine.Tests;
diff --git a/src/System.CommandLine.Tests/Invocation/CancelOnProcessTerminationTests.cs b/src/System.CommandLine.Tests/Invocation/CancelOnProcessTerminationTests.cs
index 656bba1424..3ab0f10332 100644
--- a/src/System.CommandLine.Tests/Invocation/CancelOnProcessTerminationTests.cs
+++ b/src/System.CommandLine.Tests/Invocation/CancelOnProcessTerminationTests.cs
@@ -6,8 +6,6 @@
 using System.CommandLine.Tests.Utility;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
 using Xunit;
 using Process = System.Diagnostics.Process;
 
diff --git a/src/System.CommandLine.Tests/Invocation/InvocationTests.cs b/src/System.CommandLine.Tests/Invocation/InvocationTests.cs
index b9cc930bef..9240d7e650 100644
--- a/src/System.CommandLine.Tests/Invocation/InvocationTests.cs
+++ b/src/System.CommandLine.Tests/Invocation/InvocationTests.cs
@@ -2,11 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Help;
-using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
 using FluentAssertions;
 using FluentAssertions.Execution;
 using Xunit;
diff --git a/src/System.CommandLine.Tests/Invocation/TypoCorrectionTests.cs b/src/System.CommandLine.Tests/Invocation/TypoCorrectionTests.cs
index 9a9322dc35..bdf19a3991 100644
--- a/src/System.CommandLine.Tests/Invocation/TypoCorrectionTests.cs
+++ b/src/System.CommandLine.Tests/Invocation/TypoCorrectionTests.cs
@@ -1,8 +1,4 @@
-using System.CommandLine.Help;
 using System.CommandLine.Invocation;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 using FluentAssertions;
 using Xunit;
 using static System.Environment;
diff --git a/src/System.CommandLine.Tests/OptionTests.MultipleArgumentsPerToken.cs b/src/System.CommandLine.Tests/OptionTests.MultipleArgumentsPerToken.cs
index 994ecfd06e..8702e06e1a 100644
--- a/src/System.CommandLine.Tests/OptionTests.MultipleArgumentsPerToken.cs
+++ b/src/System.CommandLine.Tests/OptionTests.MultipleArgumentsPerToken.cs
@@ -1,10 +1,8 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Parsing;
 using System.CommandLine.Tests.Utility;
 using FluentAssertions;
-using System.Linq;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/src/System.CommandLine.Tests/OptionTests.cs b/src/System.CommandLine.Tests/OptionTests.cs
index 804af82386..99cb1411f8 100644
--- a/src/System.CommandLine.Tests/OptionTests.cs
+++ b/src/System.CommandLine.Tests/OptionTests.cs
@@ -3,7 +3,6 @@
 
 using System.CommandLine.Parsing;
 using FluentAssertions;
-using System.Linq;
 using FluentAssertions.Execution;
 using Xunit;
 
diff --git a/src/System.CommandLine.Tests/ParseDiagramTests.cs b/src/System.CommandLine.Tests/ParseDiagramTests.cs
index bbcd1cf7e9..af9fb32616 100644
--- a/src/System.CommandLine.Tests/ParseDiagramTests.cs
+++ b/src/System.CommandLine.Tests/ParseDiagramTests.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Parsing;
-using System.IO;
 using FluentAssertions;
 using Xunit;
 
diff --git a/src/System.CommandLine.Tests/ParseDirectiveTests.cs b/src/System.CommandLine.Tests/ParseDirectiveTests.cs
index 8ed409e34d..8cd70ad061 100644
--- a/src/System.CommandLine.Tests/ParseDirectiveTests.cs
+++ b/src/System.CommandLine.Tests/ParseDirectiveTests.cs
@@ -2,8 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using FluentAssertions;
-using System.IO;
-using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/src/System.CommandLine.Tests/ParseErrorReportingTests.cs b/src/System.CommandLine.Tests/ParseErrorReportingTests.cs
index 48d3d0e2d4..623332f698 100644
--- a/src/System.CommandLine.Tests/ParseErrorReportingTests.cs
+++ b/src/System.CommandLine.Tests/ParseErrorReportingTests.cs
@@ -3,12 +3,9 @@
 
 using System.CommandLine.Help;
 using System.CommandLine.Invocation;
-using System.IO;
 using FluentAssertions;
 using Xunit;
 using System.CommandLine.Tests.Utility;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace System.CommandLine.Tests;
 
diff --git a/src/System.CommandLine.Tests/ParseResultTests.cs b/src/System.CommandLine.Tests/ParseResultTests.cs
index 6fa859cd9d..d587805218 100644
--- a/src/System.CommandLine.Tests/ParseResultTests.cs
+++ b/src/System.CommandLine.Tests/ParseResultTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Invocation;
-using System.Linq;
 using System.CommandLine.Parsing;
 using FluentAssertions;
 using Xunit;
diff --git a/src/System.CommandLine.Tests/ParserTests.MultipleArguments.cs b/src/System.CommandLine.Tests/ParserTests.MultipleArguments.cs
index 4f90bb8ea8..0a0474133b 100644
--- a/src/System.CommandLine.Tests/ParserTests.MultipleArguments.cs
+++ b/src/System.CommandLine.Tests/ParserTests.MultipleArguments.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.CommandLine.Parsing;
 using System.CommandLine.Tests.Utility;
 using FluentAssertions;
diff --git a/src/System.CommandLine.Tests/ParserTests.MultiplePositions.cs b/src/System.CommandLine.Tests/ParserTests.MultiplePositions.cs
index 4ec7352a62..a7761faf7d 100644
--- a/src/System.CommandLine.Tests/ParserTests.MultiplePositions.cs
+++ b/src/System.CommandLine.Tests/ParserTests.MultiplePositions.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Parsing;
-using System.Linq;
 using FluentAssertions;
 using Xunit;
 
diff --git a/src/System.CommandLine.Tests/ParserTests.RootCommandAndArg0.cs b/src/System.CommandLine.Tests/ParserTests.RootCommandAndArg0.cs
index d3f83bac35..167153d6c1 100644
--- a/src/System.CommandLine.Tests/ParserTests.RootCommandAndArg0.cs
+++ b/src/System.CommandLine.Tests/ParserTests.RootCommandAndArg0.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Parsing;
-using System.Linq;
 using FluentAssertions;
 using Xunit;
 
diff --git a/src/System.CommandLine.Tests/ParserTests.cs b/src/System.CommandLine.Tests/ParserTests.cs
index 410c67bc82..e09bb8da7a 100644
--- a/src/System.CommandLine.Tests/ParserTests.cs
+++ b/src/System.CommandLine.Tests/ParserTests.cs
@@ -1,13 +1,10 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.CommandLine.Parsing;
 using System.CommandLine.Tests.Utility;
-using System.IO;
 using FluentAssertions;
 using FluentAssertions.Equivalency;
-using System.Linq;
 using FluentAssertions.Common;
 using Xunit;
 
diff --git a/src/System.CommandLine.Tests/Parsing/CommandLineStringSplitterTests.cs b/src/System.CommandLine.Tests/Parsing/CommandLineStringSplitterTests.cs
index 423abdab39..ad6a0c5e8a 100644
--- a/src/System.CommandLine.Tests/Parsing/CommandLineStringSplitterTests.cs
+++ b/src/System.CommandLine.Tests/Parsing/CommandLineStringSplitterTests.cs
@@ -3,7 +3,6 @@
 
 using System.CommandLine.Parsing;
 using System.CommandLine.Tests.Utility;
-using System.IO;
 using FluentAssertions;
 using Xunit;
 
diff --git a/src/System.CommandLine.Tests/ParsingValidationTests.cs b/src/System.CommandLine.Tests/ParsingValidationTests.cs
index 097f6094b1..b159fb4f60 100644
--- a/src/System.CommandLine.Tests/ParsingValidationTests.cs
+++ b/src/System.CommandLine.Tests/ParsingValidationTests.cs
@@ -1,12 +1,8 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.CommandLine.Parsing;
-using System.IO;
 using FluentAssertions;
-using System.Linq;
-using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/src/System.CommandLine.Tests/ResponseFileTests.cs b/src/System.CommandLine.Tests/ResponseFileTests.cs
index 5404fdee22..31d6ca21cf 100644
--- a/src/System.CommandLine.Tests/ResponseFileTests.cs
+++ b/src/System.CommandLine.Tests/ResponseFileTests.cs
@@ -1,12 +1,9 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.CommandLine.Parsing;
 using System.CommandLine.Tests.Utility;
-using System.IO;
 using FluentAssertions;
-using System.Linq;
 using Xunit;
 
 namespace System.CommandLine.Tests
diff --git a/src/System.CommandLine.Tests/SplitCommandLineTests.cs b/src/System.CommandLine.Tests/SplitCommandLineTests.cs
index d454d48d8a..e0e48e47f1 100644
--- a/src/System.CommandLine.Tests/SplitCommandLineTests.cs
+++ b/src/System.CommandLine.Tests/SplitCommandLineTests.cs
@@ -3,7 +3,6 @@
 
 using System.CommandLine.Parsing;
 using System.CommandLine.Tests.Utility;
-using System.IO;
 using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/src/System.CommandLine.Tests/SuggestDirectiveTests.cs b/src/System.CommandLine.Tests/SuggestDirectiveTests.cs
index ec1bb7209e..b108eeb060 100644
--- a/src/System.CommandLine.Tests/SuggestDirectiveTests.cs
+++ b/src/System.CommandLine.Tests/SuggestDirectiveTests.cs
@@ -2,9 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Completions;
-using System.CommandLine.Help;
-using System.IO;
-using System.Threading.Tasks;
 using FluentAssertions;
 using Xunit;
 using static System.Environment;
diff --git a/src/System.CommandLine.Tests/TestCliActions.cs b/src/System.CommandLine.Tests/TestCliActions.cs
index 889d3b06ae..29aae3a556 100644
--- a/src/System.CommandLine.Tests/TestCliActions.cs
+++ b/src/System.CommandLine.Tests/TestCliActions.cs
@@ -2,8 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Invocation;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace System.CommandLine.Tests;
 
diff --git a/src/System.CommandLine.Tests/TokenReplacementTests.cs b/src/System.CommandLine.Tests/TokenReplacementTests.cs
index c96af9b0c2..5ccc68c8d3 100644
--- a/src/System.CommandLine.Tests/TokenReplacementTests.cs
+++ b/src/System.CommandLine.Tests/TokenReplacementTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using FluentAssertions;
 using Xunit;
 
diff --git a/src/System.CommandLine.Tests/UseExceptionHandlerTests.cs b/src/System.CommandLine.Tests/UseExceptionHandlerTests.cs
index 5acf4b59b5..21179a8fd4 100644
--- a/src/System.CommandLine.Tests/UseExceptionHandlerTests.cs
+++ b/src/System.CommandLine.Tests/UseExceptionHandlerTests.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.IO;
-using System.Threading.Tasks;
 using FluentAssertions;
 using Xunit;
 
diff --git a/src/System.CommandLine.Tests/Utility/AssertionExtensions.cs b/src/System.CommandLine.Tests/Utility/AssertionExtensions.cs
index 74dcc77879..e8dced75e2 100644
--- a/src/System.CommandLine.Tests/Utility/AssertionExtensions.cs
+++ b/src/System.CommandLine.Tests/Utility/AssertionExtensions.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
-using System.Linq;
 using FluentAssertions;
 using FluentAssertions.Collections;
 using FluentAssertions.Execution;
diff --git a/src/System.CommandLine.Tests/Utility/ParseResultExtensions.cs b/src/System.CommandLine.Tests/Utility/ParseResultExtensions.cs
index 60e46a2599..174eff3f7b 100644
--- a/src/System.CommandLine.Tests/Utility/ParseResultExtensions.cs
+++ b/src/System.CommandLine.Tests/Utility/ParseResultExtensions.cs
@@ -1,5 +1,4 @@
 using System.CommandLine.Invocation;
-using System.IO;
 
 namespace System.CommandLine.Tests
 {
diff --git a/src/System.CommandLine.Tests/Utility/RemoteExecution.cs b/src/System.CommandLine.Tests/Utility/RemoteExecution.cs
index e4a759df4c..4501d49aa6 100644
--- a/src/System.CommandLine.Tests/Utility/RemoteExecution.cs
+++ b/src/System.CommandLine.Tests/Utility/RemoteExecution.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.IO;
 using Xunit;
 
 namespace System.CommandLine.Tests.Utility
diff --git a/src/System.CommandLine.Tests/Utility/RemoteExecutor.cs b/src/System.CommandLine.Tests/Utility/RemoteExecutor.cs
index 23f7500f27..5b3ebbb83b 100644
--- a/src/System.CommandLine.Tests/Utility/RemoteExecutor.cs
+++ b/src/System.CommandLine.Tests/Utility/RemoteExecutor.cs
@@ -1,15 +1,11 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.IO;
-using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace System.CommandLine.Tests.Utility
 {
diff --git a/src/System.CommandLine.Tests/VersionOptionTests.cs b/src/System.CommandLine.Tests/VersionOptionTests.cs
index b796349136..be86a88fb2 100644
--- a/src/System.CommandLine.Tests/VersionOptionTests.cs
+++ b/src/System.CommandLine.Tests/VersionOptionTests.cs
@@ -3,10 +3,7 @@
 
 using FluentAssertions;
 using FluentAssertions.Execution;
-using System.IO;
-using System.Linq;
 using System.Reflection;
-using System.Threading.Tasks;
 using Xunit;
 using static System.Environment;
 
diff --git a/src/System.CommandLine/AliasSet.cs b/src/System.CommandLine/AliasSet.cs
index 0fed8a5d75..3dd298c336 100644
--- a/src/System.CommandLine/AliasSet.cs
+++ b/src/System.CommandLine/AliasSet.cs
@@ -1,5 +1,4 @@
 using System.Collections;
-using System.Collections.Generic;
 
 namespace System.CommandLine
 {
diff --git a/src/System.CommandLine/Argument.cs b/src/System.CommandLine/Argument.cs
index f278477afe..d71da5e2aa 100644
--- a/src/System.CommandLine/Argument.cs
+++ b/src/System.CommandLine/Argument.cs
@@ -1,11 +1,9 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.CommandLine.Binding;
 using System.CommandLine.Parsing;
 using System.CommandLine.Completions;
-using System.Linq;
 
 namespace System.CommandLine
 {
diff --git a/src/System.CommandLine/ArgumentValidation.cs b/src/System.CommandLine/ArgumentValidation.cs
index 80a94a7bb5..b2da42c812 100644
--- a/src/System.CommandLine/ArgumentValidation.cs
+++ b/src/System.CommandLine/ArgumentValidation.cs
@@ -1,9 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.CommandLine.Parsing;
-using System.IO;
 
 namespace System.CommandLine
 {
diff --git a/src/System.CommandLine/Argument{T}.cs b/src/System.CommandLine/Argument{T}.cs
index 1100b70c13..39955f9806 100644
--- a/src/System.CommandLine/Argument{T}.cs
+++ b/src/System.CommandLine/Argument{T}.cs
@@ -1,9 +1,9 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.CommandLine.Parsing;
 using System.Diagnostics.CodeAnalysis;
+
 namespace System.CommandLine
 {
     /// <inheritdoc cref="Argument" />
diff --git a/src/System.CommandLine/Binding/ArgumentConversionResult.cs b/src/System.CommandLine/Binding/ArgumentConversionResult.cs
index 03bd2f85f0..25b3c83136 100644
--- a/src/System.CommandLine/Binding/ArgumentConversionResult.cs
+++ b/src/System.CommandLine/Binding/ArgumentConversionResult.cs
@@ -3,7 +3,6 @@
 
 using System.CommandLine.Completions;
 using System.CommandLine.Parsing;
-using System.Linq;
 
 namespace System.CommandLine.Binding
 {
diff --git a/src/System.CommandLine/Binding/ArgumentConverter.DefaultValues.cs b/src/System.CommandLine/Binding/ArgumentConverter.DefaultValues.cs
index a44a8114d9..45193444a8 100644
--- a/src/System.CommandLine/Binding/ArgumentConverter.DefaultValues.cs
+++ b/src/System.CommandLine/Binding/ArgumentConverter.DefaultValues.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 
diff --git a/src/System.CommandLine/Binding/ArgumentConverter.StringConverters.cs b/src/System.CommandLine/Binding/ArgumentConverter.StringConverters.cs
index 4a48afbb34..49bae5b60a 100644
--- a/src/System.CommandLine/Binding/ArgumentConverter.StringConverters.cs
+++ b/src/System.CommandLine/Binding/ArgumentConverter.StringConverters.cs
@@ -1,9 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
-using System.IO;
-
 namespace System.CommandLine.Binding;
 
 internal static partial class ArgumentConverter
diff --git a/src/System.CommandLine/Binding/ArgumentConverter.cs b/src/System.CommandLine/Binding/ArgumentConverter.cs
index 6f494bdd08..57638efed2 100644
--- a/src/System.CommandLine/Binding/ArgumentConverter.cs
+++ b/src/System.CommandLine/Binding/ArgumentConverter.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.CommandLine.Parsing;
 using static System.CommandLine.Binding.ArgumentConversionResult;
 
diff --git a/src/System.CommandLine/ChildSymbolList{T}.cs b/src/System.CommandLine/ChildSymbolList{T}.cs
index a68c402090..14ab1a8a72 100644
--- a/src/System.CommandLine/ChildSymbolList{T}.cs
+++ b/src/System.CommandLine/ChildSymbolList{T}.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections;
-using System.Collections.Generic;
 
 namespace System.CommandLine
 {
diff --git a/src/System.CommandLine/Command.cs b/src/System.CommandLine/Command.cs
index 7a1bc15941..fed4dae6a3 100644
--- a/src/System.CommandLine/Command.cs
+++ b/src/System.CommandLine/Command.cs
@@ -2,15 +2,11 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections;
-using System.Collections.Generic;
 using System.CommandLine.Completions;
 using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Threading;
 
 namespace System.CommandLine
 {
diff --git a/src/System.CommandLine/CommandLineConfiguration.cs b/src/System.CommandLine/CommandLineConfiguration.cs
index 80800653e1..6c8dda1d3b 100644
--- a/src/System.CommandLine/CommandLineConfiguration.cs
+++ b/src/System.CommandLine/CommandLineConfiguration.cs
@@ -1,12 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.CommandLine.Parsing;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Threading;
-using System.IO;
 using System.CommandLine.Invocation;
 
 namespace System.CommandLine
diff --git a/src/System.CommandLine/CompletionSourceExtensions.cs b/src/System.CommandLine/CompletionSourceExtensions.cs
index 8c775508b3..a892ecadc1 100644
--- a/src/System.CommandLine/CompletionSourceExtensions.cs
+++ b/src/System.CommandLine/CompletionSourceExtensions.cs
@@ -1,9 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.CommandLine.Completions;
-using System.Linq;
 
 namespace System.CommandLine
 {
diff --git a/src/System.CommandLine/Completions/CompletionAction.cs b/src/System.CommandLine/Completions/CompletionAction.cs
index 7757568630..4501f383e8 100644
--- a/src/System.CommandLine/Completions/CompletionAction.cs
+++ b/src/System.CommandLine/Completions/CompletionAction.cs
@@ -3,7 +3,6 @@
 
 using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
-using System.Linq;
 
 namespace System.CommandLine.Completions;
 
diff --git a/src/System.CommandLine/Completions/CompletionContext.cs b/src/System.CommandLine/Completions/CompletionContext.cs
index ebde81a6e1..77b4101f30 100644
--- a/src/System.CommandLine/Completions/CompletionContext.cs
+++ b/src/System.CommandLine/Completions/CompletionContext.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Parsing;
-using System.Linq;
 
 namespace System.CommandLine.Completions
 {
diff --git a/src/System.CommandLine/Directive.cs b/src/System.CommandLine/Directive.cs
index a779585bd1..3d95986b4c 100644
--- a/src/System.CommandLine/Directive.cs
+++ b/src/System.CommandLine/Directive.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.CommandLine.Completions;
 using System.CommandLine.Invocation;
 
diff --git a/src/System.CommandLine/EnumerableExtensions.cs b/src/System.CommandLine/EnumerableExtensions.cs
index 72018aaa38..02ef4d8207 100644
--- a/src/System.CommandLine/EnumerableExtensions.cs
+++ b/src/System.CommandLine/EnumerableExtensions.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections;
-using System.Collections.Generic;
 
 namespace System.CommandLine
 {
diff --git a/src/System.CommandLine/Help/HelpBuilder.Default.cs b/src/System.CommandLine/Help/HelpBuilder.Default.cs
index 33e53c0da0..529746e8e0 100644
--- a/src/System.CommandLine/Help/HelpBuilder.Default.cs
+++ b/src/System.CommandLine/Help/HelpBuilder.Default.cs
@@ -2,9 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections;
-using System.Collections.Generic;
 using System.CommandLine.Completions;
-using System.Linq;
 
 namespace System.CommandLine.Help;
 
diff --git a/src/System.CommandLine/Help/HelpBuilder.cs b/src/System.CommandLine/Help/HelpBuilder.cs
index af6046d898..a05260c4c9 100644
--- a/src/System.CommandLine/Help/HelpBuilder.cs
+++ b/src/System.CommandLine/Help/HelpBuilder.cs
@@ -1,9 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Text;
 
 namespace System.CommandLine.Help
diff --git a/src/System.CommandLine/Help/HelpBuilderExtensions.cs b/src/System.CommandLine/Help/HelpBuilderExtensions.cs
index bc84661096..dd2445c9a4 100644
--- a/src/System.CommandLine/Help/HelpBuilderExtensions.cs
+++ b/src/System.CommandLine/Help/HelpBuilderExtensions.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
-
 namespace System.CommandLine.Help
 {
     internal static class HelpBuilderExtensions
diff --git a/src/System.CommandLine/Help/HelpContext.cs b/src/System.CommandLine/Help/HelpContext.cs
index 6162933843..503f9271da 100644
--- a/src/System.CommandLine/Help/HelpContext.cs
+++ b/src/System.CommandLine/Help/HelpContext.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.IO;
-
 namespace System.CommandLine.Help
 {
     /// <summary>
diff --git a/src/System.CommandLine/Help/TwoColumnHelpRow.cs b/src/System.CommandLine/Help/TwoColumnHelpRow.cs
index fab0958337..d9a1967a51 100644
--- a/src/System.CommandLine/Help/TwoColumnHelpRow.cs
+++ b/src/System.CommandLine/Help/TwoColumnHelpRow.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
-
 namespace System.CommandLine.Help
 {
     /// <summary>
diff --git a/src/System.CommandLine/Invocation/AnonymousAsynchronousCommandLineAction.cs b/src/System.CommandLine/Invocation/AnonymousAsynchronousCommandLineAction.cs
index b16d86e956..0a0f0d499f 100644
--- a/src/System.CommandLine/Invocation/AnonymousAsynchronousCommandLineAction.cs
+++ b/src/System.CommandLine/Invocation/AnonymousAsynchronousCommandLineAction.cs
@@ -1,9 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Threading;
-using System.Threading.Tasks;
-
 namespace System.CommandLine.Invocation;
 
 internal sealed class AnonymousAsynchronousCommandLineAction : AsynchronousCommandLineAction
diff --git a/src/System.CommandLine/Invocation/AsynchronousCommandLineAction.cs b/src/System.CommandLine/Invocation/AsynchronousCommandLineAction.cs
index 627bf56092..84fbc3599c 100644
--- a/src/System.CommandLine/Invocation/AsynchronousCommandLineAction.cs
+++ b/src/System.CommandLine/Invocation/AsynchronousCommandLineAction.cs
@@ -1,9 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Threading;
-using System.Threading.Tasks;
-
 namespace System.CommandLine.Invocation;
 
 /// Defines an asynchronous behavior associated with a command line symbol.
diff --git a/src/System.CommandLine/Invocation/InvocationPipeline.cs b/src/System.CommandLine/Invocation/InvocationPipeline.cs
index 3cbca453ea..82a6f2a4da 100644
--- a/src/System.CommandLine/Invocation/InvocationPipeline.cs
+++ b/src/System.CommandLine/Invocation/InvocationPipeline.cs
@@ -1,9 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Threading;
-using System.Threading.Tasks;
-
 namespace System.CommandLine.Invocation
 {
     internal static class InvocationPipeline
diff --git a/src/System.CommandLine/Invocation/ParseErrorAction.cs b/src/System.CommandLine/Invocation/ParseErrorAction.cs
index fdb4e01b45..e7232654f3 100644
--- a/src/System.CommandLine/Invocation/ParseErrorAction.cs
+++ b/src/System.CommandLine/Invocation/ParseErrorAction.cs
@@ -1,11 +1,8 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.CommandLine.Help;
 using System.CommandLine.Parsing;
-using System.Linq;
-using System.Threading;
 
 namespace System.CommandLine.Invocation;
 
diff --git a/src/System.CommandLine/Invocation/ProcessTerminationHandler.cs b/src/System.CommandLine/Invocation/ProcessTerminationHandler.cs
index ead35b4eb0..981460f5c4 100644
--- a/src/System.CommandLine/Invocation/ProcessTerminationHandler.cs
+++ b/src/System.CommandLine/Invocation/ProcessTerminationHandler.cs
@@ -2,8 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace System.CommandLine.Invocation;
 
diff --git a/src/System.CommandLine/LocalizationResources.cs b/src/System.CommandLine/LocalizationResources.cs
index 18f3c33d76..cbcbc05a2f 100644
--- a/src/System.CommandLine/LocalizationResources.cs
+++ b/src/System.CommandLine/LocalizationResources.cs
@@ -1,10 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.CommandLine.Parsing;
-using System.IO;
-using System.Linq;
 
 namespace System.CommandLine
 {
diff --git a/src/System.CommandLine/Option.cs b/src/System.CommandLine/Option.cs
index c9d81062e7..d61c96e1b4 100644
--- a/src/System.CommandLine/Option.cs
+++ b/src/System.CommandLine/Option.cs
@@ -1,11 +1,9 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.CommandLine.Completions;
 using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
-using System.Linq;
 
 namespace System.CommandLine
 {
diff --git a/src/System.CommandLine/OptionValidation.cs b/src/System.CommandLine/OptionValidation.cs
index 02ed98f35e..e6d9aec4eb 100644
--- a/src/System.CommandLine/OptionValidation.cs
+++ b/src/System.CommandLine/OptionValidation.cs
@@ -1,9 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
-using System.IO;
-
 namespace System.CommandLine
 {
     /// <summary>
diff --git a/src/System.CommandLine/ParseResult.cs b/src/System.CommandLine/ParseResult.cs
index 0bbd1ad093..8479e1a8e0 100644
--- a/src/System.CommandLine/ParseResult.cs
+++ b/src/System.CommandLine/ParseResult.cs
@@ -1,13 +1,9 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.CommandLine.Completions;
 using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Threading;
 
 namespace System.CommandLine
 {
diff --git a/src/System.CommandLine/Parsing/ArgumentResult.cs b/src/System.CommandLine/Parsing/ArgumentResult.cs
index 1a9fc21939..1919b5bc28 100644
--- a/src/System.CommandLine/Parsing/ArgumentResult.cs
+++ b/src/System.CommandLine/Parsing/ArgumentResult.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Binding;
-using System.Linq;
 
 namespace System.CommandLine.Parsing
 {
diff --git a/src/System.CommandLine/Parsing/CommandLineParser.cs b/src/System.CommandLine/Parsing/CommandLineParser.cs
index 69d629b31d..46b0b76436 100644
--- a/src/System.CommandLine/Parsing/CommandLineParser.cs
+++ b/src/System.CommandLine/Parsing/CommandLineParser.cs
@@ -1,9 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
-using System.Linq;
-
 namespace System.CommandLine.Parsing
 {
     /// <summary>
diff --git a/src/System.CommandLine/Parsing/CommandResult.cs b/src/System.CommandLine/Parsing/CommandResult.cs
index 6561f5a386..a3b5385d75 100644
--- a/src/System.CommandLine/Parsing/CommandResult.cs
+++ b/src/System.CommandLine/Parsing/CommandResult.cs
@@ -1,9 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
-using System.Linq;
-
 namespace System.CommandLine.Parsing
 {
     /// <summary>
diff --git a/src/System.CommandLine/Parsing/DirectiveResult.cs b/src/System.CommandLine/Parsing/DirectiveResult.cs
index 78ceeaf0d7..ac6db06a23 100644
--- a/src/System.CommandLine/Parsing/DirectiveResult.cs
+++ b/src/System.CommandLine/Parsing/DirectiveResult.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace System.CommandLine.Parsing
+namespace System.CommandLine.Parsing
 {
     /// <summary>
     /// A result produced when parsing an <see cref="Directive"/>.
diff --git a/src/System.CommandLine/Parsing/OptionResult.cs b/src/System.CommandLine/Parsing/OptionResult.cs
index 478a3a9d23..656f507eff 100644
--- a/src/System.CommandLine/Parsing/OptionResult.cs
+++ b/src/System.CommandLine/Parsing/OptionResult.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Binding;
-using System.Linq;
 
 namespace System.CommandLine.Parsing
 {
diff --git a/src/System.CommandLine/Parsing/ParseDiagramAction.cs b/src/System.CommandLine/Parsing/ParseDiagramAction.cs
index bbae57609f..f6fe0d777a 100644
--- a/src/System.CommandLine/Parsing/ParseDiagramAction.cs
+++ b/src/System.CommandLine/Parsing/ParseDiagramAction.cs
@@ -4,7 +4,6 @@
 using System.Collections;
 using System.CommandLine.Binding;
 using System.CommandLine.Invocation;
-using System.Linq;
 using System.Text;
 
 namespace System.CommandLine.Parsing
diff --git a/src/System.CommandLine/Parsing/ParseOperation.cs b/src/System.CommandLine/Parsing/ParseOperation.cs
index de7dcf2d9c..d65b0a470f 100644
--- a/src/System.CommandLine/Parsing/ParseOperation.cs
+++ b/src/System.CommandLine/Parsing/ParseOperation.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.CommandLine.Help;
 using System.CommandLine.Invocation;
 
diff --git a/src/System.CommandLine/Parsing/StringExtensions.cs b/src/System.CommandLine/Parsing/StringExtensions.cs
index b1f7b63ad2..0d975e7c1d 100644
--- a/src/System.CommandLine/Parsing/StringExtensions.cs
+++ b/src/System.CommandLine/Parsing/StringExtensions.cs
@@ -1,10 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
-using System.Linq;
 
 namespace System.CommandLine.Parsing
 {
diff --git a/src/System.CommandLine/Parsing/SymbolResult.cs b/src/System.CommandLine/Parsing/SymbolResult.cs
index aed8a3ac4b..0301a8ba82 100644
--- a/src/System.CommandLine/Parsing/SymbolResult.cs
+++ b/src/System.CommandLine/Parsing/SymbolResult.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
-
 namespace System.CommandLine.Parsing
 {
     /// <summary>
diff --git a/src/System.CommandLine/Parsing/SymbolResultExtensions.cs b/src/System.CommandLine/Parsing/SymbolResultExtensions.cs
index c81459e8c6..624e7d6708 100644
--- a/src/System.CommandLine/Parsing/SymbolResultExtensions.cs
+++ b/src/System.CommandLine/Parsing/SymbolResultExtensions.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
-
 namespace System.CommandLine.Parsing
 {
     internal static class SymbolResultExtensions
diff --git a/src/System.CommandLine/Parsing/SymbolResultTree.cs b/src/System.CommandLine/Parsing/SymbolResultTree.cs
index 49abc6be86..9fde91fd85 100644
--- a/src/System.CommandLine/Parsing/SymbolResultTree.cs
+++ b/src/System.CommandLine/Parsing/SymbolResultTree.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
-
 namespace System.CommandLine.Parsing
 {
     internal sealed class SymbolResultTree : Dictionary<Symbol, SymbolResult>
diff --git a/src/System.CommandLine/Parsing/TryReplaceToken.cs b/src/System.CommandLine/Parsing/TryReplaceToken.cs
index 2ddae16312..f0540de5f6 100644
--- a/src/System.CommandLine/Parsing/TryReplaceToken.cs
+++ b/src/System.CommandLine/Parsing/TryReplaceToken.cs
@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
-
 namespace System.CommandLine.Parsing;
 
 /// <summary>
diff --git a/src/System.CommandLine/RootCommand.cs b/src/System.CommandLine/RootCommand.cs
index 4bbae711fd..75c391fc17 100644
--- a/src/System.CommandLine/RootCommand.cs
+++ b/src/System.CommandLine/RootCommand.cs
@@ -1,10 +1,8 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.CommandLine.Completions;
 using System.CommandLine.Help;
-using System.IO;
 using System.Reflection;
 
 namespace System.CommandLine
diff --git a/src/System.CommandLine/Symbol.cs b/src/System.CommandLine/Symbol.cs
index 254940f9c4..6876950557 100644
--- a/src/System.CommandLine/Symbol.cs
+++ b/src/System.CommandLine/Symbol.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.CommandLine.Completions;
 using System.Diagnostics;
 
diff --git a/src/System.CommandLine/System.CommandLine.Config.cs b/src/System.CommandLine/System.CommandLine.Config.cs
index a46fb3bed6..2e01eacc21 100644
--- a/src/System.CommandLine/System.CommandLine.Config.cs
+++ b/src/System.CommandLine/System.CommandLine.Config.cs
@@ -1,3 +1 @@
-using System;
-
-[assembly: CLSCompliant(true)]
\ No newline at end of file
+[assembly: CLSCompliant(true)]
\ No newline at end of file
diff --git a/src/System.CommandLine/VersionOption.cs b/src/System.CommandLine/VersionOption.cs
index 6c31ab1485..f50602bbf2 100644
--- a/src/System.CommandLine/VersionOption.cs
+++ b/src/System.CommandLine/VersionOption.cs
@@ -1,10 +1,8 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Help;
 using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
-using System.Linq;
 
 namespace System.CommandLine
 {