diff --git a/src/Microsoft.Azure.ServiceBus/Amqp/AmqpClientConstants.cs b/src/Microsoft.Azure.ServiceBus/Amqp/AmqpClientConstants.cs
index 31744ca..2e27f5f 100644
--- a/src/Microsoft.Azure.ServiceBus/Amqp/AmqpClientConstants.cs
+++ b/src/Microsoft.Azure.ServiceBus/Amqp/AmqpClientConstants.cs
@@ -4,9 +4,6 @@
 namespace Microsoft.Azure.ServiceBus.Amqp
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading.Tasks;
     using Microsoft.Azure.Amqp;
     using Microsoft.Azure.Amqp.Encoding;
 
diff --git a/src/Microsoft.Azure.ServiceBus/BrokeredMessage.cs b/src/Microsoft.Azure.ServiceBus/BrokeredMessage.cs
index 0a4c26b..1966e33 100644
--- a/src/Microsoft.Azure.ServiceBus/BrokeredMessage.cs
+++ b/src/Microsoft.Azure.ServiceBus/BrokeredMessage.cs
@@ -10,7 +10,6 @@ namespace Microsoft.Azure.ServiceBus
     using System.Runtime.Serialization;
     using System.Threading;
     using System.Threading.Tasks;
-    using System.Xml.Serialization;
     using Microsoft.Azure.ServiceBus.Primitives;
 
     /// <summary>Represents the unit of communication between ServiceBus client and Service.</summary>
diff --git a/src/Microsoft.Azure.ServiceBus/Primitives/ServiceBusException.cs b/src/Microsoft.Azure.ServiceBus/Primitives/ServiceBusException.cs
index 4d4ef60..04f0a86 100644
--- a/src/Microsoft.Azure.ServiceBus/Primitives/ServiceBusException.cs
+++ b/src/Microsoft.Azure.ServiceBus/Primitives/ServiceBusException.cs
@@ -11,27 +11,27 @@ namespace Microsoft.Azure.ServiceBus
     public class ServiceBusException : Exception
     {
         public ServiceBusException(bool isTransient)
-		{
-			this.IsTransient = isTransient;
-		}
+        {
+            this.IsTransient = isTransient;
+        }
 
         public ServiceBusException(bool isTransient, string message)
-			: base(message)
-		{
-			this.IsTransient = isTransient;
-		}
+            : base(message)
+        {
+            this.IsTransient = isTransient;
+        }
 
         public ServiceBusException(bool isTransient, Exception innerException)
-			: base(innerException.Message, innerException)
-		{
-			this.IsTransient = isTransient;
-		}
+            : base(innerException.Message, innerException)
+        {
+            this.IsTransient = isTransient;
+        }
 
         public ServiceBusException(bool isTransient, string message, Exception innerException)
-			: base(message, innerException)
-		{
-			this.IsTransient = isTransient;
-		}
+            : base(message, innerException)
+        {
+            this.IsTransient = isTransient;
+        }
 
         public override string Message
         {
@@ -54,5 +54,5 @@ namespace Microsoft.Azure.ServiceBus
         public bool IsTransient { get; }
 
         public string ServiceBusNamespace { get; internal set; }
-	}
+    }
 }
diff --git a/src/Microsoft.Azure.ServiceBus/Primitives/SharedAccessSignatureTokenProvider.cs b/src/Microsoft.Azure.ServiceBus/Primitives/SharedAccessSignatureTokenProvider.cs
index 23709ec..c01c86b 100644
--- a/src/Microsoft.Azure.ServiceBus/Primitives/SharedAccessSignatureTokenProvider.cs
+++ b/src/Microsoft.Azure.ServiceBus/Primitives/SharedAccessSignatureTokenProvider.cs
@@ -7,7 +7,6 @@ namespace Microsoft.Azure.ServiceBus
     using System.Collections.Generic;
     using System.Diagnostics.CodeAnalysis;
     using System.Globalization;
-    using System.Linq;
     using System.Net;
     using System.Security.Cryptography;
     using System.Text;