diff --git a/src/KafkaFlow.Abstractions/Consumers/IWorker.cs b/src/KafkaFlow.Abstractions/Consumers/IWorker.cs
index 482218597..a90dc7209 100644
--- a/src/KafkaFlow.Abstractions/Consumers/IWorker.cs
+++ b/src/KafkaFlow.Abstractions/Consumers/IWorker.cs
@@ -1,7 +1,6 @@
 namespace KafkaFlow
 {
     using System;
-    using KafkaFlow.Configuration;
     using KafkaFlow.Observer;
 
     /// <summary>
diff --git a/src/KafkaFlow.Abstractions/MiddlewareLifetime.cs b/src/KafkaFlow.Abstractions/MiddlewareLifetime.cs
index 4263ac7c5..0b3f28966 100644
--- a/src/KafkaFlow.Abstractions/MiddlewareLifetime.cs
+++ b/src/KafkaFlow.Abstractions/MiddlewareLifetime.cs
@@ -1,7 +1,5 @@
 namespace KafkaFlow
 {
-    using System;
-
     /// <summary>
     /// Specifies the lifetime of a middleware
     /// </summary>
diff --git a/src/KafkaFlow.Admin.WebApi/Adapters/ConsumerResponseAdapter.cs b/src/KafkaFlow.Admin.WebApi/Adapters/ConsumerResponseAdapter.cs
index 5ebe0082f..1bef549f9 100644
--- a/src/KafkaFlow.Admin.WebApi/Adapters/ConsumerResponseAdapter.cs
+++ b/src/KafkaFlow.Admin.WebApi/Adapters/ConsumerResponseAdapter.cs
@@ -1,7 +1,5 @@
 namespace KafkaFlow.Admin.WebApi.Adapters
 {
-    using System;
-    using System.Linq;
     using KafkaFlow.Admin.WebApi.Contracts;
     using KafkaFlow.Consumers;
 
diff --git a/src/KafkaFlow.Admin.WebApi/Contracts/GroupResponse.cs b/src/KafkaFlow.Admin.WebApi/Contracts/GroupResponse.cs
index 007d0c72a..4669f2fc4 100644
--- a/src/KafkaFlow.Admin.WebApi/Contracts/GroupResponse.cs
+++ b/src/KafkaFlow.Admin.WebApi/Contracts/GroupResponse.cs
@@ -2,7 +2,6 @@ namespace KafkaFlow.Admin.WebApi.Contracts
 {
     using System.Collections.Generic;
     using System.ComponentModel.DataAnnotations;
-    using KafkaFlow.Consumers;
     using Newtonsoft.Json;
 
     /// <summary>
diff --git a/src/KafkaFlow.Admin.WebApi/Contracts/GroupsResponse.cs b/src/KafkaFlow.Admin.WebApi/Contracts/GroupsResponse.cs
index 60ece5aa4..79e97c03c 100644
--- a/src/KafkaFlow.Admin.WebApi/Contracts/GroupsResponse.cs
+++ b/src/KafkaFlow.Admin.WebApi/Contracts/GroupsResponse.cs
@@ -1,7 +1,6 @@
 namespace KafkaFlow.Admin.WebApi.Contracts
 {
     using System.Collections.Generic;
-    using KafkaFlow.Consumers;
 
     /// <summary>
     /// The response of the consumer groups
diff --git a/src/KafkaFlow.Admin.WebApi/Controllers/ConsumersController.cs b/src/KafkaFlow.Admin.WebApi/Controllers/ConsumersController.cs
index 557645965..7ef6f33f3 100644
--- a/src/KafkaFlow.Admin.WebApi/Controllers/ConsumersController.cs
+++ b/src/KafkaFlow.Admin.WebApi/Controllers/ConsumersController.cs
@@ -3,7 +3,6 @@ namespace KafkaFlow.Admin.WebApi.Controllers
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
-    using KafkaFlow.Admin.Messages;
     using KafkaFlow.Admin.WebApi.Adapters;
     using KafkaFlow.Admin.WebApi.Contracts;
     using KafkaFlow.Consumers;
diff --git a/src/KafkaFlow.Admin.WebApi/Controllers/GroupsController.cs b/src/KafkaFlow.Admin.WebApi/Controllers/GroupsController.cs
index 5424b5d31..0ed3a5b2a 100644
--- a/src/KafkaFlow.Admin.WebApi/Controllers/GroupsController.cs
+++ b/src/KafkaFlow.Admin.WebApi/Controllers/GroupsController.cs
@@ -3,7 +3,6 @@ namespace KafkaFlow.Admin.WebApi.Controllers
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
-    using KafkaFlow.Admin.Messages;
     using KafkaFlow.Admin.WebApi.Adapters;
     using KafkaFlow.Admin.WebApi.Contracts;
     using KafkaFlow.Consumers;
diff --git a/src/KafkaFlow.Compressor.Gzip/GzipMessageCompressor.cs b/src/KafkaFlow.Compressor.Gzip/GzipMessageCompressor.cs
index f1fef5ebd..bcc46d9ae 100644
--- a/src/KafkaFlow.Compressor.Gzip/GzipMessageCompressor.cs
+++ b/src/KafkaFlow.Compressor.Gzip/GzipMessageCompressor.cs
@@ -1,6 +1,5 @@
 namespace KafkaFlow.Compressor.Gzip
 {
-    using System;
     using System.IO;
     using System.IO.Compression;
 
diff --git a/src/KafkaFlow.Compressor/ConfigurationBuilderExtensions.cs b/src/KafkaFlow.Compressor/ConfigurationBuilderExtensions.cs
index 204f5311e..1f748f112 100644
--- a/src/KafkaFlow.Compressor/ConfigurationBuilderExtensions.cs
+++ b/src/KafkaFlow.Compressor/ConfigurationBuilderExtensions.cs
@@ -1,6 +1,5 @@
 namespace KafkaFlow.Compressor
 {
-    using System;
     using KafkaFlow.Configuration;
 
     /// <summary>
diff --git a/src/KafkaFlow.IntegrationTests/CompressionSerializationTest.cs b/src/KafkaFlow.IntegrationTests/CompressionSerializationTest.cs
index 4358ebe05..02be99616 100644
--- a/src/KafkaFlow.IntegrationTests/CompressionSerializationTest.cs
+++ b/src/KafkaFlow.IntegrationTests/CompressionSerializationTest.cs
@@ -10,7 +10,6 @@ namespace KafkaFlow.IntegrationTests
     using KafkaFlow.IntegrationTests.Core.Handlers;
     using KafkaFlow.IntegrationTests.Core.Messages;
     using KafkaFlow.IntegrationTests.Core.Producers;
-    using KafkaFlow.Producers;
 
     [TestClass]
     public class CompressionSerializationTest
diff --git a/src/KafkaFlow.IntegrationTests/CompressionTest.cs b/src/KafkaFlow.IntegrationTests/CompressionTest.cs
index 6e4898344..86b45d4a1 100644
--- a/src/KafkaFlow.IntegrationTests/CompressionTest.cs
+++ b/src/KafkaFlow.IntegrationTests/CompressionTest.cs
@@ -9,7 +9,6 @@ namespace KafkaFlow.IntegrationTests
     using KafkaFlow.IntegrationTests.Core;
     using KafkaFlow.IntegrationTests.Core.Handlers;
     using KafkaFlow.IntegrationTests.Core.Producers;
-    using KafkaFlow.Producers;
 
     [TestClass]
     public class CompressionTest
diff --git a/src/KafkaFlow.IntegrationTests/ConsumerTest.cs b/src/KafkaFlow.IntegrationTests/ConsumerTest.cs
index c762ff527..d80752cf3 100644
--- a/src/KafkaFlow.IntegrationTests/ConsumerTest.cs
+++ b/src/KafkaFlow.IntegrationTests/ConsumerTest.cs
@@ -11,7 +11,6 @@ namespace KafkaFlow.IntegrationTests
     using KafkaFlow.IntegrationTests.Core.Handlers;
     using KafkaFlow.IntegrationTests.Core.Messages;
     using KafkaFlow.IntegrationTests.Core.Producers;
-    using KafkaFlow.Producers;
 
     [TestClass]
     public class ConsumerTest
diff --git a/src/KafkaFlow.UnitTests/OffsetCommitterTests.cs b/src/KafkaFlow.UnitTests/OffsetCommitterTests.cs
index 71b8c44c8..1df3b351c 100644
--- a/src/KafkaFlow.UnitTests/OffsetCommitterTests.cs
+++ b/src/KafkaFlow.UnitTests/OffsetCommitterTests.cs
@@ -3,10 +3,8 @@ namespace KafkaFlow.UnitTests
     using System;
     using System.Collections.Generic;
     using System.Linq;
-    using System.Threading;
     using System.Threading.Tasks;
     using Confluent.Kafka;
-    using FluentAssertions;
     using KafkaFlow.Consumers;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
     using Moq;
diff --git a/src/KafkaFlow.Unity/UnityDependencyResolver.cs b/src/KafkaFlow.Unity/UnityDependencyResolver.cs
index ed3c8b3ad..35b06c43f 100644
--- a/src/KafkaFlow.Unity/UnityDependencyResolver.cs
+++ b/src/KafkaFlow.Unity/UnityDependencyResolver.cs
@@ -2,9 +2,7 @@ namespace KafkaFlow.Unity
 {
     using System;
     using System.Collections.Generic;
-    using System.Linq;
     using global::Unity;
-    using global::Unity.Resolution;
 
     /// <summary>
     /// Unity implementation of <see cref="IDependencyResolver"/>