diff --git a/src/CloudNative.CloudEvents.AspNetCore/HttpRequestExtensions.cs b/src/CloudNative.CloudEvents.AspNetCore/HttpRequestExtensions.cs
index 4d2e384..1889243 100644
--- a/src/CloudNative.CloudEvents.AspNetCore/HttpRequestExtensions.cs
+++ b/src/CloudNative.CloudEvents.AspNetCore/HttpRequestExtensions.cs
@@ -2,8 +2,8 @@
 // Licensed under the Apache 2.0 license.
 // See LICENSE file in the project root for full license information.
 
-using CloudNative.CloudEvents.Http;
 using CloudNative.CloudEvents.Core;
+using CloudNative.CloudEvents.Http;
 using Microsoft.AspNetCore.Http;
 using System;
 using System.Collections.Generic;
diff --git a/src/CloudNative.CloudEvents.Kafka/KafkaExtensions.cs b/src/CloudNative.CloudEvents.Kafka/KafkaExtensions.cs
index 0fdcd49..c6f6858 100644
--- a/src/CloudNative.CloudEvents.Kafka/KafkaExtensions.cs
+++ b/src/CloudNative.CloudEvents.Kafka/KafkaExtensions.cs
@@ -2,8 +2,8 @@
 // Licensed under the Apache 2.0 license.
 // See LICENSE file in the project root for full license information.
 
-using CloudNative.CloudEvents.Extensions;
 using CloudNative.CloudEvents.Core;
+using CloudNative.CloudEvents.Extensions;
 using Confluent.Kafka;
 using System;
 using System.Collections.Generic;
diff --git a/src/CloudNative.CloudEvents.Protobuf/ProtoSchemaReflection.cs b/src/CloudNative.CloudEvents.Protobuf/ProtoSchemaReflection.cs
index ada5f08..78b2e1d 100644
--- a/src/CloudNative.CloudEvents.Protobuf/ProtoSchemaReflection.cs
+++ b/src/CloudNative.CloudEvents.Protobuf/ProtoSchemaReflection.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache 2.0 license.
 // See LICENSE file in the project root for full license information.
 
-using CloudNative.CloudEvents.V1;
 using Google.Protobuf.Reflection;
 using System;
 
diff --git a/src/CloudNative.CloudEvents.Protobuf/ProtobufEventFormatter.cs b/src/CloudNative.CloudEvents.Protobuf/ProtobufEventFormatter.cs
index 1266fc4..6070bbc 100644
--- a/src/CloudNative.CloudEvents.Protobuf/ProtobufEventFormatter.cs
+++ b/src/CloudNative.CloudEvents.Protobuf/ProtobufEventFormatter.cs
@@ -12,7 +12,6 @@ using System.IO;
 using System.Linq;
 using System.Net.Mime;
 using System.Text;
-using System.Threading.Tasks;
 using static CloudNative.CloudEvents.V1.CloudEvent;
 using static CloudNative.CloudEvents.V1.CloudEvent.Types;
 using static CloudNative.CloudEvents.V1.CloudEvent.Types.CloudEventAttributeValue;
