diff --git a/src/Runner.Common/ActionCommand.cs b/src/Runner.Common/ActionCommand.cs
index 3e25176b8..68ded964c 100644
--- a/src/Runner.Common/ActionCommand.cs
+++ b/src/Runner.Common/ActionCommand.cs
@@ -1,4 +1,3 @@
-using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using System;
 using System.Collections.Generic;
diff --git a/src/Runner.Common/ActionResult.cs b/src/Runner.Common/ActionResult.cs
index db68b6852..bb1622d67 100644
--- a/src/Runner.Common/ActionResult.cs
+++ b/src/Runner.Common/ActionResult.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace GitHub.Runner.Common
 {
     public enum ActionResult
diff --git a/src/Runner.Common/CommandLineParser.cs b/src/Runner.Common/CommandLineParser.cs
index bca3b461a..abcd8bd4d 100644
--- a/src/Runner.Common/CommandLineParser.cs
+++ b/src/Runner.Common/CommandLineParser.cs
@@ -1,4 +1,3 @@
-using GitHub.Runner.Common.Util;
 using System;
 using System.Collections.Generic;
 using GitHub.DistributedTask.Logging;
diff --git a/src/Runner.Common/ConfigurationStore.cs b/src/Runner.Common/ConfigurationStore.cs
index ca526c77f..7cce70f60 100644
--- a/src/Runner.Common/ConfigurationStore.cs
+++ b/src/Runner.Common/ConfigurationStore.cs
@@ -1,4 +1,3 @@
-using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using System;
 using System.IO;
diff --git a/src/Runner.Common/ExtensionManager.cs b/src/Runner.Common/ExtensionManager.cs
index 29f99b628..c7fbab73b 100644
--- a/src/Runner.Common/ExtensionManager.cs
+++ b/src/Runner.Common/ExtensionManager.cs
@@ -1,4 +1,3 @@
-using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using System;
 using System.Collections.Concurrent;
diff --git a/src/Runner.Common/HostTraceListener.cs b/src/Runner.Common/HostTraceListener.cs
index e11edc5b4..e022eb0e4 100644
--- a/src/Runner.Common/HostTraceListener.cs
+++ b/src/Runner.Common/HostTraceListener.cs
@@ -1,4 +1,3 @@
-using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using System;
 using System.Diagnostics;
diff --git a/src/Runner.Common/JobNotification.cs b/src/Runner.Common/JobNotification.cs
index ee20fb452..c171e4e69 100644
--- a/src/Runner.Common/JobNotification.cs
+++ b/src/Runner.Common/JobNotification.cs
@@ -1,10 +1,7 @@
-using System;
-using System.IO;
-using System.IO.Pipes;
+using System;
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace GitHub.Runner.Common
diff --git a/src/Runner.Common/JobServer.cs b/src/Runner.Common/JobServer.cs
index 1cac64f65..4a37311ca 100644
--- a/src/Runner.Common/JobServer.cs
+++ b/src/Runner.Common/JobServer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -13,7 +13,6 @@ using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
 using GitHub.Services.WebApi;
 using GitHub.Services.WebApi.Utilities.Internal;
-using Newtonsoft.Json;
 
 namespace GitHub.Runner.Common
 {
diff --git a/src/Test/L0/Listener/Configuration/ConfigurationManagerL0.cs b/src/Test/L0/Listener/Configuration/ConfigurationManagerL0.cs
index 197cf7e52..20ec96a78 100644
--- a/src/Test/L0/Listener/Configuration/ConfigurationManagerL0.cs
+++ b/src/Test/L0/Listener/Configuration/ConfigurationManagerL0.cs
@@ -1,13 +1,11 @@
-using GitHub.DistributedTask.WebApi;
+using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Listener;
 using GitHub.Runner.Listener.Configuration;
 using GitHub.Runner.Common.Util;
 using GitHub.Services.WebApi;
 using Moq;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Security.Cryptography;
diff --git a/src/Test/L0/Listener/RunnerL0.cs b/src/Test/L0/Listener/RunnerL0.cs
index acaff40eb..a1c283a9f 100644
--- a/src/Test/L0/Listener/RunnerL0.cs
+++ b/src/Test/L0/Listener/RunnerL0.cs
@@ -1,4 +1,4 @@
-using GitHub.DistributedTask.WebApi;
+using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Listener;
 using GitHub.Runner.Listener.Configuration;
 using Moq;
@@ -9,7 +9,6 @@ using System.Threading.Tasks;
 using Xunit;
 using GitHub.Services.WebApi;
 using Pipelines = GitHub.DistributedTask.Pipelines;
-using GitHub.Runner.Common.Util;
 
 namespace GitHub.Runner.Common.Tests.Listener
 {
diff --git a/src/Test/L0/PagingLoggerL0.cs b/src/Test/L0/PagingLoggerL0.cs
index 2c1c3b0ba..799428aa6 100644
--- a/src/Test/L0/PagingLoggerL0.cs
+++ b/src/Test/L0/PagingLoggerL0.cs
@@ -1,4 +1,3 @@
-using GitHub.Runner.Common.Util;
 using Moq;
 using System;
 using System.IO;
diff --git a/src/Test/L0/ProcessInvokerL0.cs b/src/Test/L0/ProcessInvokerL0.cs
index 629abb0a0..11dcf8d2a 100644
--- a/src/Test/L0/ProcessInvokerL0.cs
+++ b/src/Test/L0/ProcessInvokerL0.cs
@@ -1,11 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using Xunit;
-using GitHub.Runner.Common.Util;
 using System.Threading.Channels;
 using GitHub.Runner.Sdk;
 using System.Linq;
diff --git a/src/Test/L0/ServiceControlManagerL0.cs b/src/Test/L0/ServiceControlManagerL0.cs
index c7fe84cda..f94ded572 100644
--- a/src/Test/L0/ServiceControlManagerL0.cs
+++ b/src/Test/L0/ServiceControlManagerL0.cs
@@ -1,7 +1,4 @@
-using System;
 using System.Runtime.CompilerServices;
-using System.Text.RegularExpressions;
-using GitHub.Runner.Common;
 using GitHub.Runner.Listener.Configuration;
 using Xunit;
 
diff --git a/src/Test/L0/Util/ArgUtilL0.cs b/src/Test/L0/Util/ArgUtilL0.cs
index 7ede3bed7..e0e0b3454 100644
--- a/src/Test/L0/Util/ArgUtilL0.cs
+++ b/src/Test/L0/Util/ArgUtilL0.cs
@@ -1,4 +1,3 @@
-using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using System;
 using Xunit;
diff --git a/src/Test/L0/Util/UrlUtilL0.cs b/src/Test/L0/Util/UrlUtilL0.cs
index b84db2242..6100be5dd 100644
--- a/src/Test/L0/Util/UrlUtilL0.cs
+++ b/src/Test/L0/Util/UrlUtilL0.cs
@@ -1,5 +1,4 @@
-using System;
-using GitHub.Runner.Common.Util;
+using System;
 using GitHub.Runner.Sdk;
 using Xunit;
 
diff --git a/src/Test/L0/Util/VssUtilL0.cs b/src/Test/L0/Util/VssUtilL0.cs
index 62577eff8..30ed85692 100644
--- a/src/Test/L0/Util/VssUtilL0.cs
+++ b/src/Test/L0/Util/VssUtilL0.cs
@@ -1,10 +1,6 @@
-using GitHub.Runner.Common.Util;
 using GitHub.Services.Common;
 using System;
-using System.Collections.Generic;
-using System.Net.Http.Headers;
 using Xunit;
-using System.Text.RegularExpressions;
 using GitHub.Runner.Sdk;
 
 namespace GitHub.Runner.Common.Tests.Util
diff --git a/src/Test/L0/Worker/Expressions/ConditionFunctionsL0.cs b/src/Test/L0/Worker/Expressions/ConditionFunctionsL0.cs
index 2ca10bffd..e4c809c47 100644
--- a/src/Test/L0/Worker/Expressions/ConditionFunctionsL0.cs
+++ b/src/Test/L0/Worker/Expressions/ConditionFunctionsL0.cs
@@ -1,10 +1,8 @@
-using System;
-using System.Collections.Generic;
+using System;
 using System.Runtime.CompilerServices;
 using GitHub.DistributedTask.Expressions2;
 using GitHub.DistributedTask.ObjectTemplating;
 using GitHub.DistributedTask.Pipelines.ObjectTemplating;
-using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Worker;
 using GitHub.Runner.Worker.Expressions;
 using Moq;
@@ -121,8 +119,8 @@ namespace GitHub.Runner.Common.Tests.Worker.Expressions
 
                 var executionContext = InitializeExecutionContext(hc);
                 executionContext.Setup(x => x.GetGitHubContext("action_status")).Returns(actionStatus.ToString());
-                executionContext.Setup( x=> x.IsEmbedded).Returns(true);
-                executionContext.Setup( x=> x.Stage).Returns(ActionRunStage.Main);
+                executionContext.Setup(x => x.IsEmbedded).Returns(true);
+                executionContext.Setup(x => x.Stage).Returns(ActionRunStage.Main);
 
                 _jobContext.Status = jobStatus;
 
@@ -181,8 +179,8 @@ namespace GitHub.Runner.Common.Tests.Worker.Expressions
 
                 var executionContext = InitializeExecutionContext(hc);
                 executionContext.Setup(x => x.GetGitHubContext("action_status")).Returns(actionStatus.ToString());
-                executionContext.Setup( x=> x.IsEmbedded).Returns(true);
-                executionContext.Setup( x=> x.Stage).Returns(ActionRunStage.Main);
+                executionContext.Setup(x => x.IsEmbedded).Returns(true);
+                executionContext.Setup(x => x.Stage).Returns(ActionRunStage.Main);
 
                 _jobContext.Status = jobStatus;
 
diff --git a/src/Test/L0/Worker/JobExtensionL0.cs b/src/Test/L0/Worker/JobExtensionL0.cs
index 9f7cbd2f5..e3955c653 100644
--- a/src/Test/L0/Worker/JobExtensionL0.cs
+++ b/src/Test/L0/Worker/JobExtensionL0.cs
@@ -1,4 +1,4 @@
-using GitHub.DistributedTask.WebApi;
+using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Worker;
 using Moq;
 using System;
@@ -8,7 +8,6 @@ using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Xunit;
 using System.Threading;
-using GitHub.DistributedTask.ObjectTemplating.Tokens;
 using Pipelines = GitHub.DistributedTask.Pipelines;
 
 namespace GitHub.Runner.Common.Tests.Worker
diff --git a/src/Test/L0/Worker/JobRunnerL0.cs b/src/Test/L0/Worker/JobRunnerL0.cs
index 198d378b9..1bb7f1ac0 100644
--- a/src/Test/L0/Worker/JobRunnerL0.cs
+++ b/src/Test/L0/Worker/JobRunnerL0.cs
@@ -1,14 +1,12 @@
-using GitHub.DistributedTask.WebApi;
+using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Worker;
 using Moq;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Xunit;
 using System.Threading;
-using System.Collections.ObjectModel;
 using Pipelines = GitHub.DistributedTask.Pipelines;
 
 namespace GitHub.Runner.Common.Tests.Worker
diff --git a/src/Test/L0/Worker/OutputManagerL0.cs b/src/Test/L0/Worker/OutputManagerL0.cs
index 85045802a..e0364e9f0 100644
--- a/src/Test/L0/Worker/OutputManagerL0.cs
+++ b/src/Test/L0/Worker/OutputManagerL0.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
diff --git a/src/Test/L0/Worker/StepHostL0.cs b/src/Test/L0/Worker/StepHostL0.cs
index 0130b84cb..24f2600dc 100644
--- a/src/Test/L0/Worker/StepHostL0.cs
+++ b/src/Test/L0/Worker/StepHostL0.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
@@ -7,9 +7,6 @@ using Xunit;
 using GitHub.Runner.Worker;
 using GitHub.Runner.Worker.Handlers;
 using GitHub.Runner.Worker.Container;
-using GitHub.DistributedTask.Pipelines.ContextData;
-using System.Linq;
-using GitHub.DistributedTask.Pipelines;
 using GitHub.DistributedTask.WebApi;
 
 namespace GitHub.Runner.Common.Tests.Worker
diff --git a/src/Test/L0/Worker/VariablesL0.cs b/src/Test/L0/Worker/VariablesL0.cs
index b0e943aa4..5b7d50b4d 100644
--- a/src/Test/L0/Worker/VariablesL0.cs
+++ b/src/Test/L0/Worker/VariablesL0.cs
@@ -1,6 +1,4 @@
-using GitHub.DistributedTask.WebApi;
-using GitHub.Runner.Common.Util;
-using GitHub.Runner.Sdk;
+using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Worker;
 using System.Collections.Generic;
 using System.Globalization;