diff --git a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.FromClientIP.cs b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.FromClientIP.cs
index 6e268472..86431f7e 100644
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.FromClientIP.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.FromClientIP.cs
@@ -1,8 +1,6 @@
 // Copyright © WireMock.Net
 
 #pragma warning disable CS1591
-using System;
-
 // ReSharper disable once CheckNamespace
 namespace WireMock.AwesomeAssertions;
 
diff --git a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.UsingMethod.cs b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.UsingMethod.cs
index e3ce6c12..653793b0 100644
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.UsingMethod.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.UsingMethod.cs
@@ -1,7 +1,6 @@
 // Copyright © WireMock.Net
 
 #pragma warning disable CS1591
-using System;
 using WireMock.Constants;
 
 // ReSharper disable once CheckNamespace
diff --git a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithBody.cs b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithBody.cs
index c6fd9c5f..e4b7aa06 100644
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithBody.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithBody.cs
@@ -1,8 +1,6 @@
 // Copyright © WireMock.Net
 
 #pragma warning disable CS1591
-using System;
-using System.Collections.Generic;
 using AnyOfTypes;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
diff --git a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithProxy.cs b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithProxy.cs
index 704b2331..69a50b8e 100644
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithProxy.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithProxy.cs
@@ -1,8 +1,6 @@
 // Copyright © WireMock.Net
 
 #pragma warning disable CS1591
-using System;
-
 // ReSharper disable once CheckNamespace
 namespace WireMock.AwesomeAssertions;
 
diff --git a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.cs b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.cs
index e24a3841..0ce9f3a1 100644
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.cs
@@ -1,8 +1,6 @@
 // Copyright © WireMock.Net
 
 #pragma warning disable CS1591
-using System;
-using System.Collections.Generic;
 using WireMock.Matchers;
 using WireMock.Server;
 
diff --git a/src/WireMock.Net.AwesomeAssertions/Extensions/WireMockExtensions.cs b/src/WireMock.Net.AwesomeAssertions/Extensions/WireMockExtensions.cs
index 95d6fc71..48d0d944 100644
--- a/src/WireMock.Net.AwesomeAssertions/Extensions/WireMockExtensions.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Extensions/WireMockExtensions.cs
@@ -3,21 +3,20 @@
 using WireMock.Server;
 
 // ReSharper disable once CheckNamespace
-namespace WireMock.AwesomeAssertions
+namespace WireMock.AwesomeAssertions;
+
+/// <summary>
+/// Contains extension methods for custom assertions in unit tests.
+/// </summary>
+public static class WireMockExtensions
 {
     /// <summary>
-    /// Contains extension methods for custom assertions in unit tests.
+    /// Returns a <see cref="WireMockReceivedAssertions"/> object that can be used to assert the current <see cref="IWireMockServer"/>.
     /// </summary>
-    public static class WireMockExtensions
+    /// <param name="instance">The WireMockServer</param>
+    /// <returns><see cref="WireMockReceivedAssertions"/></returns>
+    public static WireMockReceivedAssertions Should(this IWireMockServer instance)
     {
-        /// <summary>
-        /// Returns a <see cref="WireMockReceivedAssertions"/> object that can be used to assert the current <see cref="IWireMockServer"/>.
-        /// </summary>
-        /// <param name="instance">The WireMockServer</param>
-        /// <returns><see cref="WireMockReceivedAssertions"/></returns>
-        public static WireMockReceivedAssertions Should(this IWireMockServer instance)
-        {
-            return new WireMockReceivedAssertions(instance, AssertionChain.GetOrCreate());
-        }
+        return new WireMockReceivedAssertions(instance, AssertionChain.GetOrCreate());
     }
 }
\ No newline at end of file
diff --git a/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.FromClientIP.cs b/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.FromClientIP.cs
index 6af107e6..a5ab8061 100644
--- a/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.FromClientIP.cs
+++ b/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.FromClientIP.cs
@@ -1,8 +1,6 @@
 // Copyright © WireMock.Net
 
 #pragma warning disable CS1591
-using System;
-
 // ReSharper disable once CheckNamespace
 namespace WireMock.FluentAssertions;
 
diff --git a/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.UsingMethod.cs b/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.UsingMethod.cs
index 4c526c7d..8710ea51 100644
--- a/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.UsingMethod.cs
+++ b/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.UsingMethod.cs
@@ -1,7 +1,6 @@
 // Copyright © WireMock.Net
 
 #pragma warning disable CS1591
-using System;
 using WireMock.Constants;
 
 // ReSharper disable once CheckNamespace
diff --git a/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.WithBody.cs b/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.WithBody.cs
index cf37b7f3..a7b06ff8 100644
--- a/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.WithBody.cs
+++ b/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.WithBody.cs
@@ -1,8 +1,6 @@
 // Copyright © WireMock.Net
 
 #pragma warning disable CS1591
-using System;
-using System.Collections.Generic;
 using AnyOfTypes;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
diff --git a/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.WithProxy.cs b/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.WithProxy.cs
index e2836783..c48faf7f 100644
--- a/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.WithProxy.cs
+++ b/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.WithProxy.cs
@@ -1,8 +1,6 @@
 // Copyright © WireMock.Net
 
 #pragma warning disable CS1591
-using System;
-
 // ReSharper disable once CheckNamespace
 namespace WireMock.FluentAssertions;
 
diff --git a/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.cs b/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.cs
index 3083fae1..fc8c8252 100644
--- a/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.cs
+++ b/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.cs
@@ -1,8 +1,6 @@
 // Copyright © WireMock.Net
 
 #pragma warning disable CS1591
-using System;
-using System.Collections.Generic;
 using WireMock.Matchers;
 using WireMock.Server;
 
diff --git a/src/WireMock.Net.RestClient/Builders/ApiMappingModelBuilder.cs b/src/WireMock.Net.RestClient/Builders/ApiMappingModelBuilder.cs
index 1e3a81b4..8e0fbb12 100644
--- a/src/WireMock.Net.RestClient/Builders/ApiMappingModelBuilder.cs
+++ b/src/WireMock.Net.RestClient/Builders/ApiMappingModelBuilder.cs
@@ -1,9 +1,5 @@
 // Copyright © WireMock.Net
 
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using Stef.Validation;
 using WireMock.Admin.Mappings;
 
diff --git a/src/WireMock.Net.RestClient/Extensions/WireMockAdminApiExtensions.cs b/src/WireMock.Net.RestClient/Extensions/WireMockAdminApiExtensions.cs
index f5d9cc7a..14ab1a15 100644
--- a/src/WireMock.Net.RestClient/Extensions/WireMockAdminApiExtensions.cs
+++ b/src/WireMock.Net.RestClient/Extensions/WireMockAdminApiExtensions.cs
@@ -1,10 +1,7 @@
 // Copyright © WireMock.Net
 
-using System;
 using System.Net.Http.Headers;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using Stef.Validation;
 using WireMock.Client.Builders;
 
diff --git a/src/WireMock.Net.RestClient/IWireMockAdminApi.cs b/src/WireMock.Net.RestClient/IWireMockAdminApi.cs
index afb69bc6..ee265c0f 100644
--- a/src/WireMock.Net.RestClient/IWireMockAdminApi.cs
+++ b/src/WireMock.Net.RestClient/IWireMockAdminApi.cs
@@ -1,10 +1,6 @@
 // Copyright © WireMock.Net
 
-using System;
-using System.Collections.Generic;
 using System.Net.Http.Headers;
-using System.Threading;
-using System.Threading.Tasks;
 using RestEase;
 using WireMock.Admin.Mappings;
 using WireMock.Admin.Requests;