diff --git a/src/Polly.Core.Tests/CircuitBreaker/Health/HealthMetricsTests.cs b/src/Polly.Core.Tests/CircuitBreaker/Health/HealthMetricsTests.cs
index debc76788dc..ccbe925a6ac 100644
--- a/src/Polly.Core.Tests/CircuitBreaker/Health/HealthMetricsTests.cs
+++ b/src/Polly.Core.Tests/CircuitBreaker/Health/HealthMetricsTests.cs
@@ -1,4 +1,3 @@
-using System;
 using Polly.CircuitBreaker;
 using Polly.CircuitBreaker.Health;
 
diff --git a/src/Polly.Core.Tests/Hedging/Controller/TaskExecutionTests.cs b/src/Polly.Core.Tests/Hedging/Controller/TaskExecutionTests.cs
index e4a4b914864..2f4276a1e28 100644
--- a/src/Polly.Core.Tests/Hedging/Controller/TaskExecutionTests.cs
+++ b/src/Polly.Core.Tests/Hedging/Controller/TaskExecutionTests.cs
@@ -1,12 +1,7 @@
-using System;
-using System.Threading.Tasks;
-using Polly.Core.Tests.Helpers;
 using Polly.Hedging;
 using Polly.Hedging.Controller;
 using Polly.Hedging.Utils;
-using Polly.Strategy;
 using Polly.Utils;
-using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.Core.Tests.Hedging.Controller;
 
diff --git a/src/Polly.Core.Tests/Hedging/HedgingResilienceStrategyTests.cs b/src/Polly.Core.Tests/Hedging/HedgingResilienceStrategyTests.cs
index b802a72d8cb..ca7db45943b 100644
--- a/src/Polly.Core.Tests/Hedging/HedgingResilienceStrategyTests.cs
+++ b/src/Polly.Core.Tests/Hedging/HedgingResilienceStrategyTests.cs
@@ -1,4 +1,3 @@
-using System;
 using Polly.Hedging;
 using Polly.Strategy;
 using Xunit.Abstractions;
diff --git a/src/Polly.Core.Tests/Hedging/HedgingTimeProvider.cs b/src/Polly.Core.Tests/Hedging/HedgingTimeProvider.cs
index bd708a7fff7..602f9cd504a 100644
--- a/src/Polly.Core.Tests/Hedging/HedgingTimeProvider.cs
+++ b/src/Polly.Core.Tests/Hedging/HedgingTimeProvider.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
 namespace Polly.Core.Tests.Hedging;
 
 internal class HedgingTimeProvider : TimeProvider
diff --git a/src/Polly.Core.Tests/Polly.Core.Tests.csproj b/src/Polly.Core.Tests/Polly.Core.Tests.csproj
index 00fe45d71fa..cf229bb640a 100644
--- a/src/Polly.Core.Tests/Polly.Core.Tests.csproj
+++ b/src/Polly.Core.Tests/Polly.Core.Tests.csproj
@@ -10,7 +10,7 @@
     <NoWarn>$(NoWarn);SA1600;SA1204;SA1602</NoWarn>
     <Include>[Polly.Core]*</Include>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <PackageReference Include="Polly.Contrib.WaitAndRetry" />
   </ItemGroup>
diff --git a/src/Polly.Core.Tests/Utils/CancellationTokenSourcePoolTests.cs b/src/Polly.Core.Tests/Utils/CancellationTokenSourcePoolTests.cs
index b43673bc5c8..70964a31fc0 100644
--- a/src/Polly.Core.Tests/Utils/CancellationTokenSourcePoolTests.cs
+++ b/src/Polly.Core.Tests/Utils/CancellationTokenSourcePoolTests.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Threading;
 using Moq;
-using Polly.Core.Tests.Helpers;
 using Polly.Utils;
-using Xunit;
-using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.Core.Tests.Utils;
 
