diff --git a/src/Renci.SshNet/Messages/Authentication/BannerMessage.cs b/src/Renci.SshNet/Messages/Authentication/BannerMessage.cs
index e4d1f0fc..338b5fe6 100644
--- a/src/Renci.SshNet/Messages/Authentication/BannerMessage.cs
+++ b/src/Renci.SshNet/Messages/Authentication/BannerMessage.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Renci.SshNet.Messages.Authentication
+namespace Renci.SshNet.Messages.Authentication
 {
     /// <summary>
     /// Represents SSH_MSG_USERAUTH_BANNER message.
diff --git a/src/Renci.SshNet/Messages/Authentication/RequestMessageHost.cs b/src/Renci.SshNet/Messages/Authentication/RequestMessageHost.cs
index 1f060731..abc94797 100644
--- a/src/Renci.SshNet/Messages/Authentication/RequestMessageHost.cs
+++ b/src/Renci.SshNet/Messages/Authentication/RequestMessageHost.cs
@@ -1,6 +1,4 @@
-using Renci.SshNet.Common;
-
-namespace Renci.SshNet.Messages.Authentication
+namespace Renci.SshNet.Messages.Authentication
 {
     /// <summary>
     /// Represents "hostbased" SSH_MSG_USERAUTH_REQUEST message.
diff --git a/src/Renci.SshNet/Messages/Authentication/RequestMessagePublicKey.cs b/src/Renci.SshNet/Messages/Authentication/RequestMessagePublicKey.cs
index 17052fb6..dd88c5e9 100644
--- a/src/Renci.SshNet/Messages/Authentication/RequestMessagePublicKey.cs
+++ b/src/Renci.SshNet/Messages/Authentication/RequestMessagePublicKey.cs
@@ -1,6 +1,4 @@
-using Renci.SshNet.Common;
-
-namespace Renci.SshNet.Messages.Authentication
+namespace Renci.SshNet.Messages.Authentication
 {
     /// <summary>
     /// Represents "publickey" SSH_MSG_USERAUTH_REQUEST message.
@@ -67,7 +65,7 @@ namespace Renci.SshNet.Messages.Authentication
         public RequestMessagePublicKey(ServiceName serviceName, string username, string keyAlgorithmName, byte[] keyData)
             : base(serviceName, username, "publickey")
         {
-            PublicKeyAlgorithmName = SshData.Ascii.GetBytes(keyAlgorithmName);
+            PublicKeyAlgorithmName = Ascii.GetBytes(keyAlgorithmName);
             PublicKeyData = keyData;
         }
 
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/SubsystemRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/SubsystemRequestInfo.cs
index 1acdf6a7..298a49be 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/SubsystemRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/SubsystemRequestInfo.cs
@@ -1,6 +1,4 @@
-using Renci.SshNet.Common;
-
-namespace Renci.SshNet.Messages.Connection
+namespace Renci.SshNet.Messages.Connection
 {
     /// <summary>
     /// Represents "subsystem" type channel request information
diff --git a/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeGroup.cs b/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeGroup.cs
index 6e9592a7..37176ff1 100644
--- a/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeGroup.cs
+++ b/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeGroup.cs
@@ -1,5 +1,4 @@
-using System;
-using Renci.SshNet.Common;
+using Renci.SshNet.Common;
 
 namespace Renci.SshNet.Messages.Transport
 {
diff --git a/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeReply.cs b/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeReply.cs
index 79358bf7..1e3aa872 100644
--- a/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeReply.cs
+++ b/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeReply.cs
@@ -1,5 +1,4 @@
-using System;
-using Renci.SshNet.Common;
+using Renci.SshNet.Common;
 
 namespace Renci.SshNet.Messages.Transport
 {
diff --git a/src/Renci.SshNet/Messages/Transport/KeyExchangeDhInitMessage.cs b/src/Renci.SshNet/Messages/Transport/KeyExchangeDhInitMessage.cs
index f0347a95..b75dbc61 100644
--- a/src/Renci.SshNet/Messages/Transport/KeyExchangeDhInitMessage.cs
+++ b/src/Renci.SshNet/Messages/Transport/KeyExchangeDhInitMessage.cs
@@ -1,5 +1,4 @@
-using System;
-using Renci.SshNet.Common;
+using Renci.SshNet.Common;
 
 namespace Renci.SshNet.Messages.Transport
 {
diff --git a/src/Renci.SshNet/Messages/Transport/KeyExchangeDhReplyMessage.cs b/src/Renci.SshNet/Messages/Transport/KeyExchangeDhReplyMessage.cs
index 079d14ed..0efbba32 100644
--- a/src/Renci.SshNet/Messages/Transport/KeyExchangeDhReplyMessage.cs
+++ b/src/Renci.SshNet/Messages/Transport/KeyExchangeDhReplyMessage.cs
@@ -1,5 +1,4 @@
-using System;
-using Renci.SshNet.Common;
+using Renci.SshNet.Common;
 
 namespace Renci.SshNet.Messages.Transport
 {
diff --git a/src/Renci.SshNet/Messages/Transport/KeyExchangeEcdhInitMessage.cs b/src/Renci.SshNet/Messages/Transport/KeyExchangeEcdhInitMessage.cs
index dd8ec959..270818a4 100644
--- a/src/Renci.SshNet/Messages/Transport/KeyExchangeEcdhInitMessage.cs
+++ b/src/Renci.SshNet/Messages/Transport/KeyExchangeEcdhInitMessage.cs
@@ -1,7 +1,5 @@
 using System;
 using Renci.SshNet.Common;
-using System.Linq;
-using System.Collections.Generic;
 
 namespace Renci.SshNet.Messages.Transport
 {