diff --git a/src/CloudNative.CloudEvents.SystemTextJson/JsonEventFormatter.cs b/src/CloudNative.CloudEvents.SystemTextJson/JsonEventFormatter.cs
index decdb77..2cde1df 100644
--- a/src/CloudNative.CloudEvents.SystemTextJson/JsonEventFormatter.cs
+++ b/src/CloudNative.CloudEvents.SystemTextJson/JsonEventFormatter.cs
@@ -10,7 +10,6 @@ using System.Net.Mime;
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
-using System.Xml.Linq;
 
 namespace CloudNative.CloudEvents.SystemTextJson
 {
diff --git a/src/CloudNative.CloudEvents/Http/HttpUtilities.cs b/src/CloudNative.CloudEvents/Http/HttpUtilities.cs
index 8d8dae6..e8565f9 100644
--- a/src/CloudNative.CloudEvents/Http/HttpUtilities.cs
+++ b/src/CloudNative.CloudEvents/Http/HttpUtilities.cs
@@ -4,10 +4,7 @@
 
 using CloudNative.CloudEvents.Core;
 using System;
-using System.Net;
-using System.Net.Http;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace CloudNative.CloudEvents.Http
 {
diff --git a/test/CloudNative.CloudEvents.IntegrationTests/AspNetCore/CloudEventControllerTests.cs b/test/CloudNative.CloudEvents.IntegrationTests/AspNetCore/CloudEventControllerTests.cs
index ca8df59..2de9ae4 100644
--- a/test/CloudNative.CloudEvents.IntegrationTests/AspNetCore/CloudEventControllerTests.cs
+++ b/test/CloudNative.CloudEvents.IntegrationTests/AspNetCore/CloudEventControllerTests.cs
@@ -3,8 +3,8 @@
 // See LICENSE file in the project root for full license information.
 
 using CloudNative.CloudEvents.AspNetCoreSample;
-using CloudNative.CloudEvents.NewtonsoftJson;
 using CloudNative.CloudEvents.Http;
+using CloudNative.CloudEvents.NewtonsoftJson;
 using Microsoft.AspNetCore.Mvc.Testing;
 using System;
 using System.Net;
diff --git a/test/CloudNative.CloudEvents.UnitTests/AspNetCore/HttpRequestExtensionsTest.cs b/test/CloudNative.CloudEvents.UnitTests/AspNetCore/HttpRequestExtensionsTest.cs
index 5ffdb7f..4236a65 100644
--- a/test/CloudNative.CloudEvents.UnitTests/AspNetCore/HttpRequestExtensionsTest.cs
+++ b/test/CloudNative.CloudEvents.UnitTests/AspNetCore/HttpRequestExtensionsTest.cs
@@ -8,7 +8,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Internal;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Net.Mime;
 using System.Threading.Tasks;
 using Xunit;
diff --git a/test/CloudNative.CloudEvents.UnitTests/CloudEventFormatterTest.cs b/test/CloudNative.CloudEvents.UnitTests/CloudEventFormatterTest.cs
index c05900c..f937e00 100644
--- a/test/CloudNative.CloudEvents.UnitTests/CloudEventFormatterTest.cs
+++ b/test/CloudNative.CloudEvents.UnitTests/CloudEventFormatterTest.cs
@@ -4,10 +4,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Net.Mime;
-using System.Text;
-using System.Threading.Tasks;
 using Xunit;
 
 namespace CloudNative.CloudEvents.UnitTests
diff --git a/test/CloudNative.CloudEvents.UnitTests/CloudEventsSpecVersionTest.cs b/test/CloudNative.CloudEvents.UnitTests/CloudEventsSpecVersionTest.cs
index 329582a..4d8252b 100644
--- a/test/CloudNative.CloudEvents.UnitTests/CloudEventsSpecVersionTest.cs
+++ b/test/CloudNative.CloudEvents.UnitTests/CloudEventsSpecVersionTest.cs
@@ -3,8 +3,6 @@
 // See LICENSE file in the project root for full license information.
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using Xunit;
 
 namespace CloudNative.CloudEvents.UnitTests
diff --git a/test/CloudNative.CloudEvents.UnitTests/Extensions/PartitioningTest.cs b/test/CloudNative.CloudEvents.UnitTests/Extensions/PartitioningTest.cs
index 24888e3..b07d5ee 100644
--- a/test/CloudNative.CloudEvents.UnitTests/Extensions/PartitioningTest.cs
+++ b/test/CloudNative.CloudEvents.UnitTests/Extensions/PartitioningTest.cs
@@ -3,7 +3,6 @@
 // See LICENSE file in the project root for full license information.
 
 using CloudNative.CloudEvents.NewtonsoftJson;
-using System.Text;
 using Xunit;
 using static CloudNative.CloudEvents.UnitTests.CloudEventFormatterExtensions;
 
diff --git a/test/CloudNative.CloudEvents.UnitTests/Extensions/SamplingTest.cs b/test/CloudNative.CloudEvents.UnitTests/Extensions/SamplingTest.cs
index 4da8ad4..0c189cd 100644
--- a/test/CloudNative.CloudEvents.UnitTests/Extensions/SamplingTest.cs
+++ b/test/CloudNative.CloudEvents.UnitTests/Extensions/SamplingTest.cs
@@ -4,7 +4,6 @@
 
 using CloudNative.CloudEvents.NewtonsoftJson;
 using System;
-using System.Text;
 using Xunit;
 using static CloudNative.CloudEvents.UnitTests.CloudEventFormatterExtensions;
 
diff --git a/test/CloudNative.CloudEvents.UnitTests/Extensions/SequenceTest.cs b/test/CloudNative.CloudEvents.UnitTests/Extensions/SequenceTest.cs
index 420c225..3cee1ce 100644
--- a/test/CloudNative.CloudEvents.UnitTests/Extensions/SequenceTest.cs
+++ b/test/CloudNative.CloudEvents.UnitTests/Extensions/SequenceTest.cs
@@ -4,7 +4,6 @@
 
 using CloudNative.CloudEvents.NewtonsoftJson;
 using System;
-using System.Text;
 using Xunit;
 using static CloudNative.CloudEvents.UnitTests.CloudEventFormatterExtensions;
 
diff --git a/test/CloudNative.CloudEvents.UnitTests/Http/HttpWebExtensionsTest.cs b/test/CloudNative.CloudEvents.UnitTests/Http/HttpWebExtensionsTest.cs
index b551451..b279c94 100644
--- a/test/CloudNative.CloudEvents.UnitTests/Http/HttpWebExtensionsTest.cs
+++ b/test/CloudNative.CloudEvents.UnitTests/Http/HttpWebExtensionsTest.cs
@@ -6,7 +6,6 @@ using CloudNative.CloudEvents.Core;
 using CloudNative.CloudEvents.NewtonsoftJson;
 using System;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Net.Mime;
 using System.Threading.Tasks;
diff --git a/test/CloudNative.CloudEvents.UnitTests/NewtonsoftJson/SpecializedJsonReaderTest.cs b/test/CloudNative.CloudEvents.UnitTests/NewtonsoftJson/SpecializedJsonReaderTest.cs
index 86f4e54..2b3a883 100644
--- a/test/CloudNative.CloudEvents.UnitTests/NewtonsoftJson/SpecializedJsonReaderTest.cs
+++ b/test/CloudNative.CloudEvents.UnitTests/NewtonsoftJson/SpecializedJsonReaderTest.cs
@@ -6,8 +6,6 @@ using CloudNative.CloudEvents.Core;
 using CloudNative.CloudEvents.UnitTests;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;