diff --git a/src/Polly.Core.Tests/Utils/TimeProviderExtensionsTests.cs b/src/Polly.Core.Tests/Utils/TimeProviderExtensionsTests.cs
index a93ea73ef73..f248c212a48 100644
--- a/src/Polly.Core.Tests/Utils/TimeProviderExtensionsTests.cs
+++ b/src/Polly.Core.Tests/Utils/TimeProviderExtensionsTests.cs
@@ -1,6 +1,3 @@
-using Polly.Utils;
-using TimeProvider = Polly.Utils.TimeProvider;
-
 namespace Polly.Core.Tests.Utils;
 
 public class TimeProviderExtensionsTests
diff --git a/src/Polly.Core/CircuitBreaker/Controller/CircuitStateController.cs b/src/Polly.Core/CircuitBreaker/Controller/CircuitStateController.cs
index 8ad5145bf42..5725ac5ee02 100644
--- a/src/Polly.Core/CircuitBreaker/Controller/CircuitStateController.cs
+++ b/src/Polly.Core/CircuitBreaker/Controller/CircuitStateController.cs
@@ -1,5 +1,4 @@
 using Polly.Strategy;
-using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.CircuitBreaker;
 
diff --git a/src/Polly.Core/CircuitBreaker/Health/HealthMetrics.cs b/src/Polly.Core/CircuitBreaker/Health/HealthMetrics.cs
index 2e317197692..08aab7850be 100644
--- a/src/Polly.Core/CircuitBreaker/Health/HealthMetrics.cs
+++ b/src/Polly.Core/CircuitBreaker/Health/HealthMetrics.cs
@@ -1,5 +1,3 @@
-using TimeProvider = Polly.Utils.TimeProvider;
-
 namespace Polly.CircuitBreaker.Health;
 
 /// <summary>
diff --git a/src/Polly.Core/CircuitBreaker/Health/RollingHealthMetrics.cs b/src/Polly.Core/CircuitBreaker/Health/RollingHealthMetrics.cs
index 542f1237c0f..f00806a858a 100644
--- a/src/Polly.Core/CircuitBreaker/Health/RollingHealthMetrics.cs
+++ b/src/Polly.Core/CircuitBreaker/Health/RollingHealthMetrics.cs
@@ -1,5 +1,3 @@
-using TimeProvider = Polly.Utils.TimeProvider;
-
 namespace Polly.CircuitBreaker.Health;
 
 /// <inheritdoc/>
diff --git a/src/Polly.Core/CircuitBreaker/Health/SingleHealthMetrics.cs b/src/Polly.Core/CircuitBreaker/Health/SingleHealthMetrics.cs
index 888225393a0..3dd66cf06fe 100644
--- a/src/Polly.Core/CircuitBreaker/Health/SingleHealthMetrics.cs
+++ b/src/Polly.Core/CircuitBreaker/Health/SingleHealthMetrics.cs
@@ -1,6 +1,3 @@
-using Polly;
-using TimeProvider = Polly.Utils.TimeProvider;
-
 namespace Polly.CircuitBreaker.Health;
 
 /// <inheritdoc/>
diff --git a/src/Polly.Core/Hedging/Controller/HedgingController.cs b/src/Polly.Core/Hedging/Controller/HedgingController.cs
index 1eb9cabc176..b9b548b137c 100644
--- a/src/Polly.Core/Hedging/Controller/HedgingController.cs
+++ b/src/Polly.Core/Hedging/Controller/HedgingController.cs
@@ -1,6 +1,4 @@
 using Polly.Hedging.Controller;
-using Polly.Utils;
-using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.Hedging.Utils;
 
diff --git a/src/Polly.Core/Hedging/Controller/HedgingExecutionContext.cs b/src/Polly.Core/Hedging/Controller/HedgingExecutionContext.cs
index 233f0073b74..8eddbb27ea1 100644
--- a/src/Polly.Core/Hedging/Controller/HedgingExecutionContext.cs
+++ b/src/Polly.Core/Hedging/Controller/HedgingExecutionContext.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using Polly.Hedging.Controller;
 using Polly.Strategy;
-using Polly.Utils;
-using static Polly.Hedging.Utils.HedgingExecutionContext;
-using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.Hedging.Utils;
 
diff --git a/src/Polly.Core/Hedging/HedgingResilienceStrategy.cs b/src/Polly.Core/Hedging/HedgingResilienceStrategy.cs
index 92d18a30697..5c8c682ddd1 100644
--- a/src/Polly.Core/Hedging/HedgingResilienceStrategy.cs
+++ b/src/Polly.Core/Hedging/HedgingResilienceStrategy.cs
@@ -1,7 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
 using System.Runtime.ExceptionServices;
-using System.Threading;
 using Polly.Hedging;
 using Polly.Hedging.Utils;
 using Polly.Strategy;
diff --git a/src/Polly.Core/Hedging/HedgingResilienceStrategyBuilderExtensions.cs b/src/Polly.Core/Hedging/HedgingResilienceStrategyBuilderExtensions.cs
index af574b24c08..292b0cef93a 100644
--- a/src/Polly.Core/Hedging/HedgingResilienceStrategyBuilderExtensions.cs
+++ b/src/Polly.Core/Hedging/HedgingResilienceStrategyBuilderExtensions.cs
@@ -1,6 +1,5 @@
 using System.ComponentModel.DataAnnotations;
 using Polly.Hedging;
-using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly;
 
diff --git a/src/Polly.Core/ResilienceStrategyBuilder.cs b/src/Polly.Core/ResilienceStrategyBuilder.cs
index 6f5cd92a89f..495f4184253 100644
--- a/src/Polly.Core/ResilienceStrategyBuilder.cs
+++ b/src/Polly.Core/ResilienceStrategyBuilder.cs
@@ -1,6 +1,5 @@
 using System.ComponentModel.DataAnnotations;
 using Polly.Strategy;
-using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly;
 
diff --git a/src/Polly.Core/Retry/RetryResilienceStrategy.cs b/src/Polly.Core/Retry/RetryResilienceStrategy.cs
index 80b723d1b48..a7ef69778c0 100644
--- a/src/Polly.Core/Retry/RetryResilienceStrategy.cs
+++ b/src/Polly.Core/Retry/RetryResilienceStrategy.cs
@@ -1,6 +1,4 @@
-using System;
 using Polly.Strategy;
-using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.Retry;
 
diff --git a/src/Polly.Core/Strategy/ResilienceStrategyBuilderContext.cs b/src/Polly.Core/Strategy/ResilienceStrategyBuilderContext.cs
index fdc296ebd2f..bce9a8b604b 100644
--- a/src/Polly.Core/Strategy/ResilienceStrategyBuilderContext.cs
+++ b/src/Polly.Core/Strategy/ResilienceStrategyBuilderContext.cs
@@ -1,5 +1,4 @@
 using Polly.Telemetry;
-using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.Strategy;
 
diff --git a/src/Polly.Core/Timeout/TimeoutResilienceStrategy.cs b/src/Polly.Core/Timeout/TimeoutResilienceStrategy.cs
index 07fb2779db9..4f65d6a2ad9 100644
--- a/src/Polly.Core/Timeout/TimeoutResilienceStrategy.cs
+++ b/src/Polly.Core/Timeout/TimeoutResilienceStrategy.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Threading.Tasks;
 using Polly.Strategy;
-using TimeProvider = Polly.Utils.TimeProvider;
 
 namespace Polly.Timeout;
 
diff --git a/src/Polly.Extensions/Telemetry/TelemetryResilienceStrategy.cs b/src/Polly.Extensions/Telemetry/TelemetryResilienceStrategy.cs
index efbe5fd2419..da849cff38e 100644
--- a/src/Polly.Extensions/Telemetry/TelemetryResilienceStrategy.cs
+++ b/src/Polly.Extensions/Telemetry/TelemetryResilienceStrategy.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Diagnostics.Metrics;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Polly.Strategy;
 using Polly.Telemetry;