diff --git a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
index 4314b13e..4b93dd52 100644
--- a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
+++ b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TUNING;FEATURE_RNG_CSP;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1;FEATURE_HASH_SHA256;FEATURE_HASH_SHA384;FEATURE_HASH_SHA512;FEATURE_HASH_RIPEMD160;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;FEATURE_RNG_CSP;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1;FEATURE_HASH_SHA256;FEATURE_HASH_SHA384;FEATURE_HASH_SHA512;FEATURE_HASH_RIPEMD160;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -26,7 +26,7 @@
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;TUNING;FEATURE_RNG_CSP;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1;FEATURE_HASH_SHA256;FEATURE_HASH_SHA384;FEATURE_HASH_SHA512;FEATURE_HASH_RIPEMD160;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE</DefineConstants>
+    <DefineConstants>TRACE;FEATURE_RNG_CSP;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1;FEATURE_HASH_SHA256;FEATURE_HASH_SHA384;FEATURE_HASH_SHA512;FEATURE_HASH_RIPEMD160;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Release\Renci.SshNet.xml</DocumentationFile>
@@ -935,7 +935,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
+      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj b/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
index f0384835..d1508fa1 100644
--- a/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
+++ b/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
@@ -29,7 +29,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>Bin\Debug</OutputPath>
-    <DefineConstants>TRACE;DEBUG;SILVERLIGHT;TUNING;FEATURE_RNG_CSP;FEATURE_SOCKET_EAP;FEATURE_STREAM_APM;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_HASH_SHA1;FEATURE_HASH_SHA256;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;SILVERLIGHT;FEATURE_RNG_CSP;FEATURE_SOCKET_EAP;FEATURE_STREAM_APM;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_HASH_SHA1;FEATURE_HASH_SHA256;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256</DefineConstants>
     <NoStdLib>true</NoStdLib>
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>
@@ -41,7 +41,7 @@
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>Bin\Release</OutputPath>
-    <DefineConstants>TRACE;SILVERLIGHT;TUNING;FEATURE_RNG_CSP;FEATURE_SOCKET_EAP;FEATURE_STREAM_APM;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_HASH_SHA1;FEATURE_HASH_SHA256;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_DIAGNOSTICS_TRACESOURCE</DefineConstants>
+    <DefineConstants>TRACE;SILVERLIGHT;FEATURE_RNG_CSP;FEATURE_SOCKET_EAP;FEATURE_STREAM_APM;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_HASH_SHA1;FEATURE_HASH_SHA256;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256</DefineConstants>
     <NoStdLib>true</NoStdLib>
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>
@@ -910,7 +910,7 @@
       <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
         <SilverlightProjectProperties />
       </FlavorProperties>
-      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
+      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj b/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
index 5596e326..d6dc7af9 100644
--- a/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
+++ b/src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj
@@ -20,7 +20,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TUNING</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -28,7 +28,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;TUNING</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>0</WarningLevel>
   </PropertyGroup>
@@ -1271,7 +1271,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" />
+      <UserProperties ProjectLinkReference="c45379b9-17b1-4e89-bc2e-6d41726413e8" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet.Tests/Classes/Channels/ChannelForwardedTcpipTest_Close_SessionIsConnectedAndChannelIsOpen.cs b/src/Renci.SshNet.Tests/Classes/Channels/ChannelForwardedTcpipTest_Close_SessionIsConnectedAndChannelIsOpen.cs
index 9c04d017..c200467e 100644
--- a/src/Renci.SshNet.Tests/Classes/Channels/ChannelForwardedTcpipTest_Close_SessionIsConnectedAndChannelIsOpen.cs
+++ b/src/Renci.SshNet.Tests/Classes/Channels/ChannelForwardedTcpipTest_Close_SessionIsConnectedAndChannelIsOpen.cs
@@ -17,6 +17,7 @@ namespace Renci.SshNet.Tests.Classes.Channels
     {
         private Mock<ISession> _sessionMock;
         private Mock<IForwardedPort> _forwardedPortMock;
+        private Mock<IConnectionInfo> _connectionInfoMock;
         private ChannelForwardedTcpip _channel;
         private uint _localChannelNumber;
         private uint _localWindowSize;
@@ -31,6 +32,7 @@ namespace Renci.SshNet.Tests.Classes.Channels
         private IList<Socket> _connectedRegister;
         private IList<Socket> _disconnectedRegister;
         private Thread _channelThread;
+        private TimeSpan _connectionInfoTimeout;
 
         [TestInitialize]
         public void Initialize()
@@ -52,6 +54,12 @@ namespace Renci.SshNet.Tests.Classes.Channels
             {
                 if (_channelThread.IsAlive)
                     _channelThread.Abort();
+                _channelThread = null;
+            }
+            if (_channel != null)
+            {
+                _channel.Dispose();
+                _channel = null;
             }
         }
 
@@ -68,14 +76,18 @@ namespace Renci.SshNet.Tests.Classes.Channels
             _channelException = null;
             _connectedRegister = new List<Socket>();
             _disconnectedRegister = new List<Socket>();
+            _connectionInfoTimeout = TimeSpan.FromSeconds(5);
 
             _remoteEndpoint = new IPEndPoint(IPAddress.Loopback, 8122);
 
             _sessionMock = new Mock<ISession>(MockBehavior.Strict);
+            _connectionInfoMock = new Mock<IConnectionInfo>(MockBehavior.Strict);
             _forwardedPortMock = new Mock<IForwardedPort>(MockBehavior.Strict);
 
             var sequence = new MockSequence();
             _sessionMock.InSequence(sequence).Setup(p => p.IsConnected).Returns(true);
+            _sessionMock.InSequence(sequence).Setup(p => p.ConnectionInfo).Returns(_connectionInfoMock.Object);
+            _connectionInfoMock.InSequence(sequence).Setup(p => p.Timeout).Returns(_connectionInfoTimeout);
             _sessionMock.InSequence(sequence).Setup(
                 p => p.SendMessage(
                     It.Is<ChannelOpenConfirmationMessage>(
diff --git a/src/Renci.SshNet.Tests/Classes/ClientAuthenticationTest.cs b/src/Renci.SshNet.Tests/Classes/ClientAuthenticationTest.cs
index 2f00b8d1..9b007791 100644
--- a/src/Renci.SshNet.Tests/Classes/ClientAuthenticationTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/ClientAuthenticationTest.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 
diff --git a/src/Renci.SshNet.Tests/Classes/Messages/Connection/ChannelDataMessageTest.cs b/src/Renci.SshNet.Tests/Classes/Messages/Connection/ChannelDataMessageTest.cs
index 2ed6fc37..8f442018 100644
--- a/src/Renci.SshNet.Tests/Classes/Messages/Connection/ChannelDataMessageTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Messages/Connection/ChannelDataMessageTest.cs
@@ -20,10 +20,8 @@ namespace Renci.SshNet.Tests.Classes.Messages.Connection
             var target = new ChannelDataMessage();
 
             Assert.IsNull(target.Data);
-#if TUNING
             Assert.AreEqual(0, target.Offset);
             Assert.AreEqual(0, target.Size);
-#endif
         }
 
         [TestMethod]
@@ -37,10 +35,8 @@ namespace Renci.SshNet.Tests.Classes.Messages.Connection
             var target = new ChannelDataMessage(localChannelNumber, data);
 
             Assert.AreSame(data, target.Data);
-#if TUNING
             Assert.AreEqual(0, target.Offset);
             Assert.AreEqual(data.Length, target.Size);
-#endif
         }
 
         [TestMethod]
@@ -61,7 +57,6 @@ namespace Renci.SshNet.Tests.Classes.Messages.Connection
             }
         }
 
-#if TUNING
         [TestMethod]
         public void Constructor_LocalChannelNumberAndDataAndOffsetAndSize()
         {
@@ -81,7 +76,7 @@ namespace Renci.SshNet.Tests.Classes.Messages.Connection
         public void Constructor_LocalChannelNumberAndDataAndOffsetAndSize_ShouldThrowArgumentNullExceptionWhenDataIsNull()
         {
             var localChannelNumber = (uint) new Random().Next(0, int.MaxValue);
-            byte[] data = null;
+            const byte[] data = null;
             const int offset = 0;
             const int size = 0;
 
@@ -96,7 +91,6 @@ namespace Renci.SshNet.Tests.Classes.Messages.Connection
                 Assert.AreEqual("data", ex.ParamName);
             }
         }
-#endif
 
         [TestMethod]
         public void GetBytes()
@@ -106,17 +100,10 @@ namespace Renci.SshNet.Tests.Classes.Messages.Connection
             var localChannelNumber = (uint) random.Next(0, int.MaxValue);
             var data = new byte[random.Next(10, 20)];
             random.NextBytes(data);
-#if TUNING
             var offset = random.Next(2, 4);
             var size = random.Next(5, 9);
 
             var target = new ChannelDataMessage(localChannelNumber, data, offset, size);
-#else
-            var offset = 0;
-            var size = data.Length;
-
-            var target = new ChannelDataMessage(localChannelNumber, data);
-#endif
 
             var bytes = target.GetBytes();
 
@@ -145,28 +132,21 @@ namespace Renci.SshNet.Tests.Classes.Messages.Connection
         {
             var random = new Random();
 
-            var localChannelNumber = (uint)random.Next(0, int.MaxValue);
+            var localChannelNumber = (uint) random.Next(0, int.MaxValue);
             var data = new byte[random.Next(10, 20)];
             random.NextBytes(data);
-#if TUNING
+
             var offset = random.Next(2, 4);
             var size = random.Next(5, 9);
             var channelDataMessage = new ChannelDataMessage(localChannelNumber, data, offset, size);
-#else
-            var offset = 0;
-            var size = data.Length;
-            var channelDataMessage = new ChannelDataMessage(localChannelNumber, data);
-#endif
             var bytes = channelDataMessage.GetBytes();
             var target = new ChannelDataMessage();
 
             target.Load(bytes);
 
             Assert.IsTrue(target.Data.SequenceEqual(data.Take(offset, size)));
-#if TUNING
             Assert.AreEqual(0, target.Offset);
             Assert.AreEqual(size, target.Size);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Messages/Connection/ChannelOpen/ChannelOpenMessageTest.cs b/src/Renci.SshNet.Tests/Classes/Messages/Connection/ChannelOpen/ChannelOpenMessageTest.cs
index 06fd8bad..b1a66bf9 100644
--- a/src/Renci.SshNet.Tests/Classes/Messages/Connection/ChannelOpen/ChannelOpenMessageTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Messages/Connection/ChannelOpen/ChannelOpenMessageTest.cs
@@ -26,9 +26,7 @@ namespace Renci.SshNet.Tests.Classes.Messages.Connection
         {
             var target = new ChannelOpenMessage();
 
-#if TUNING
             Assert.IsNull(target.ChannelType);
-#endif
             Assert.IsNull(target.Info);
             Assert.AreEqual(default(uint), target.InitialWindowSize);
             Assert.AreEqual(default(uint), target.LocalChannelNumber);
@@ -45,11 +43,7 @@ namespace Renci.SshNet.Tests.Classes.Messages.Connection
 
             var target = new ChannelOpenMessage(localChannelNumber, initialWindowSize, maximumPacketSize, info);
 
-#if TUNING
             Assert.AreEqual(info.ChannelType, _ascii.GetString(target.ChannelType));
-#else
-            Assert.AreEqual(info.ChannelType, target.ChannelType);
-#endif
             Assert.AreSame(info, target.Info);
             Assert.AreEqual(initialWindowSize, target.InitialWindowSize);
             Assert.AreEqual(localChannelNumber, target.LocalChannelNumber);
@@ -105,15 +99,9 @@ namespace Renci.SshNet.Tests.Classes.Messages.Connection
             var actualChannelTypeLength = sshDataStream.ReadUInt32();
             Assert.AreEqual((uint) target.ChannelType.Length, actualChannelTypeLength);
 
-#if TUNING
             var actualChannelType = new byte[actualChannelTypeLength];
             sshDataStream.Read(actualChannelType, 0, (int) actualChannelTypeLength);
             Assert.IsTrue(target.ChannelType.SequenceEqual(actualChannelType));
-#else
-            var actualChannelType = new byte[actualChannelTypeLength];
-            sshDataStream.Read(actualChannelType, 0, (int) actualChannelTypeLength);
-            Assert.AreEqual(target.ChannelType, SshData.Ascii.GetString(actualChannelType));
-#endif
 
             Assert.AreEqual(localChannelNumber, sshDataStream.ReadUInt32());
             Assert.AreEqual(initialWindowSize, sshDataStream.ReadUInt32());
@@ -138,11 +126,7 @@ namespace Renci.SshNet.Tests.Classes.Messages.Connection
 
             target.Load(bytes);
 
-#if TUNING
             Assert.AreEqual(info.ChannelType, _ascii.GetString(target.ChannelType));
-#else
-            Assert.AreEqual(info.ChannelType, target.ChannelType);
-#endif
             Assert.IsNotNull(target.Info);
             Assert.AreEqual(initialWindowSize, target.InitialWindowSize);
             Assert.AreEqual(localChannelNumber, target.LocalChannelNumber);
@@ -169,11 +153,7 @@ namespace Renci.SshNet.Tests.Classes.Messages.Connection
 
             target.Load(bytes);
 
-#if TUNING
             Assert.AreEqual(info.ChannelType, _ascii.GetString(target.ChannelType));
-#else
-            Assert.AreEqual(info.ChannelType, target.ChannelType);
-#endif
             Assert.IsNotNull(target.Info);
             Assert.AreEqual(initialWindowSize, target.InitialWindowSize);
             Assert.AreEqual(localChannelNumber, target.LocalChannelNumber);
@@ -200,11 +180,7 @@ namespace Renci.SshNet.Tests.Classes.Messages.Connection
 
             target.Load(bytes);
 
-#if TUNING
             Assert.AreEqual(info.ChannelType, _ascii.GetString(target.ChannelType));
-#else
-            Assert.AreEqual(info.ChannelType, target.ChannelType);
-#endif
             Assert.IsNotNull(target.Info);
             Assert.AreEqual(initialWindowSize, target.InitialWindowSize);
             Assert.AreEqual(localChannelNumber, target.LocalChannelNumber);
@@ -228,11 +204,7 @@ namespace Renci.SshNet.Tests.Classes.Messages.Connection
 
             target.Load(bytes);
 
-#if TUNING
             Assert.AreEqual(info.ChannelType, _ascii.GetString(target.ChannelType));
-#else
-            Assert.AreEqual(info.ChannelType, target.ChannelType);
-#endif
             Assert.IsNotNull(target.Info);
             Assert.AreEqual(initialWindowSize, target.InitialWindowSize);
             Assert.AreEqual(localChannelNumber, target.LocalChannelNumber);
diff --git a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_Success.cs b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_Success.cs
index 06e31205..6a07a3f3 100644
--- a/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_Success.cs
+++ b/src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_Success.cs
@@ -89,21 +89,12 @@ namespace Renci.SshNet.Tests.Classes
             for (var i = 0; i < random.Next(1, 3); i++)
                 _pipeStreamMock.InSequence(sequence).Setup(p => p.ReadByte()).Returns(-1);
             _pipeStreamMock.InSequence(sequence).Setup(p => p.ReadByte()).Returns(0);
-#if TUNING
             _channelSessionMock.InSequence(sequence)
                 .Setup(
                     p => p.SendData(It.Is<byte[]>(b => b.SequenceEqual(_fileContent.Take(_bufferSize))), 0, _bufferSize));
             _channelSessionMock.InSequence(sequence)
                 .Setup(
                     p => p.SendData(It.Is<byte[]>(b => b.Take(0, _fileContent.Length - _bufferSize).SequenceEqual(_fileContent.Take(_bufferSize, _fileContent.Length - _bufferSize))), 0, _fileContent.Length - _bufferSize));
-#else
-            _channelSessionMock.InSequence(sequence)
-                .Setup(
-                    p => p.SendData(It.Is<byte[]>(b => b.SequenceEqual(_fileContent.Take(_bufferSize)))));
-            _channelSessionMock.InSequence(sequence)
-                .Setup(
-                    p => p.SendData(It.Is<byte[]>(b => b.SequenceEqual(_fileContent.Skip(_bufferSize)))));
-#endif
             _channelSessionMock.InSequence(sequence)
                 .Setup(
                     p => p.SendData(It.Is<byte[]>(b => b.SequenceEqual(new byte[] { 0 }))));
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/ExtendedRequests/FStatVfsRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/ExtendedRequests/FStatVfsRequestTest.cs
index 0da40825..ba139e9d 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/ExtendedRequests/FStatVfsRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/ExtendedRequests/FStatVfsRequestTest.cs
@@ -90,9 +90,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests.ExtendedRequests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // Name length
@@ -104,10 +102,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests.ExtendedRequests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
-            Assert.AreEqual((uint)bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
-            Assert.AreEqual((byte)SftpMessageTypes.Extended, sshDataStream.ReadByte());
+            Assert.AreEqual((uint) bytes.Length - 4, sshDataStream.ReadUInt32());
+            Assert.AreEqual((byte) SftpMessageTypes.Extended, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
             Assert.AreEqual((uint) _nameBytes.Length, sshDataStream.ReadUInt32());
 
@@ -115,7 +111,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests.ExtendedRequests
             sshDataStream.Read(actualNameBytes, 0, actualNameBytes.Length);
             Assert.IsTrue(_nameBytes.SequenceEqual(actualNameBytes));
 
-            Assert.AreEqual((uint)_handle.Length, sshDataStream.ReadUInt32());
+            Assert.AreEqual((uint) _handle.Length, sshDataStream.ReadUInt32());
 
             var actualHandle = new byte[_handle.Length];
             sshDataStream.Read(actualHandle, 0, actualHandle.Length);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/ExtendedRequests/HardLinkRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/ExtendedRequests/HardLinkRequestTest.cs
index 3ebab061..8282f52d 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/ExtendedRequests/HardLinkRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/ExtendedRequests/HardLinkRequestTest.cs
@@ -75,9 +75,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests.ExtendedRequests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // Name length
@@ -91,24 +89,22 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests.ExtendedRequests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
-            Assert.AreEqual((uint)bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
-            Assert.AreEqual((byte)SftpMessageTypes.Extended, sshDataStream.ReadByte());
+            Assert.AreEqual((uint) bytes.Length - 4, sshDataStream.ReadUInt32());
+            Assert.AreEqual((byte) SftpMessageTypes.Extended, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
-            Assert.AreEqual((uint)_nameBytes.Length, sshDataStream.ReadUInt32());
+            Assert.AreEqual((uint) _nameBytes.Length, sshDataStream.ReadUInt32());
 
             var actualNameBytes = new byte[_nameBytes.Length];
             sshDataStream.Read(actualNameBytes, 0, actualNameBytes.Length);
             Assert.IsTrue(_nameBytes.SequenceEqual(actualNameBytes));
 
-            Assert.AreEqual((uint)_oldPathBytes.Length, sshDataStream.ReadUInt32());
+            Assert.AreEqual((uint) _oldPathBytes.Length, sshDataStream.ReadUInt32());
 
             var actualOldPath = new byte[_oldPathBytes.Length];
             sshDataStream.Read(actualOldPath, 0, actualOldPath.Length);
             Assert.IsTrue(_oldPathBytes.SequenceEqual(actualOldPath));
 
-            Assert.AreEqual((uint)_newPathBytes.Length, sshDataStream.ReadUInt32());
+            Assert.AreEqual((uint) _newPathBytes.Length, sshDataStream.ReadUInt32());
 
             var actualNewPath = new byte[_newPathBytes.Length];
             sshDataStream.Read(actualNewPath, 0, actualNewPath.Length);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/ExtendedRequests/PosixRenameRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/ExtendedRequests/PosixRenameRequestTest.cs
index 7a4efc4d..c9edf3bd 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/ExtendedRequests/PosixRenameRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/ExtendedRequests/PosixRenameRequestTest.cs
@@ -79,9 +79,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests.ExtendedRequests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // Name length
@@ -95,24 +93,22 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests.ExtendedRequests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
             Assert.AreEqual((uint)bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
-            Assert.AreEqual((byte)SftpMessageTypes.Extended, sshDataStream.ReadByte());
+            Assert.AreEqual((byte) SftpMessageTypes.Extended, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
-            Assert.AreEqual((uint)_nameBytes.Length, sshDataStream.ReadUInt32());
+            Assert.AreEqual((uint) _nameBytes.Length, sshDataStream.ReadUInt32());
 
             var actualNameBytes = new byte[_nameBytes.Length];
             sshDataStream.Read(actualNameBytes, 0, actualNameBytes.Length);
             Assert.IsTrue(_nameBytes.SequenceEqual(actualNameBytes));
 
-            Assert.AreEqual((uint)_oldPathBytes.Length, sshDataStream.ReadUInt32());
+            Assert.AreEqual((uint) _oldPathBytes.Length, sshDataStream.ReadUInt32());
 
             var actualOldPath = new byte[_oldPathBytes.Length];
             sshDataStream.Read(actualOldPath, 0, actualOldPath.Length);
             Assert.IsTrue(_oldPathBytes.SequenceEqual(actualOldPath));
 
-            Assert.AreEqual((uint)_newPathBytes.Length, sshDataStream.ReadUInt32());
+            Assert.AreEqual((uint) _newPathBytes.Length, sshDataStream.ReadUInt32());
 
             var actualNewPath = new byte[_newPathBytes.Length];
             sshDataStream.Read(actualNewPath, 0, actualNewPath.Length);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/ExtendedRequests/StatVfsRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/ExtendedRequests/StatVfsRequestTest.cs
index ab2677ad..5dd1e9a8 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/ExtendedRequests/StatVfsRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/ExtendedRequests/StatVfsRequestTest.cs
@@ -96,9 +96,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests.ExtendedRequests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // Name length
@@ -110,18 +108,16 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests.ExtendedRequests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
-            Assert.AreEqual((uint)bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
-            Assert.AreEqual((byte)SftpMessageTypes.Extended, sshDataStream.ReadByte());
+            Assert.AreEqual((uint) bytes.Length - 4, sshDataStream.ReadUInt32());
+            Assert.AreEqual((byte) SftpMessageTypes.Extended, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
-            Assert.AreEqual((uint)_nameBytes.Length, sshDataStream.ReadUInt32());
+            Assert.AreEqual((uint) _nameBytes.Length, sshDataStream.ReadUInt32());
 
             var actualNameBytes = new byte[_nameBytes.Length];
             sshDataStream.Read(actualNameBytes, 0, actualNameBytes.Length);
             Assert.IsTrue(_nameBytes.SequenceEqual(actualNameBytes));
 
-            Assert.AreEqual((uint)_pathBytes.Length, sshDataStream.ReadUInt32());
+            Assert.AreEqual((uint) _pathBytes.Length, sshDataStream.ReadUInt32());
 
             var actualPath = new byte[_pathBytes.Length];
             sshDataStream.Read(actualPath, 0, actualPath.Length);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpBlockRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpBlockRequestTest.cs
index 03ad028f..a62472ff 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpBlockRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpBlockRequestTest.cs
@@ -71,9 +71,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // Handle length
@@ -86,13 +84,11 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
-            Assert.AreEqual((uint)bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
-            Assert.AreEqual((byte)SftpMessageTypes.Block, sshDataStream.ReadByte());
+            Assert.AreEqual((uint) bytes.Length - 4, sshDataStream.ReadUInt32());
+            Assert.AreEqual((byte) SftpMessageTypes.Block, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
 
-            Assert.AreEqual((uint)_handle.Length, sshDataStream.ReadUInt32());
+            Assert.AreEqual((uint) _handle.Length, sshDataStream.ReadUInt32());
             var actualHandle = new byte[_handle.Length];
             sshDataStream.Read(actualHandle, 0, actualHandle.Length);
             Assert.IsTrue(_handle.SequenceEqual(actualHandle));
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpCloseRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpCloseRequestTest.cs
index 5beddda6..8fe79c6f 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpCloseRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpCloseRequestTest.cs
@@ -62,9 +62,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // Handle length
@@ -74,13 +72,11 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
             Assert.AreEqual((uint)bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
-            Assert.AreEqual((byte)SftpMessageTypes.Close, sshDataStream.ReadByte());
+            Assert.AreEqual((byte) SftpMessageTypes.Close, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
 
-            Assert.AreEqual((uint)_handle.Length, sshDataStream.ReadUInt32());
+            Assert.AreEqual((uint) _handle.Length, sshDataStream.ReadUInt32());
             var actualHandle = new byte[_handle.Length];
             sshDataStream.Read(actualHandle, 0, actualHandle.Length);
             Assert.IsTrue(_handle.SequenceEqual(actualHandle));
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpFSetStatRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpFSetStatRequestTest.cs
index fbc59d28..01b81331 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpFSetStatRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpFSetStatRequestTest.cs
@@ -66,9 +66,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // Handle length
@@ -79,13 +77,11 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
-            Assert.AreEqual((uint)bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
-            Assert.AreEqual((byte)SftpMessageTypes.FSetStat, sshDataStream.ReadByte());
+            Assert.AreEqual((uint) bytes.Length - 4, sshDataStream.ReadUInt32());
+            Assert.AreEqual((byte) SftpMessageTypes.FSetStat, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
 
-            Assert.AreEqual((uint)_handle.Length, sshDataStream.ReadUInt32());
+            Assert.AreEqual((uint) _handle.Length, sshDataStream.ReadUInt32());
             var actualHandle = new byte[_handle.Length];
             sshDataStream.Read(actualHandle, 0, actualHandle.Length);
             Assert.IsTrue(_handle.SequenceEqual(actualHandle));
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpFStatRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpFStatRequestTest.cs
index e7ca98c6..5ff1dd04 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpFStatRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpFStatRequestTest.cs
@@ -84,9 +84,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // Handle length
@@ -96,13 +94,11 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
-            Assert.AreEqual((uint)bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
-            Assert.AreEqual((byte)SftpMessageTypes.FStat, sshDataStream.ReadByte());
+            Assert.AreEqual((uint) bytes.Length - 4, sshDataStream.ReadUInt32());
+            Assert.AreEqual((byte) SftpMessageTypes.FStat, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
 
-            Assert.AreEqual((uint)_handle.Length, sshDataStream.ReadUInt32());
+            Assert.AreEqual((uint) _handle.Length, sshDataStream.ReadUInt32());
             var actualHandle = new byte[_handle.Length];
             sshDataStream.Read(actualHandle, 0, actualHandle.Length);
             Assert.IsTrue(_handle.SequenceEqual(actualHandle));
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpLStatRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpLStatRequestTest.cs
index 6a87d848..878b18a2 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpLStatRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpLStatRequestTest.cs
@@ -90,9 +90,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // Pah length
@@ -102,10 +100,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
-            Assert.AreEqual((uint)bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
-            Assert.AreEqual((byte)SftpMessageTypes.LStat, sshDataStream.ReadByte());
+            Assert.AreEqual((uint) bytes.Length - 4, sshDataStream.ReadUInt32());
+            Assert.AreEqual((byte) SftpMessageTypes.LStat, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
 
             Assert.AreEqual((uint) _pathBytes.Length, sshDataStream.ReadUInt32());
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpLinkRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpLinkRequestTest.cs
index 6dc43f1e..77b94645 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpLinkRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpLinkRequestTest.cs
@@ -75,9 +75,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // NewLinkPath length
@@ -90,10 +88,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
-            Assert.AreEqual((uint)bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
-            Assert.AreEqual((byte)SftpMessageTypes.Link, sshDataStream.ReadByte());
+            Assert.AreEqual((uint) bytes.Length - 4, sshDataStream.ReadUInt32());
+            Assert.AreEqual((byte) SftpMessageTypes.Link, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
 
             Assert.AreEqual((uint) _newLinkPathBytes.Length, sshDataStream.ReadUInt32());
@@ -106,7 +102,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
             sshDataStream.Read(actualExistingPath, 0, actualExistingPath.Length);
             Assert.IsTrue(_existingPathBytes.SequenceEqual(actualExistingPath));
 
-            Assert.AreEqual((byte) 1, sshDataStream.ReadByte());
+            Assert.AreEqual(1, sshDataStream.ReadByte());
 
             Assert.IsTrue(sshDataStream.IsEndOfData);
         }
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpMkDirRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpMkDirRequestTest.cs
index 359d07d2..e3bed2fb 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpMkDirRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpMkDirRequestTest.cs
@@ -72,9 +72,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // Path length
@@ -85,9 +83,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
             Assert.AreEqual((uint) bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
             Assert.AreEqual((byte) SftpMessageTypes.MkDir, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpOpenDirRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpOpenDirRequestTest.cs
index 06b563fc..55fe352d 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpOpenDirRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpOpenDirRequestTest.cs
@@ -90,9 +90,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // Path length
@@ -102,13 +100,11 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
-            Assert.AreEqual((uint)bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
-            Assert.AreEqual((byte)SftpMessageTypes.OpenDir, sshDataStream.ReadByte());
+            Assert.AreEqual((uint) bytes.Length - 4, sshDataStream.ReadUInt32());
+            Assert.AreEqual((byte) SftpMessageTypes.OpenDir, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
 
-            Assert.AreEqual((uint)_pathBytes.Length, sshDataStream.ReadUInt32());
+            Assert.AreEqual((uint) _pathBytes.Length, sshDataStream.ReadUInt32());
             var actualPath = new byte[_pathBytes.Length];
             sshDataStream.Read(actualPath, 0, actualPath.Length);
             Assert.IsTrue(_pathBytes.SequenceEqual(actualPath));
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpOpenRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpOpenRequestTest.cs
index 310b2263..5a4a1c70 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpOpenRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpOpenRequestTest.cs
@@ -110,9 +110,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // Filename length
@@ -124,13 +122,11 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
-            Assert.AreEqual((uint)bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
-            Assert.AreEqual((byte)SftpMessageTypes.Open, sshDataStream.ReadByte());
+            Assert.AreEqual((uint) bytes.Length - 4, sshDataStream.ReadUInt32());
+            Assert.AreEqual((byte) SftpMessageTypes.Open, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
 
-            Assert.AreEqual((uint)_filenameBytes.Length, sshDataStream.ReadUInt32());
+            Assert.AreEqual((uint) _filenameBytes.Length, sshDataStream.ReadUInt32());
             var actualPath = new byte[_filenameBytes.Length];
             sshDataStream.Read(actualPath, 0, actualPath.Length);
             Assert.IsTrue(_filenameBytes.SequenceEqual(actualPath));
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpReadDirRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpReadDirRequestTest.cs
index 5eadf09b..020c4f7c 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpReadDirRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpReadDirRequestTest.cs
@@ -85,9 +85,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // Handle length
@@ -97,9 +95,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
             Assert.AreEqual((uint) bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
             Assert.AreEqual((byte) SftpMessageTypes.ReadDir, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpReadLinkRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpReadLinkRequestTest.cs
index d32e157d..3f03f766 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpReadLinkRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpReadLinkRequestTest.cs
@@ -102,9 +102,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // Path length
@@ -114,9 +112,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
             Assert.AreEqual((uint) bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
             Assert.AreEqual((byte) SftpMessageTypes.ReadLink, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpReadRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpReadRequestTest.cs
index 1d30f390..36e3ad6a 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpReadRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpReadRequestTest.cs
@@ -104,9 +104,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // Handle length
@@ -118,9 +116,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
             Assert.AreEqual((uint) bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
             Assert.AreEqual((byte) SftpMessageTypes.Read, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpRealPathRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpRealPathRequestTest.cs
index 7e14b030..fc3cb13a 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpRealPathRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpRealPathRequestTest.cs
@@ -118,9 +118,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // Path length
@@ -130,10 +128,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
-            Assert.AreEqual((uint)bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
-            Assert.AreEqual((byte)SftpMessageTypes.RealPath, sshDataStream.ReadByte());
+            Assert.AreEqual((uint) bytes.Length - 4, sshDataStream.ReadUInt32());
+            Assert.AreEqual((byte) SftpMessageTypes.RealPath, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
 
             Assert.AreEqual((uint) _pathBytes.Length, sshDataStream.ReadUInt32());
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpRemoveRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpRemoveRequestTest.cs
index ec5c11ea..9db8db2b 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpRemoveRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpRemoveRequestTest.cs
@@ -68,9 +68,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // Filename length
@@ -80,9 +78,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
             Assert.AreEqual((uint) bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
             Assert.AreEqual((byte) SftpMessageTypes.Remove, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpRenameRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpRenameRequestTest.cs
index 01bb5ea4..ce4e235f 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpRenameRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpRenameRequestTest.cs
@@ -73,9 +73,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // OldPath length
@@ -87,9 +85,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
             Assert.AreEqual((uint) bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
             Assert.AreEqual((byte) SftpMessageTypes.Rename, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpRmDirRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpRmDirRequestTest.cs
index 02af4e0f..8cfbdda9 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpRmDirRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpRmDirRequestTest.cs
@@ -71,9 +71,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // Path length
@@ -83,9 +81,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
             Assert.AreEqual((uint) bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
             Assert.AreEqual((byte) SftpMessageTypes.RmDir, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpSetStatRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpSetStatRequestTest.cs
index 603127a2..eb6694cf 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpSetStatRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpSetStatRequestTest.cs
@@ -77,9 +77,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // Path length
@@ -90,13 +88,11 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
             Assert.AreEqual((uint) bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
             Assert.AreEqual((byte) SftpMessageTypes.SetStat, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
 
-            Assert.AreEqual((uint)_pathBytes.Length, sshDataStream.ReadUInt32());
+            Assert.AreEqual((uint) _pathBytes.Length, sshDataStream.ReadUInt32());
             var actualPath = new byte[_pathBytes.Length];
             sshDataStream.Read(actualPath, 0, actualPath.Length);
             Assert.IsTrue(_pathBytes.SequenceEqual(actualPath));
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpStatRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpStatRequestTest.cs
index 2eebf647..e0870493 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpStatRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpStatRequestTest.cs
@@ -88,9 +88,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // Path length
@@ -100,9 +98,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
             Assert.AreEqual((uint) bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
             Assert.AreEqual((byte) SftpMessageTypes.Stat, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpSymLinkRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpSymLinkRequestTest.cs
index b25ef6ec..8bc97087 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpSymLinkRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpSymLinkRequestTest.cs
@@ -91,9 +91,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // NewLinkPath length
@@ -105,9 +103,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
             Assert.AreEqual((uint) bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
             Assert.AreEqual((byte) SftpMessageTypes.SymLink, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpUnblockRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpUnblockRequestTest.cs
index 9c345ecb..6cbe4aa6 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpUnblockRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpUnblockRequestTest.cs
@@ -66,9 +66,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // Handle length
@@ -80,9 +78,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
             Assert.AreEqual((uint) bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
             Assert.AreEqual((byte) SftpMessageTypes.Unblock, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpWriteRequestTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpWriteRequestTest.cs
index eb6771eb..096355c0 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpWriteRequestTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpWriteRequestTest.cs
@@ -31,27 +31,17 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
             _offset = (ulong) random.Next(0, int.MaxValue);
             _data = new byte[random.Next(5, 10)];
             random.NextBytes(_data);
-#if TUNING
             _length = random.Next(1, 4);
-#else
-            _length = _data.Length;
-#endif
         }
 
         [TestMethod]
         public void Constructor()
         {
-#if TUNING
             var request = new SftpWriteRequest(_protocolVersion, _requestId, _handle, _offset, _data, _length, null);
-#else
-            var request = new SftpWriteRequest(_protocolVersion, _requestId, _handle, _offset, _data, null);
-#endif
 
             Assert.AreSame(_data, request.Data);
             Assert.AreSame(_handle, request.Handle);
-#if TUNING
             Assert.AreEqual(_length, request.Length);
-#endif
             Assert.AreEqual(_protocolVersion, request.ProtocolVersion);
             Assert.AreEqual(_requestId, request.RequestId);
             Assert.AreEqual(SftpMessageTypes.Write, request.SftpMessageType);
@@ -70,9 +60,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
                 _handle,
                 _offset,
                 _data,
-#if TUNING
                 _length,
-#endif
                 statusAction);
 
             request.Complete(statusResponse);
@@ -84,18 +72,12 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
         [TestMethod]
         public void GetBytes()
         {
-#if TUNING
             var request = new SftpWriteRequest(_protocolVersion, _requestId, _handle, _offset, _data, _length, null);
-#else
-            var request = new SftpWriteRequest(_protocolVersion, _requestId, _handle, _offset, _data, null);
-#endif
 
             var bytes = request.GetBytes();
 
             var expectedBytesLength = 0;
-#if TUNING
             expectedBytesLength += 4; // Length
-#endif
             expectedBytesLength += 1; // Type
             expectedBytesLength += 4; // RequestId
             expectedBytesLength += 4; // Handle length
@@ -108,9 +90,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Requests
 
             var sshDataStream = new SshDataStream(bytes);
 
-#if TUNING
             Assert.AreEqual((uint) bytes.Length - 4, sshDataStream.ReadUInt32());
-#endif
             Assert.AreEqual((byte) SftpMessageTypes.Write, sshDataStream.ReadByte());
             Assert.AreEqual(_requestId, sshDataStream.ReadUInt32());
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Responses/ExtendedReplies/StatVfsReplyInfoTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Responses/ExtendedReplies/StatVfsReplyInfoTest.cs
index c9422e3f..5788e683 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Responses/ExtendedReplies/StatVfsReplyInfoTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Responses/ExtendedReplies/StatVfsReplyInfoTest.cs
@@ -52,12 +52,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Responses
         {
             var target = new StatVfsReplyInfo();
 
-#if TUNING
             var sshDataStream = new SshDataStream(4 + 1 + 4 + 88);
             sshDataStream.Write((uint) (sshDataStream.Capacity - 4));
-#else
-            var sshDataStream = new SshDataStream(1 + 4 + 88);
-#endif
             sshDataStream.WriteByte((byte) SftpMessageTypes.ExtendedReply);
             sshDataStream.Write(_responseId);
             sshDataStream.Write(_bsize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Responses/SftpAttrsResponseTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Responses/SftpAttrsResponseTest.cs
index 338691f2..2ce13986 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Responses/SftpAttrsResponseTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Responses/SftpAttrsResponseTest.cs
@@ -40,13 +40,9 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Responses
             var attributes = CreateSftpFileAttributes();
             var attributesBytes = attributes.GetBytes();
 
-#if TUNING
             var sshDataStream = new SshDataStream(4 + 1 + 4 + attributesBytes.Length);
             sshDataStream.Position = 4; // skip 4 bytes for SSH packet length
-#else
-            var sshDataStream = new SshDataStream(1 + 4 + attributesBytes.Length);
-#endif
-            sshDataStream.WriteByte((byte)SftpMessageTypes.Attrs);
+            sshDataStream.WriteByte((byte) SftpMessageTypes.Attrs);
             sshDataStream.Write(_responseId);
             sshDataStream.Write(attributesBytes, 0, attributesBytes.Length);
 
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Responses/SftpDataResponseTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Responses/SftpDataResponseTest.cs
index 7de3a940..39bde628 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Responses/SftpDataResponseTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Responses/SftpDataResponseTest.cs
@@ -41,12 +41,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Responses
         {
             var target = new SftpDataResponse(_protocolVersion);
 
-#if TUNING
             var sshDataStream = new SshDataStream(4 + 1 + 4 + _data.Length);
             sshDataStream.Position = 4; // skip 4 bytes for SSH packet length
-#else
-            var sshDataStream = new SshDataStream(1 + 4 + _data.Length);
-#endif
             sshDataStream.WriteByte((byte)SftpMessageTypes.Attrs);
             sshDataStream.Write(_responseId);
             sshDataStream.Write((uint) _data.Length);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Responses/SftpExtendedReplyResponseTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Responses/SftpExtendedReplyResponseTest.cs
index 6b9907d7..cb77f19d 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Responses/SftpExtendedReplyResponseTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Responses/SftpExtendedReplyResponseTest.cs
@@ -36,12 +36,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Responses
         {
             var target = new SftpExtendedReplyResponse(_protocolVersion);
 
-#if TUNING
             var sshDataStream = new SshDataStream(4 + 1 + 4);
             sshDataStream.Position = 4; // skip 4 bytes for SSH packet length
-#else
-            var sshDataStream = new SshDataStream(1 + 4);
-#endif
             sshDataStream.WriteByte((byte) SftpMessageTypes.ExtendedReply);
             sshDataStream.Write(_responseId);
 
@@ -66,12 +62,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Responses
             var sid = (ulong) _random.Next(0, int.MaxValue);
             var namemax = (ulong) _random.Next(0, int.MaxValue);
 
-#if TUNING
             var sshDataStream = new SshDataStream(4 + 1 + 4 + 88);
             sshDataStream.Position = 4; // skip 4 bytes for SSH packet length
-#else
-            var sshDataStream = new SshDataStream(1 + 4 + 88);
-#endif
             sshDataStream.WriteByte((byte) SftpMessageTypes.Attrs);
             sshDataStream.Write(_responseId);
             sshDataStream.Write(bsize);
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/Responses/SftpHandleResponseTest.cs b/src/Renci.SshNet.Tests/Classes/Sftp/Responses/SftpHandleResponseTest.cs
index ce1e3be8..36000ded 100644
--- a/src/Renci.SshNet.Tests/Classes/Sftp/Responses/SftpHandleResponseTest.cs
+++ b/src/Renci.SshNet.Tests/Classes/Sftp/Responses/SftpHandleResponseTest.cs
@@ -41,12 +41,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp.Responses
         {
             var target = new SftpHandleResponse(_protocolVersion);
 
-#if TUNING
             var sshDataStream = new SshDataStream(4 + 1 + 4 + _handle.Length);
             sshDataStream.Position = 4; // skip 4 bytes for SSH packet length
-#else
-            var sshDataStream = new SshDataStream(1 + 4 + _handle.Length);
-#endif
             sshDataStream.WriteByte((byte) SftpMessageTypes.Handle);
             sshDataStream.Write(_responseId);
             sshDataStream.Write((uint) _handle.Length);
diff --git a/src/Renci.SshNet.Tests/Classes/SshCommandTest_BeginExecute_EndExecuteNotInvokedOnAsyncResultFromPreviousInvocation.cs b/src/Renci.SshNet.Tests/Classes/SshCommandTest_BeginExecute_EndExecuteNotInvokedOnAsyncResultFromPreviousInvocation.cs
index 9d110fa7..2d259c01 100644
--- a/src/Renci.SshNet.Tests/Classes/SshCommandTest_BeginExecute_EndExecuteNotInvokedOnAsyncResultFromPreviousInvocation.cs
+++ b/src/Renci.SshNet.Tests/Classes/SshCommandTest_BeginExecute_EndExecuteNotInvokedOnAsyncResultFromPreviousInvocation.cs
@@ -16,7 +16,6 @@ namespace Renci.SshNet.Tests.Classes
         private string _commandText;
         private Encoding _encoding;
         private SshCommand _sshCommand;
-        private IAsyncResult _asyncResult;
         private InvalidOperationException _actualException;
 
         protected override void OnInit()
@@ -35,12 +34,11 @@ namespace Renci.SshNet.Tests.Classes
             _channelSessionMock = new Mock<IChannelSession>(MockBehavior.Strict);
             _commandText = random.Next().ToString(CultureInfo.InvariantCulture);
             _encoding = Encoding.UTF8;
-            _asyncResult = null;
 
             var seq = new MockSequence();
             _sessionMock.InSequence(seq).Setup(p => p.CreateChannelSession()).Returns(_channelSessionMock.Object);
             _channelSessionMock.InSequence(seq).Setup(p => p.Open());
-            _channelSessionMock.InSequence(seq).Setup(p => p.SendExecRequest(_commandText));
+            _channelSessionMock.InSequence(seq).Setup(p => p.SendExecRequest(_commandText)).Returns(true);
 
             _sshCommand = new SshCommand(_sessionMock.Object, _commandText, _encoding);
             _sshCommand.BeginExecute();
diff --git a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
index 681672cd..eb81e563 100644
--- a/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
+++ b/src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TUNING</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -26,7 +26,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;TUNING</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>0</WarningLevel>
   </PropertyGroup>
diff --git a/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj b/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
index 3932bdb7..f361b703 100644
--- a/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
+++ b/src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj
@@ -23,24 +23,26 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TUNING;FEATURE_SOCKET_EAP;FEATURE_STREAM_TAP;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;FEATURE_SOCKET_EAP;FEATURE_STREAM_TAP;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Debug\Renci.SshNet.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;TUNING;FEATURE_RNG_CREATE;FEATURE_SOCKET_EAP;FEATURE_SOCKET_POLL;FEATURE_DNS_TAP;FEATURE_STREAM_TAP;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_HASH_MD5;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_REFLECTION_TYPEINFO</DefineConstants>
+    <DefineConstants>TRACE;FEATURE_SOCKET_EAP;FEATURE_STREAM_TAP;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Release\Renci.SshNet.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <PlatformTarget>x86</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TUNING;FEATURE_RNG_CREATE;FEATURE_SOCKET_EAP;FEATURE_SOCKET_POLL;FEATURE_DNS_TAP;FEATURE_STREAM_TAP;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_HASH_MD5;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_REFLECTION_TYPEINFO</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;FEATURE_SOCKET_EAP;FEATURE_STREAM_TAP;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -50,7 +52,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <PlatformTarget>x86</PlatformTarget>
     <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;TUNING;FEATURE_RNG_CREATE;FEATURE_SOCKET_EAP;FEATURE_SOCKET_POLL;FEATURE_DNS_TAP;FEATURE_STREAM_TAP;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_HASH_MD5;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_REFLECTION_TYPEINFO</DefineConstants>
+    <DefineConstants>TRACE;FEATURE_SOCKET_EAP;FEATURE_STREAM_TAP;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -62,7 +64,7 @@
     <PlatformTarget>ARM</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TUNING;FEATURE_SOCKET_EAP;FEATURE_DATAGRAMSOCKET;FEATURE_STREAM_TAP;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;FEATURE_SOCKET_EAP;FEATURE_STREAM_TAP;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>ARM</PlatformTarget>
@@ -72,7 +74,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
     <PlatformTarget>ARM</PlatformTarget>
     <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;TUNING;FEATURE_RNG_CREATE;FEATURE_SOCKET_EAP;FEATURE_SOCKET_POLL;FEATURE_DNS_TAP;FEATURE_STREAM_TAP;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_HASH_MD5;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_REFLECTION_TYPEINFO</DefineConstants>
+    <DefineConstants>TRACE;FEATURE_SOCKET_EAP;FEATURE_STREAM_TAP;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -84,7 +86,7 @@
     <PlatformTarget>x64</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TUNING;FEATURE_RNG_CREATE;FEATURE_SOCKET_EAP;FEATURE_SOCKET_POLL;FEATURE_DNS_TAP;FEATURE_STREAM_TAP;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_HASH_MD5;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_REFLECTION_TYPEINFO</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;FEATURE_SOCKET_EAP;FEATURE_STREAM_TAP;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
@@ -94,7 +96,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <PlatformTarget>x64</PlatformTarget>
     <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;TUNING;FEATURE_RNG_CREATE;FEATURE_SOCKET_EAP;FEATURE_SOCKET_POLL;FEATURE_DNS_TAP;FEATURE_STREAM_TAP;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_HASH_MD5;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_REFLECTION_TYPEINFO</DefineConstants>
+    <DefineConstants>TRACE;FEATURE_SOCKET_EAP;FEATURE_STREAM_TAP;FEATURE_THREAD_TAP;FEATURE_MEMORYSTREAM_TRYGETBUFFER;FEATURE_REFLECTION_TYPEINFO</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
diff --git a/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj b/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
index 14a818d1..b8756dc1 100644
--- a/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
+++ b/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
@@ -23,7 +23,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>Bin\Debug</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WINDOWS_PHONE;TUNING;FEATURE_RNG_CSP;FEATURE_SOCKET_EAP;FEATURE_STREAM_APM;FEATURE_DEVICEINFORMATION_APM;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_HASH_SHA1;FEATURE_HASH_SHA256;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;WINDOWS_PHONE;FEATURE_RNG_CSP;FEATURE_SOCKET_EAP;FEATURE_STREAM_APM;FEATURE_DEVICEINFORMATION_APM;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_HASH_SHA1;FEATURE_HASH_SHA256;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256</DefineConstants>
     <NoStdLib>true</NoStdLib>
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>
@@ -35,7 +35,7 @@
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>Bin\Release</OutputPath>
-    <DefineConstants>TRACE;WINDOWS_PHONE;TUNING;FEATURE_RNG_CSP;FEATURE_SOCKET_EAP;FEATURE_STREAM_APM;FEATURE_DEVICEINFORMATION_APM;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_HASH_SHA1;FEATURE_HASH_SHA256;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256</DefineConstants>
+    <DefineConstants>TRACE;WINDOWS_PHONE;FEATURE_RNG_CSP;FEATURE_SOCKET_EAP;FEATURE_STREAM_APM;FEATURE_DEVICEINFORMATION_APM;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_HASH_SHA1;FEATURE_HASH_SHA256;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256</DefineConstants>
     <NoStdLib>true</NoStdLib>
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>
@@ -928,7 +928,7 @@
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
+      <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Renci.SshNet/BaseClient.cs b/src/Renci.SshNet/BaseClient.cs
index 255589f4..2a08a627 100644
--- a/src/Renci.SshNet/BaseClient.cs
+++ b/src/Renci.SshNet/BaseClient.cs
@@ -313,7 +313,7 @@ namespace Renci.SshNet
         private bool _isDisposed;
 
         /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged ResourceMessages.
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
         public void Dispose()
         {
@@ -324,22 +324,22 @@ namespace Renci.SshNet
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources
         /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged ResourceMessages.</param>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected virtual void Dispose(bool disposing)
         {
-            if (!_isDisposed)
-            {
-                if (disposing)
-                {
-                    Disconnect();
+            if (_isDisposed)
+                return;
 
-                    if (_ownsConnectionInfo && _connectionInfo != null)
-                    {
-                        var connectionInfoDisposable = _connectionInfo as IDisposable;
-                        if (connectionInfoDisposable != null)
-                            connectionInfoDisposable.Dispose();
-                        _connectionInfo = null;
-                    }
+            if (disposing)
+            {
+                Disconnect();
+
+                if (_ownsConnectionInfo && _connectionInfo != null)
+                {
+                    var connectionInfoDisposable = _connectionInfo as IDisposable;
+                    if (connectionInfoDisposable != null)
+                        connectionInfoDisposable.Dispose();
+                    _connectionInfo = null;
                 }
 
                 _isDisposed = true;
@@ -362,9 +362,6 @@ namespace Renci.SshNet
         /// </summary>
         ~BaseClient()
         {
-            // Do not re-create Dispose clean-up code here.
-            // Calling Dispose(false) is optimal in terms of
-            // readability and maintainability.
             Dispose(false);
         }
 
diff --git a/src/Renci.SshNet/Channels/Channel.cs b/src/Renci.SshNet/Channels/Channel.cs
index 322cdde5..b5baea81 100644
--- a/src/Renci.SshNet/Channels/Channel.cs
+++ b/src/Renci.SshNet/Channels/Channel.cs
@@ -292,14 +292,9 @@ namespace Renci.SshNet.Channels
         /// <param name="data">The payload to send.</param>
         public void SendData(byte[] data)
         {
-#if TUNING
             SendData(data, 0, data.Length);
-#else
-            SendMessage(new ChannelDataMessage(RemoteChannelNumber, data));
-#endif
         }
 
-#if TUNING
         /// <summary>
         /// Sends a SSH_MSG_CHANNEL_DATA message with the specified payload.
         /// </summary>
@@ -340,7 +335,6 @@ namespace Renci.SshNet.Channels
                 offset += sizeOfCurrentMessage;
             }
         }
-#endif
 
         /// <summary>
         /// Closes the channel.
@@ -495,55 +489,6 @@ namespace Renci.SshNet.Channels
             _session.SendMessage(message);
         }
 
-#if !TUNING
-        /// <summary>
-        /// Sends channel data message to the servers.
-        /// </summary>
-        /// <param name="message">Channel data message.</param>
-        /// <remarks>
-        /// <para>
-        /// When the data of the message exceeds the maximum packet size or the remote window
-        /// size does not allow the full message to be sent, then this method will send the
-        /// data in multiple chunks and will only wait for the remote window size to be adjusted
-        /// when its zero.
-        /// </para>
-        /// <para>
-        /// This is done to support SSH servers will a small window size that do not agressively
-        /// increase their window size. We need to take into account that there may be SSH
-        /// servers that only increase their window size when it has reached zero.
-        /// </para>
-        /// </remarks>
-        protected void SendMessage(ChannelDataMessage message)
-        {
-            // send channel messages only while channel is open
-            if (!IsOpen)
-                return;
-
-            var totalDataLength = message.Data.Length;
-            var totalDataSent = 0;
-
-            var totalBytesToSend = totalDataLength;
-            while (totalBytesToSend > 0)
-            {
-                var dataThatCanBeSentInMessage = GetDataLengthThatCanBeSentInMessage(totalBytesToSend);
-                if (dataThatCanBeSentInMessage == totalDataLength)
-                {
-                    // we can send the message in one chunk
-                    _session.SendMessage(message);
-                }
-                else
-                {
-                    // we need to send the message in multiple chunks
-                    var dataToSend = new byte[dataThatCanBeSentInMessage];
-                    Array.Copy(message.Data, totalDataSent, dataToSend, 0, dataThatCanBeSentInMessage);
-                    _session.SendMessage(new ChannelDataMessage(message.LocalChannelNumber, dataToSend));
-                }
-                totalDataSent += dataThatCanBeSentInMessage;
-                totalBytesToSend -= dataThatCanBeSentInMessage;
-            }
-        }
-#endif
-
         /// <summary>
         /// Sends a SSH_MSG_CHANNEL_EOF message to the remote server.
         /// </summary>
diff --git a/src/Renci.SshNet/Channels/ChannelDirectTcpip.cs b/src/Renci.SshNet/Channels/ChannelDirectTcpip.cs
index eda03efc..1a659ae5 100644
--- a/src/Renci.SshNet/Channels/ChannelDirectTcpip.cs
+++ b/src/Renci.SshNet/Channels/ChannelDirectTcpip.cs
@@ -94,11 +94,7 @@ namespace Renci.SshNet.Channels
                     var read = SocketAbstraction.ReadPartial(_socket, buffer, 0, buffer.Length, ConnectionInfo.Timeout);
                     if (read > 0)
                     {
-#if TUNING
                         SendData(buffer, 0, read);
-#else
-                        SendMessage(new ChannelDataMessage(RemoteChannelNumber, buffer.Take(read).ToArray()));
-#endif
                     }
                     else
                     {
@@ -183,9 +179,10 @@ namespace Renci.SshNet.Channels
         /// <param name="wait"><c>true</c> to wait for the SSH_MSG_CHANNEL_CLOSE message to be received from the server; otherwise, <c>false</c>.</param>
         protected override void Close(bool wait)
         {
-            if (_forwardedPort != null)
+            var forwardedPort = _forwardedPort;
+            if (forwardedPort != null)
             {
-                _forwardedPort.Closing -= ForwardedPort_Closing;
+                forwardedPort.Closing -= ForwardedPort_Closing;
                 _forwardedPort = null;
             }
 
@@ -313,15 +310,17 @@ namespace Renci.SshNet.Channels
                     }
                 }
 
-                if (_channelOpen != null)
+                var channelOpen = _channelOpen;
+                if (channelOpen != null)
                 {
-                    _channelOpen.Dispose();
+                    channelOpen.Dispose();
                     _channelOpen = null;
                 }
 
-                if (_channelData != null)
+                var channelData = _channelData;
+                if (channelData != null)
                 {
-                    _channelData.Dispose();
+                    channelData.Dispose();
                     _channelData = null;
                 }
             }
diff --git a/src/Renci.SshNet/Channels/ChannelForwardedTcpip.cs b/src/Renci.SshNet/Channels/ChannelForwardedTcpip.cs
index 78815d6e..c9020a1a 100644
--- a/src/Renci.SshNet/Channels/ChannelForwardedTcpip.cs
+++ b/src/Renci.SshNet/Channels/ChannelForwardedTcpip.cs
@@ -80,17 +80,13 @@ namespace Renci.SshNet.Channels
 
             //  Start reading data from the port and send to channel
             while (_socket != null && _socket.Connected)
-                {
+            {
                 try
                 {
                     var read = SocketAbstraction.ReadPartial(_socket, buffer, 0, buffer.Length, ConnectionInfo.Timeout);
                     if (read > 0)
                     {
-#if TUNING
                         SendData(buffer, 0, read);
-#else
-                        SendMessage(new ChannelDataMessage(RemoteChannelNumber, buffer.Take(read).ToArray()));
-#endif
                     }
                     else
                     {
@@ -100,9 +96,7 @@ namespace Renci.SshNet.Channels
                 }
                 catch (SocketException exp)
                 {
-                    if (exp.SocketErrorCode == SocketError.WouldBlock ||
-                        exp.SocketErrorCode == SocketError.IOPending ||
-                        exp.SocketErrorCode == SocketError.NoBufferSpaceAvailable)
+                    if (SocketAbstraction.IsErrorResumable(exp.SocketErrorCode))
                     {
                         // socket buffer is probably empty, wait and try again
                         ThreadAbstraction.Sleep(30);
@@ -151,10 +145,11 @@ namespace Renci.SshNet.Channels
 
             lock (_socketShutdownAndCloseLock)
             {
-                if (_socket == null || !_socket.Connected)
+                var socket = _socket;
+                if (socket == null || !socket.Connected)
                     return;
 
-                _socket.Shutdown(how);
+                socket.Shutdown(how);
             }
         }
 
@@ -168,13 +163,14 @@ namespace Renci.SshNet.Channels
 
             lock (_socketShutdownAndCloseLock)
             {
-                if (_socket == null)
-                    return;
-
-                // closing a socket actually disposes the socket, so we can safely dereference
-                // the field to avoid entering the lock again later
-                _socket.Dispose();
-                _socket = null;
+                var socket = _socket;
+                if (socket != null)
+                {
+                    // closing a socket actually disposes the socket, so we can safely dereference
+                    // the field to avoid entering the lock again later
+                    socket.Dispose();
+                    _socket = null;
+                }
             }
         }
 
@@ -185,9 +181,10 @@ namespace Renci.SshNet.Channels
         /// <param name="wait"><c>true</c> to wait for the SSH_MSG_CHANNEL_CLOSE message to be received from the server; otherwise, <c>false</c>.</param>
         protected override void Close(bool wait)
         {
-            if (_forwardedPort != null)
+            var forwardedPort = _forwardedPort;
+            if (forwardedPort != null)
             {
-                _forwardedPort.Closing -= ForwardedPort_Closing;
+                forwardedPort.Closing -= ForwardedPort_Closing;
                 _forwardedPort = null;
             }
 
@@ -212,27 +209,10 @@ namespace Renci.SshNet.Channels
         {
             base.OnData(data);
 
-            if (_socket != null && _socket.Connected)
-                SocketAbstraction.Send(_socket, data, 0, data.Length);
-        }
-
-        /// <summary>
-        /// Releases unmanaged and - optionally - managed resources
-        /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-        protected override void Dispose(bool disposing)
-        {
-            // make sure we've unsubscribed from all session events and closed the channel
-            // before we starting disposing
-            base.Dispose(disposing);
-
-            if (disposing)
+            var socket = _socket;
+            if (socket != null && socket.Connected)
             {
-                if (_socket != null)
-                {
-                    _socket.Dispose();
-                    _socket = null;
-                }
+                SocketAbstraction.Send(socket, data, 0, data.Length);
             }
         }
     }
diff --git a/src/Renci.SshNet/Channels/ClientChannel.cs b/src/Renci.SshNet/Channels/ClientChannel.cs
index fa02dd10..d84c3e98 100644
--- a/src/Renci.SshNet/Channels/ClientChannel.cs
+++ b/src/Renci.SshNet/Channels/ClientChannel.cs
@@ -26,7 +26,7 @@ namespace Renci.SshNet.Channels
         public event EventHandler<ChannelOpenConfirmedEventArgs> OpenConfirmed;
 
         /// <summary>
-        /// Occurs when <see cref="ChannelOpenFailureMessage"/> message received
+        /// Occurs when <see cref="ChannelOpenFailureMessage"/> message is received.
         /// </summary>
         public event EventHandler<ChannelOpenFailedEventArgs> OpenFailed;
 
@@ -40,7 +40,7 @@ namespace Renci.SshNet.Channels
         {
             InitializeRemoteInfo(remoteChannelNumber, initialWindowSize, maximumPacketSize);
 
-            //  Channel is consider to be open when confirmation message was received
+            // Channel is consider to be open when confirmation message was received
             IsOpen = true;
 
             var openConfirmed = OpenConfirmed;
@@ -83,7 +83,6 @@ namespace Renci.SshNet.Channels
                 {
                     OnChannelException(ex);
                 }
-                
             }
         }
 
diff --git a/src/Renci.SshNet/Channels/IChannel.cs b/src/Renci.SshNet/Channels/IChannel.cs
index 39356e73..49a237a4 100644
--- a/src/Renci.SshNet/Channels/IChannel.cs
+++ b/src/Renci.SshNet/Channels/IChannel.cs
@@ -79,7 +79,6 @@ namespace Renci.SshNet.Channels
         /// <param name="data">The payload to send.</param>
         void SendData(byte[] data);
 
-#if TUNING
         /// <summary>
         /// Sends a SSH_MSG_CHANNEL_DATA message with the specified payload.
         /// </summary>
@@ -99,7 +98,6 @@ namespace Renci.SshNet.Channels
         /// </para>
         /// </remarks>
         void SendData(byte[] data, int offset, int size);
-#endif
 
         /// <summary>
         /// Sends a SSH_MSG_CHANNEL_EOF message to the remote server.
diff --git a/src/Renci.SshNet/Common/BigInteger.cs b/src/Renci.SshNet/Common/BigInteger.cs
index db17545a..d7097586 100644
--- a/src/Renci.SshNet/Common/BigInteger.cs
+++ b/src/Renci.SshNet/Common/BigInteger.cs
@@ -1964,11 +1964,7 @@ namespace Renci.SshNet.Common
             var bytesArray = new byte[bitLength / 8 + (((bitLength % 8) > 0) ? 1 : 0)];
             HashAlgorithmFactory.GenerateRandom(bytesArray);
             bytesArray[bytesArray.Length - 1] = (byte)(bytesArray[bytesArray.Length - 1] & 0x7F);   //  Ensure not a negative value
-#if TUNING
             return new BigInteger(bytesArray);
-#else
-            return new BigInteger(bytesArray.ToArray());
-#endif
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Common/DerData.cs b/src/Renci.SshNet/Common/DerData.cs
index c63556ac..934c6196 100644
--- a/src/Renci.SshNet/Common/DerData.cs
+++ b/src/Renci.SshNet/Common/DerData.cs
@@ -108,11 +108,7 @@ namespace Renci.SshNet.Common
 
             var data = ReadBytes(length);
 
-#if TUNING
             return new BigInteger(data.Reverse());
-#else
-            return new BigInteger(data.Reverse().ToArray());
-#endif
         }
 
         /// <summary>
@@ -175,13 +171,9 @@ namespace Renci.SshNet.Common
         /// <param name="data">BigInteger data to write.</param>
         public void Write(BigInteger data)
         {
-#if TUNING
-            var bytes = data.ToByteArray().Reverse().ToList();
-#else
-            var bytes = data.ToByteArray().Reverse().ToList();
-#endif
+            var bytes = data.ToByteArray().Reverse();
             _data.Add(Integer);
-            var length = GetLength(bytes.Count);
+            var length = GetLength(bytes.Length);
             WriteBytes(length);
             WriteBytes(bytes);
         }
diff --git a/src/Renci.SshNet/Common/Extensions.cs b/src/Renci.SshNet/Common/Extensions.cs
index 66445001..0407da9f 100644
--- a/src/Renci.SshNet/Common/Extensions.cs
+++ b/src/Renci.SshNet/Common/Extensions.cs
@@ -85,14 +85,12 @@ namespace Renci.SshNet.Common
             }
         }
 
-#if TUNING
         internal static BigInteger ToBigInteger(this byte[] data)
         {
             var reversed = new byte[data.Length];
             Buffer.BlockCopy(data, 0, reversed, 0, data.Length);
             return new BigInteger(reversed.Reverse());
         }
-#endif
 
         /// <summary>
         /// Reverses the sequence of the elements in the entire one-dimensional <see cref="Array"/>.
@@ -219,7 +217,7 @@ namespace Renci.SshNet.Common
         /// </summary>
         /// <param name="value">The number to convert.</param>
         /// <returns>An array of bytes with length 2.</returns>
-        internal static byte[] GetBytes(this UInt16 value)
+        internal static byte[] GetBytes(this ushort value)
         {
             return new[] {(byte) (value >> 8), (byte) (value & 0xFF)};
         }
@@ -229,15 +227,11 @@ namespace Renci.SshNet.Common
         /// </summary>
         /// <param name="value">The number to convert.</param>
         /// <returns>An array of bytes with length 4.</returns>
-        internal static byte[] GetBytes(this UInt32 value)
+        internal static byte[] GetBytes(this uint value)
         {
-#if TUNING
             var buffer = new byte[4];
             value.Write(buffer, 0);
             return buffer;
-#else
-            return new[] {(byte) (value >> 24), (byte) (value >> 16), (byte) (value >> 8), (byte) (value & 0xFF)};
-#endif
         }
 
         /// <summary>
@@ -259,7 +253,7 @@ namespace Renci.SshNet.Common
         /// </summary>
         /// <param name="value">The number to convert.</param>
         /// <returns>An array of bytes with length 8.</returns>
-        internal static byte[] GetBytes(this UInt64 value)
+        internal static byte[] GetBytes(this ulong value)
         {
             return new[]
                 {
@@ -273,7 +267,7 @@ namespace Renci.SshNet.Common
         /// </summary>
         /// <param name="value">The number to convert.</param>
         /// <returns>An array of bytes with length 8.</returns>
-        internal static byte[] GetBytes(this Int64 value)
+        internal static byte[] GetBytes(this long value)
         {
             return new[]
                 {
diff --git a/src/Renci.SshNet/Common/SshData.cs b/src/Renci.SshNet/Common/SshData.cs
index 0002845d..2cd2f2bd 100644
--- a/src/Renci.SshNet/Common/SshData.cs
+++ b/src/Renci.SshNet/Common/SshData.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-#if !TUNING
-using System.Linq;
-#endif
 using System.Text;
 
 namespace Renci.SshNet.Common
@@ -17,44 +14,29 @@ namespace Renci.SshNet.Common
         internal static readonly Encoding Ascii = new ASCIIEncoding();
         internal static readonly Encoding Utf8 = Encoding.UTF8;
 
-#if TUNING
         private SshDataStream _stream;
 
         protected SshDataStream DataStream
         {
             get { return _stream; }
         }
-#else
-        /// <summary>
-        /// Data byte array that hold message unencrypted data
-        /// </summary>
-        private List<byte> _data;
-
-        private int _readerIndex;
-#endif
 
         /// <summary>
         /// Gets a value indicating whether all data from the buffer has been read.
         /// </summary>
         /// <value>
-        /// 	<c>true</c> if this instance is end of data; otherwise, <c>false</c>.
+        /// <c>true</c> if this instance is end of data; otherwise, <c>false</c>.
         /// </value>
         protected bool IsEndOfData
         {
             get
             {
-#if TUNING
                 return _stream.Position >= _stream.Length;
-#else
-                return _readerIndex >= _data.Count();
-#endif
             }
         }
 
         private byte[] _loadedData;
-#if TUNING
         private int _offset;
-#endif
 
         /// <summary>
         /// Gets the index that represents zero in current data type.
@@ -70,7 +52,6 @@ namespace Renci.SshNet.Common
             }
         }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -81,34 +62,20 @@ namespace Renci.SshNet.Common
         {
             get { return 0; }
         }
-#endif
 
         /// <summary>
         /// Gets data bytes array
         /// </summary>
         /// <returns>Byte array representation of data structure.</returns>
-        public
-#if !TUNING
-        virtual
-#endif
-        byte[] GetBytes()
+        public byte[] GetBytes()
         {
-#if TUNING
             var messageLength = BufferCapacity;
             var capacity = messageLength != -1 ? messageLength : DefaultCapacity;
             var dataStream = new SshDataStream(capacity);
             WriteBytes(dataStream);
             return dataStream.ToArray();
-#else
-            _data = new List<byte>();
-
-            SaveData();
-
-            return _data.ToArray();
-#endif
         }
 
-#if TUNING
         /// <summary>
         /// Writes the current message to the specified <see cref="SshDataStream"/>.
         /// </summary>
@@ -118,16 +85,11 @@ namespace Renci.SshNet.Common
             _stream = stream;
             SaveData();
         }
-#endif
 
         internal T OfType<T>() where T : SshData, new()
         {
             var result = new T();
-#if TUNING
             result.LoadBytes(_loadedData, _offset);
-#else
-            result.LoadBytes(_loadedData);
-#endif
             result.LoadData();
             return result;
         }
@@ -139,18 +101,9 @@ namespace Renci.SshNet.Common
         /// <exception cref="ArgumentNullException"><paramref name="value"/> is null.</exception>
         public void Load(byte[] value)
         {
-#if TUNING
             Load(value, 0);
-#else
-            if (value == null)
-                throw new ArgumentNullException("value");
-
-            LoadBytes(value);
-            LoadData();
-#endif
         }
 
-#if TUNING
         /// <summary>
         /// Loads data from the specified buffer.
         /// </summary>
@@ -162,7 +115,6 @@ namespace Renci.SshNet.Common
             LoadBytes(value, offset);
             LoadData();
         }
-#endif
 
         /// <summary>
         /// Called when type specific data need to be loaded.
@@ -181,21 +133,9 @@ namespace Renci.SshNet.Common
         /// <exception cref="ArgumentNullException"><paramref name="bytes"/> is null.</exception>
         protected void LoadBytes(byte[] bytes)
         {
-#if TUNING
             LoadBytes(bytes, 0);
-#else
-            // Note about why I check for null here, and in Load(byte[]) in this class.
-            // This method is called by several other classes, such as SshNet.Messages.Message, SshNet.Sftp.SftpMessage.
-            if (bytes == null)
-                throw new ArgumentNullException("bytes");
-
-            ResetReader();
-            _loadedData = bytes;
-            _data = new List<byte>(bytes);
-#endif
         }
 
-#if TUNING
         /// <summary>
         /// Loads data bytes into internal buffer.
         /// </summary>
@@ -213,49 +153,25 @@ namespace Renci.SshNet.Common
             _stream = new SshDataStream(bytes);
             ResetReader();
         }
-#endif
 
         /// <summary>
         /// Resets internal data reader index.
         /// </summary>
         protected void ResetReader()
         {
-#if TUNING
             _stream.Position = ZeroReaderIndex + _offset;
-#else
-            _readerIndex = ZeroReaderIndex;  //  Set to 1 to skip first byte which specifies message type
-#endif
         }
 
-#if !TUNING
-        /// <summary>
-        /// Reads next mpint data type from internal buffer.
-        /// </summary>
-        /// <returns>mpint read.</returns>
-        protected BigInteger ReadBigInt()
-        {
-            var length = this.ReadUInt32();
-            var data = this.ReadBytes((int)length);
-            return new BigInteger(data.Reverse().ToArray());
-        }
-#endif
-
         /// <summary>
         /// Reads all data left in internal buffer at current position.
         /// </summary>
         /// <returns>An array of bytes containing the remaining data in the internal buffer.</returns>
         protected byte[] ReadBytes()
         {
-#if TUNING
             var bytesLength = (int) (_stream.Length - _stream.Position);
             var data = new byte[bytesLength];
             _stream.Read(data, 0, bytesLength);
             return data;
-#else
-            var data = new byte[_data.Count - _readerIndex];
-            _data.CopyTo(_readerIndex, data, 0, data.Length);
-            return data;
-#endif
         }
 
         /// <summary>
@@ -270,7 +186,6 @@ namespace Renci.SshNet.Common
             // For the nerds, the condition translates to: if (length > data.Count && length < int.MaxValue)
             // Which probably would cause all sorts of exception, most notably OutOfMemoryException.
 
-#if TUNING
             var data = new byte[length];
             var bytesRead = _stream.Read(data, 0, length);
 
@@ -278,15 +193,6 @@ namespace Renci.SshNet.Common
                 throw new ArgumentOutOfRangeException("length");
 
             return data;
-#else
-            if (length > _data.Count)
-                throw new ArgumentOutOfRangeException("length");
-
-            var result = new byte[length];
-            _data.CopyTo(_readerIndex, result, 0, length);
-            _readerIndex += length;
-            return result;
-#endif
         }
 
         /// <summary>
@@ -295,14 +201,10 @@ namespace Renci.SshNet.Common
         /// <returns>Byte read.</returns>
         protected byte ReadByte()
         {
-#if TUNING
             var byteRead = _stream.ReadByte();
             if (byteRead == -1)
                 throw new InvalidOperationException("Attempt to read past the end of the SSH data stream.");
             return (byte) byteRead;
-#else
-            return ReadBytes(1).FirstOrDefault();
-#endif
         }
 
         /// <summary>
@@ -344,23 +246,6 @@ namespace Renci.SshNet.Common
             return ((ulong)data[0] << 56 | (ulong)data[1] << 48 | (ulong)data[2] << 40 | (ulong)data[3] << 32 | (ulong)data[4] << 24 | (ulong)data[5] << 16 | (ulong)data[6] << 8 | data[7]);
         }
 
-#if !TUNING
-        /// <summary>
-        /// Reads next string data type from internal buffer.
-        /// </summary>
-        /// <returns>string read</returns>
-        protected string ReadAsciiString()
-        {
-            var length = ReadUInt32();
-
-            if (length > int.MaxValue)
-            {
-                throw new NotSupportedException(string.Format(CultureInfo.CurrentCulture, "Strings longer than {0} is not supported.", int.MaxValue));
-            }
-            return Ascii.GetString(ReadBytes((int)length), 0, (int)length);
-        }
-#endif
-
         /// <summary>
         /// Reads next string data type from internal buffer using the specific encoding.
         /// </summary>
@@ -369,20 +254,9 @@ namespace Renci.SshNet.Common
         /// </returns>
         protected string ReadString(Encoding encoding)
         {
-#if TUNING
             return _stream.ReadString(encoding);
-#else
-            var length = ReadUInt32();
-
-            if (length > int.MaxValue)
-            {
-                throw new NotSupportedException(string.Format(CultureInfo.CurrentCulture, "Strings longer than {0} is not supported.", int.MaxValue));
-            }
-            return encoding.GetString(ReadBytes((int)length), 0, (int)length);
-#endif
         }
 
-#if TUNING
         /// <summary>
         /// Reads next data type as byte array from internal buffer.
         /// </summary>
@@ -393,28 +267,13 @@ namespace Renci.SshNet.Common
         {
             return _stream.ReadBinary();
         }
-#else
-        /// <summary>
-        /// Reads next string data type from internal buffer.
-        /// </summary>
-        /// <returns>string read</returns>
-        protected byte[] ReadBinaryString()
-        {
-            var length = ReadUInt32();
-
-            if (length > int.MaxValue)
-            {
-                throw new NotSupportedException(string.Format(CultureInfo.CurrentCulture, "Strings longer than {0} is not supported.", int.MaxValue));
-            }
-
-            return ReadBytes((int)length);
-        }
-#endif
 
         /// <summary>
         /// Reads next name-list data type from internal buffer.
         /// </summary>
-        /// <returns>String array or read data..</returns>
+        /// <returns>
+        /// String array or read data.
+        /// </returns>
         protected string[] ReadNamesList()
         {
             var namesList = ReadString(Ascii);
@@ -437,7 +296,6 @@ namespace Renci.SshNet.Common
             return result;
         }
 
-#if TUNING
         /// <summary>
         /// Writes bytes array data into internal buffer.
         /// </summary>
@@ -447,19 +305,7 @@ namespace Renci.SshNet.Common
         {
             _stream.Write(data);
         }
-#else
-        /// <summary>
-        /// Writes bytes array data into internal buffer.
-        /// </summary>
-        /// <param name="data">Byte array data to write.</param>
-        /// <exception cref="ArgumentNullException"><paramref name="data"/> is null.</exception>
-        protected void Write(IEnumerable<byte> data)
-        {
-            _data.AddRange(data);
-        }
-#endif
 
-#if TUNING
         /// <summary>
         /// Writes a sequence of bytes to the current SSH data stream and advances the current position
         /// within this stream by the number of bytes written.
@@ -474,71 +320,47 @@ namespace Renci.SshNet.Common
         {
             _stream.Write(buffer, offset, count);
         }
-#endif
 
         /// <summary>
-        /// Writes byte data into internal buffer.
+        /// Writes <see cref="byte"/> data into internal buffer.
         /// </summary>
-        /// <param name="data">Byte data to write.</param>
+        /// <param name="data"><see cref="byte"/> data to write.</param>
         protected void Write(byte data)
         {
-#if TUNING
             _stream.WriteByte(data);
-#else
-            _data.Add(data);
-#endif
         }
 
         /// <summary>
-        /// Writes boolean data into internal buffer.
+        /// Writes <see cref="bool"/> into internal buffer.
         /// </summary>
-        /// <param name="data">Boolean data to write.</param>
+        /// <param name="data"><see cref="bool" /> data to write.</param>
         protected void Write(bool data)
         {
             Write(data ? (byte) 1 : (byte) 0);
         }
 
         /// <summary>
-        /// Writes uint32 data into internal buffer.
+        /// Writes <see cref="uint"/> data into internal buffer.
         /// </summary>
-        /// <param name="data">uint32 data to write.</param>
+        /// <param name="data"><see cref="uint"/> data to write.</param>
         protected void Write(uint data)
         {
-#if TUNING
             _stream.Write(data);
-#else
-            Write(data.GetBytes());
-#endif
         }
 
         /// <summary>
-        /// Writes uint64 data into internal buffer.
+        /// Writes <see cref="ulong" /> data into internal buffer.
         /// </summary>
-        /// <param name="data">uint64 data to write.</param>
+        /// <param name="data"><see cref="ulong"/> data to write.</param>
         protected void Write(ulong data)
         {
-#if TUNING
             _stream.Write(data);
-#else
-            Write(data.GetBytes());
-#endif
         }
 
-#if !TUNING
         /// <summary>
-        ///  Writes  string  data  into  internal  buffer  as  ASCII.
+        /// Writes <see cref="string"/> data into internal buffer using default encoding.
         /// </summary>
-        /// <param name="data">string data to write.</param>
-        protected void WriteAscii(string data)
-        {  
-            Write(data, Ascii);
-        }
-#endif // !TUNING
-
-        /// <summary>
-        /// Writes string data into internal buffer using default encoding.
-        /// </summary>
-        /// <param name="data">string data to write.</param>
+        /// <param name="data"><see cref="string"/> data to write.</param>
         /// <exception cref="ArgumentNullException"><paramref name="data"/> is null.</exception>
         protected void Write(string data)
         {
@@ -546,30 +368,17 @@ namespace Renci.SshNet.Common
         }
 
         /// <summary>
-        /// Writes string data into internal buffer using the specified encoding.
+        /// Writes <see cref="string"/> data into internal buffer using the specified encoding.
         /// </summary>
-        /// <param name="data">string data to write.</param>
+        /// <param name="data"><see cref="string"/> data to write.</param>
         /// <param name="encoding">The character encoding to use.</param>
         /// <exception cref="ArgumentNullException"><paramref name="data"/> is null.</exception>
         /// <exception cref="ArgumentNullException"><paramref name="encoding"/> is null.</exception>
         protected void Write(string data, Encoding encoding)
         {
-#if TUNING
             _stream.Write(data, encoding);
-#else
-            if (data == null)
-                throw new ArgumentNullException("data");
-            if (encoding == null)
-                throw new ArgumentNullException("encoding");
-
-            var bytes = encoding.GetBytes(data);
-
-            Write((uint)bytes.Length);
-            Write(bytes);
-#endif
         }
 
-#if TUNING
         /// <summary>
         /// Writes data into internal buffer.
         /// </summary>
@@ -593,21 +402,6 @@ namespace Renci.SshNet.Common
         {
             _stream.WriteBinary(buffer, offset, count);
         }
-#else
-        /// <summary>
-        /// Writes string data into internal buffer.
-        /// </summary>
-        /// <param name="data">string data to write.</param>
-        /// <exception cref="ArgumentNullException"><paramref name="data"/> is null.</exception>
-        protected void WriteBinaryString(byte[] data)
-        {
-            if (data == null)
-                throw new ArgumentNullException("data");
-
-            Write((uint)data.Length);
-            _data.AddRange(data);
-        }
-#endif
 
         /// <summary>
         /// Writes mpint data into internal buffer.
@@ -615,13 +409,7 @@ namespace Renci.SshNet.Common
         /// <param name="data">mpint data to write.</param>
         protected void Write(BigInteger data)
         {
-#if TUNING
             _stream.Write(data);
-#else
-            var bytes = data.ToByteArray().Reverse().ToList();
-            Write((uint)bytes.Count);
-            Write(bytes);
-#endif
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Common/SshDataStream.cs b/src/Renci.SshNet/Common/SshDataStream.cs
index 8d869f82..7235eac2 100644
--- a/src/Renci.SshNet/Common/SshDataStream.cs
+++ b/src/Renci.SshNet/Common/SshDataStream.cs
@@ -197,7 +197,9 @@ namespace Renci.SshNet.Common
         /// Reads next specified number of bytes data type from internal buffer.
         /// </summary>
         /// <param name="length">Number of bytes to read.</param>
-        /// <returns>An array of bytes that was read from the internal buffer.</returns>
+        /// <returns>
+        /// An array of bytes that was read from the internal buffer.
+        /// </returns>
         /// <exception cref="ArgumentOutOfRangeException"><paramref name="length"/> is greater than the internal buffer size.</exception>
         private byte[] ReadBytes(int length)
         {
diff --git a/src/Renci.SshNet/Compression/Compressor.cs b/src/Renci.SshNet/Compression/Compressor.cs
index 94a4db44..b6773880 100644
--- a/src/Renci.SshNet/Compression/Compressor.cs
+++ b/src/Renci.SshNet/Compression/Compressor.cs
@@ -132,56 +132,49 @@ namespace Renci.SshNet.Compression
         private bool _isDisposed;
 
         /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged ResourceMessages.
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
         public void Dispose()
         {
             Dispose(true);
-
             GC.SuppressFinalize(this);
         }
 
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources
         /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged ResourceMessages.</param>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected virtual void Dispose(bool disposing)
         {
-            // Check to see if Dispose has already been called.
-            if (!_isDisposed)
-            {
-                // If disposing equals true, dispose all managed
-                // and unmanaged ResourceMessages.
-                if (disposing)
-                {
-                    // Dispose managed ResourceMessages.
-                    if (_compressorStream != null)
-                    {
-                        _compressorStream.Dispose();
-                        _compressorStream = null;
-                    }
+            if (_isDisposed)
+                return;
 
-                    if (_decompressorStream != null)
-                    {
-                        _decompressorStream.Dispose();
-                        _decompressorStream = null;
-                    }
+            if (disposing)
+            {
+                var compressorStream = _compressorStream;
+                if (compressorStream != null)
+                {
+                    compressorStream.Dispose();
+                    _compressorStream = null;
+                }
+
+                var decompressorStream = _decompressorStream;
+                if (decompressorStream != null)
+                {
+                    decompressorStream.Dispose();
+                    _decompressorStream = null;
                 }
 
-                // Note disposing has been done.
                 _isDisposed = true;
             }
         }
 
         /// <summary>
-        /// Releases unmanaged resources and performs other cleanup operations before the
-        /// <see cref="SshCommand"/> is reclaimed by garbage collection.
+        /// Releases unmanaged resources and performs other cleanup operations before the <see cref="Compressor"/> is reclaimed
+        /// by garbage collection.
         /// </summary>
         ~Compressor()
         {
-            // Do not re-create Dispose clean-up code here.
-            // Calling Dispose(false) is optimal in terms of
-            // readability and maintainability.
             Dispose(false);
         }
 
diff --git a/src/Renci.SshNet/ForwardedPort.cs b/src/Renci.SshNet/ForwardedPort.cs
index 741d93f9..3f529123 100644
--- a/src/Renci.SshNet/ForwardedPort.cs
+++ b/src/Renci.SshNet/ForwardedPort.cs
@@ -102,7 +102,7 @@ namespace Renci.SshNet
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources
         /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged ResourceMessages.</param>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected virtual void Dispose(bool disposing)
         {
             if (disposing)
diff --git a/src/Renci.SshNet/ForwardedPortDynamic.cs b/src/Renci.SshNet/ForwardedPortDynamic.cs
index 798c89ff..94af2e74 100644
--- a/src/Renci.SshNet/ForwardedPortDynamic.cs
+++ b/src/Renci.SshNet/ForwardedPortDynamic.cs
@@ -113,7 +113,7 @@ namespace Renci.SshNet
         private bool _isDisposed;
 
         /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged ResourceMessages.
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
         public void Dispose()
         {
@@ -126,37 +126,35 @@ namespace Renci.SshNet
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources
         /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged ResourceMessages.</param>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected override void Dispose(bool disposing)
         {
-            if (!_isDisposed)
+            if (_isDisposed)
+                return;
+
+            base.Dispose(disposing);
+
+            if (disposing)
             {
-                base.Dispose(disposing);
-
-                if (disposing)
+                var listenerCompleted = _listenerCompleted;
+                if (listenerCompleted != null)
                 {
-                    if (_listenerCompleted != null)
-                    {
-                        _listenerCompleted.Dispose();
-                        _listenerCompleted = null;
-                    }
+                    listenerCompleted.Dispose();
+                    _listenerCompleted = null;
                 }
-
-                InternalDispose(disposing);
-
-                _isDisposed = true;
             }
+
+            InternalDispose(disposing);
+
+            _isDisposed = true;
         }
 
         /// <summary>
         /// Releases unmanaged resources and performs other cleanup operations before the
-        /// <see cref="ForwardedPortLocal"/> is reclaimed by garbage collection.
+        /// <see cref="ForwardedPortDynamic"/> is reclaimed by garbage collection.
         /// </summary>
         ~ForwardedPortDynamic()
         {
-            // Do not re-create Dispose clean-up code here.
-            // Calling Dispose(false) is optimal in terms of
-            // readability and maintainability.
             Dispose(false);
         }
 
diff --git a/src/Renci.SshNet/ForwardedPortLocal.cs b/src/Renci.SshNet/ForwardedPortLocal.cs
index ccd1194d..22a48c29 100644
--- a/src/Renci.SshNet/ForwardedPortLocal.cs
+++ b/src/Renci.SshNet/ForwardedPortLocal.cs
@@ -168,26 +168,27 @@ namespace Renci.SshNet
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources
         /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged ResourceMessages.</param>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected override void Dispose(bool disposing)
         {
-            if (!_isDisposed)
+            if (_isDisposed)
+                return;
+
+            base.Dispose(disposing);
+
+            if (disposing)
             {
-                base.Dispose(disposing);
-
-                if (disposing)
+                var listenerTaskCompleted = _listenerTaskCompleted;
+                if (listenerTaskCompleted != null)
                 {
-                    if (_listenerTaskCompleted != null)
-                    {
-                        _listenerTaskCompleted.Dispose();
-                        _listenerTaskCompleted = null;
-                    }
+                    listenerTaskCompleted.Dispose();
+                    _listenerTaskCompleted = null;
                 }
-
-                InternalDispose(disposing);
-
-                _isDisposed = true;
             }
+
+            InternalDispose(disposing);
+
+            _isDisposed = true;
         }
 
         /// <summary>
@@ -196,9 +197,6 @@ namespace Renci.SshNet
         /// </summary>
         ~ForwardedPortLocal()
         {
-            // Do not re-create Dispose clean-up code here.
-            // Calling Dispose(false) is optimal in terms of
-            // readability and maintainability.
             Dispose(false);
         }
 
diff --git a/src/Renci.SshNet/ForwardedPortRemote.cs b/src/Renci.SshNet/ForwardedPortRemote.cs
index 4472847d..15ae0c23 100644
--- a/src/Renci.SshNet/ForwardedPortRemote.cs
+++ b/src/Renci.SshNet/ForwardedPortRemote.cs
@@ -298,28 +298,31 @@ namespace Renci.SshNet
         /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected override void Dispose(bool disposing)
         {
-            if (!_isDisposed)
-            {
-                base.Dispose(disposing);
+            if (_isDisposed)
+                return;
 
-                if (disposing)
+            base.Dispose(disposing);
+
+            if (disposing)
+            {
+                var session = Session;
+                if (session != null)
                 {
-                    if (Session != null)
-                    {
-                        Session.RequestSuccessReceived -= Session_RequestSuccess;
-                        Session.RequestFailureReceived -= Session_RequestFailure;
-                        Session.ChannelOpenReceived -= Session_ChannelOpening;
-                        Session = null;
-                    }
-                    if (_globalRequestResponse != null)
-                    {
-                        _globalRequestResponse.Dispose();
-                        _globalRequestResponse = null;
-                    }
+                    session.RequestSuccessReceived -= Session_RequestSuccess;
+                    session.RequestFailureReceived -= Session_RequestFailure;
+                    session.ChannelOpenReceived -= Session_ChannelOpening;
+                    Session = null;
                 }
 
-                _isDisposed = true;
+                var globalRequestResponse = _globalRequestResponse;
+                if (globalRequestResponse != null)
+                {
+                    globalRequestResponse.Dispose();
+                    _globalRequestResponse = null;
+                }
             }
+
+            _isDisposed = true;
         }
 
         /// <summary>
@@ -328,9 +331,6 @@ namespace Renci.SshNet
         /// </summary>
         ~ForwardedPortRemote()
         {
-            // Do not re-create Dispose clean-up code here.
-            // Calling Dispose(false) is optimal in terms of
-            // readability and maintainability.
             Dispose(false);
         }
 
diff --git a/src/Renci.SshNet/KeyboardInteractiveAuthenticationMethod.cs b/src/Renci.SshNet/KeyboardInteractiveAuthenticationMethod.cs
index bf56f352..591111bf 100644
--- a/src/Renci.SshNet/KeyboardInteractiveAuthenticationMethod.cs
+++ b/src/Renci.SshNet/KeyboardInteractiveAuthenticationMethod.cs
@@ -156,9 +156,10 @@ namespace Renci.SshNet
 
             if (disposing)
             {
-                if (_authenticationCompleted != null)
+                var authenticationCompleted = _authenticationCompleted;
+                if (authenticationCompleted != null)
                 {
-                    _authenticationCompleted.Dispose();
+                    authenticationCompleted.Dispose();
                     _authenticationCompleted = null;
                 }
 
@@ -168,13 +169,10 @@ namespace Renci.SshNet
 
         /// <summary>
         /// Releases unmanaged resources and performs other cleanup operations before the
-        /// <see cref="PasswordConnectionInfo"/> is reclaimed by garbage collection.
+        /// <see cref="KeyboardInteractiveAuthenticationMethod"/> is reclaimed by garbage collection.
         /// </summary>
         ~KeyboardInteractiveAuthenticationMethod()
         {
-            // Do not re-create Dispose clean-up code here.
-            // Calling Dispose(false) is optimal in terms of
-            // readability and maintainability.
             Dispose(false);
         }
 
diff --git a/src/Renci.SshNet/KeyboardInteractiveConnectionInfo.cs b/src/Renci.SshNet/KeyboardInteractiveConnectionInfo.cs
index a14bcc4a..47fe8588 100644
--- a/src/Renci.SshNet/KeyboardInteractiveConnectionInfo.cs
+++ b/src/Renci.SshNet/KeyboardInteractiveConnectionInfo.cs
@@ -184,13 +184,10 @@ namespace Renci.SshNet
 
         /// <summary>
         /// Releases unmanaged resources and performs other cleanup operations before the
-        /// <see cref="PasswordConnectionInfo"/> is reclaimed by garbage collection.
+        /// <see cref="KeyboardInteractiveConnectionInfo"/> is reclaimed by garbage collection.
         /// </summary>
         ~KeyboardInteractiveConnectionInfo()
         {
-            // Do not re-create Dispose clean-up code here.
-            // Calling Dispose(false) is optimal in terms of
-            // readability and maintainability.
             Dispose(false);
         }
 
diff --git a/src/Renci.SshNet/Messages/Authentication/BannerMessage.cs b/src/Renci.SshNet/Messages/Authentication/BannerMessage.cs
index 338b5fe6..1432ef09 100644
--- a/src/Renci.SshNet/Messages/Authentication/BannerMessage.cs
+++ b/src/Renci.SshNet/Messages/Authentication/BannerMessage.cs
@@ -6,36 +6,25 @@
     [Message("SSH_MSG_USERAUTH_BANNER", 53)]
     public class BannerMessage : Message
     {
-#if TUNING
         private byte[] _message;
         private byte[] _language;
-#endif
 
         /// <summary>
         /// Gets banner message.
         /// </summary>
-#if TUNING
         public string Message
         {
             get { return Utf8.GetString(_message, 0, _message.Length); }
         }
-#else
-        public string Message { get; private set; }
-#endif
 
         /// <summary>
         /// Gets banner language.
         /// </summary>
-#if TUNING
         public string Language
         {
             get { return Utf8.GetString(_language, 0, _language.Length); }
         }
-#else
-        public string Language { get; private set; }
-#endif
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -54,20 +43,14 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Called when type specific data need to be loaded.
         /// </summary>
         protected override void LoadData()
         {
-#if TUNING
             _message = ReadBinary();
             _language = ReadBinary();
-#else
-            Message = ReadString();
-            Language = ReadString();
-#endif
         }
 
         /// <summary>
@@ -75,13 +58,8 @@
         /// </summary>
         protected override void SaveData()
         {
-#if TUNING
             WriteBinaryString(_message);
             WriteBinaryString(_language);
-#else
-            Write(Message);
-            Write(Language);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Messages/Authentication/InformationResponseMessage.cs b/src/Renci.SshNet/Messages/Authentication/InformationResponseMessage.cs
index 41a5f866..cd102b96 100644
--- a/src/Renci.SshNet/Messages/Authentication/InformationResponseMessage.cs
+++ b/src/Renci.SshNet/Messages/Authentication/InformationResponseMessage.cs
@@ -14,7 +14,6 @@ namespace Renci.SshNet.Messages.Authentication
         /// </summary>
         public IList<string> Responses { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -26,7 +25,6 @@ namespace Renci.SshNet.Messages.Authentication
         {
             get { return -1; }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="InformationResponseMessage"/> class.
diff --git a/src/Renci.SshNet/Messages/Authentication/PasswordChangeRequiredMessage.cs b/src/Renci.SshNet/Messages/Authentication/PasswordChangeRequiredMessage.cs
index 24a4e449..994dc54f 100644
--- a/src/Renci.SshNet/Messages/Authentication/PasswordChangeRequiredMessage.cs
+++ b/src/Renci.SshNet/Messages/Authentication/PasswordChangeRequiredMessage.cs
@@ -6,32 +6,16 @@
     [Message("SSH_MSG_USERAUTH_PASSWD_CHANGEREQ", 60)]
     internal class PasswordChangeRequiredMessage : Message
     {
-#if TUNING
         /// <summary>
         /// Gets password change request message as UTF-8 encoded byte array.
         /// </summary>
         public byte[] Message { get; private set; }
-#else
-        /// <summary>
-        /// Gets password change request message.
-        /// </summary>
-        public string Message { get; private set; }
-#endif
 
-
-#if TUNING
         /// <summary>
         /// Gets message language as UTF-8 encoded byte array.
         /// </summary>
         public byte[] Language { get; private set; }
-#else
-        /// <summary>
-        /// Gets message language.
-        /// </summary>
-        public string Language { get; private set; }
-#endif
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -50,20 +34,14 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Called when type specific data need to be loaded.
         /// </summary>
         protected override void LoadData()
         {
-#if TUNING
             Message = ReadBinary();
             Language = ReadBinary();
-#else
-            Message = ReadString();
-            Language = ReadString();
-#endif
         }
 
         /// <summary>
@@ -71,13 +49,8 @@
         /// </summary>
         protected override void SaveData()
         {
-#if TUNING
             WriteBinaryString(Message);
             WriteBinaryString(Language);
-#else
-            Write(Message);
-            Write(Language);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Messages/Authentication/PublicKeyMessage.cs b/src/Renci.SshNet/Messages/Authentication/PublicKeyMessage.cs
index 4b44c9a7..a81b7bf6 100644
--- a/src/Renci.SshNet/Messages/Authentication/PublicKeyMessage.cs
+++ b/src/Renci.SshNet/Messages/Authentication/PublicKeyMessage.cs
@@ -6,7 +6,6 @@
     [Message("SSH_MSG_USERAUTH_PK_OK", 60)]
     internal class PublicKeyMessage : Message
     {
-#if TUNING
         /// <summary>
         /// Gets the name of the public key algorithm as ASCII encoded byte array.
         /// </summary>
@@ -14,22 +13,12 @@
         /// The name of the public key algorithm.
         /// </value>
         public byte[] PublicKeyAlgorithmName { get; private set; }
-#else
-        /// <summary>
-        /// Gets the name of the public key algorithm.
-        /// </summary>
-        /// <value>
-        /// The name of the public key algorithm.
-        /// </value>
-        public string PublicKeyAlgorithmName { get; private set; }
-#endif
 
         /// <summary>
         /// Gets the public key data.
         /// </summary>
         public byte[] PublicKeyData { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -48,20 +37,14 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Called when type specific data need to be loaded.
         /// </summary>
         protected override void LoadData()
         {
-#if TUNING
             PublicKeyAlgorithmName = ReadBinary();
             PublicKeyData = ReadBinary();
-#else
-            PublicKeyAlgorithmName = ReadAsciiString();
-            PublicKeyData = ReadBinaryString();
-#endif
         }
 
         /// <summary>
@@ -69,13 +52,8 @@
         /// </summary>
         protected override void SaveData()
         {
-#if TUNING
             WriteBinaryString(PublicKeyAlgorithmName);
             WriteBinaryString(PublicKeyData);
-#else
-            WriteAscii(PublicKeyAlgorithmName);
-            WriteBinaryString(PublicKeyData);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Messages/Authentication/RequestMessage.cs b/src/Renci.SshNet/Messages/Authentication/RequestMessage.cs
index d3d18a99..b13b2094 100644
--- a/src/Renci.SshNet/Messages/Authentication/RequestMessage.cs
+++ b/src/Renci.SshNet/Messages/Authentication/RequestMessage.cs
@@ -49,7 +49,6 @@ namespace Renci.SshNet.Messages.Authentication
             get { return _methodName; }
         }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -70,7 +69,6 @@ namespace Renci.SshNet.Messages.Authentication
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessage"/> class.
diff --git a/src/Renci.SshNet/Messages/Authentication/RequestMessageHost.cs b/src/Renci.SshNet/Messages/Authentication/RequestMessageHost.cs
index abc94797..39779fad 100644
--- a/src/Renci.SshNet/Messages/Authentication/RequestMessageHost.cs
+++ b/src/Renci.SshNet/Messages/Authentication/RequestMessageHost.cs
@@ -42,7 +42,6 @@
         /// </value>
         public byte[] Signature { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -67,7 +66,6 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageHost"/> class.
diff --git a/src/Renci.SshNet/Messages/Authentication/RequestMessageKeyboardInteractive.cs b/src/Renci.SshNet/Messages/Authentication/RequestMessageKeyboardInteractive.cs
index 8aa7c678..1f7c2f61 100644
--- a/src/Renci.SshNet/Messages/Authentication/RequestMessageKeyboardInteractive.cs
+++ b/src/Renci.SshNet/Messages/Authentication/RequestMessageKeyboardInteractive.cs
@@ -15,7 +15,6 @@
         /// </summary>
         public byte[] SubMethods { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -34,7 +33,6 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageKeyboardInteractive"/> class.
diff --git a/src/Renci.SshNet/Messages/Authentication/RequestMessagePassword.cs b/src/Renci.SshNet/Messages/Authentication/RequestMessagePassword.cs
index fe2e8c20..9745e800 100644
--- a/src/Renci.SshNet/Messages/Authentication/RequestMessagePassword.cs
+++ b/src/Renci.SshNet/Messages/Authentication/RequestMessagePassword.cs
@@ -15,7 +15,6 @@
         /// </summary>
         public byte[] NewPassword { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -40,7 +39,6 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessagePassword"/> class.
diff --git a/src/Renci.SshNet/Messages/Authentication/RequestMessagePublicKey.cs b/src/Renci.SshNet/Messages/Authentication/RequestMessagePublicKey.cs
index dd88c5e9..07f1271a 100644
--- a/src/Renci.SshNet/Messages/Authentication/RequestMessagePublicKey.cs
+++ b/src/Renci.SshNet/Messages/Authentication/RequestMessagePublicKey.cs
@@ -26,7 +26,6 @@
         /// </value>
         public byte[] Signature { get; set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -53,7 +52,6 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessagePublicKey"/> class.
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelDataMessage.cs b/src/Renci.SshNet/Messages/Connection/ChannelDataMessage.cs
index c45a9b4a..206696be 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelDataMessage.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelDataMessage.cs
@@ -10,7 +10,6 @@ namespace Renci.SshNet.Messages.Connection
     {
         internal const byte MessageNumber = 94;
 
-#if TUNING
         /// <summary>
         /// Gets or sets message data.
         /// </summary>
@@ -21,17 +20,7 @@ namespace Renci.SshNet.Messages.Connection
         /// The actual data to read or write depends on the <see cref="Offset"/> and <see cref="Size"/>.
         /// </remarks>
         public byte[] Data { get; private set; }
-#else
-        /// <summary>
-        /// Gets or sets message data.
-        /// </summary>
-        /// <value>
-        /// The data.
-        /// </value>
-        public byte[] Data { get; protected set; }
-#endif
 
-#if TUNING
         /// <summary>
         /// Gets the zero-based offset in <see cref="Data"/> at which the data begins.
         /// </summary>
@@ -64,7 +53,6 @@ namespace Renci.SshNet.Messages.Connection
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ChannelDataMessage"/> class.
@@ -85,13 +73,10 @@ namespace Renci.SshNet.Messages.Connection
                 throw new ArgumentNullException("data");
 
             Data = data;
-#if TUNING
             Offset = 0;
             Size = data.Length;
-#endif
         }
 
-#if TUNING
         /// <summary>
         /// Initializes a new instance of the <see cref="ChannelDataMessage"/> class.
         /// </summary>
@@ -109,7 +94,6 @@ namespace Renci.SshNet.Messages.Connection
             Offset = offset;
             Size = size;
         }
-#endif
 
         /// <summary>
         /// Loads the data.
@@ -117,13 +101,9 @@ namespace Renci.SshNet.Messages.Connection
         protected override void LoadData()
         {
             base.LoadData();
-#if TUNING
             Data = ReadBinary();
             Offset = 0;
             Size = Data.Length;
-#else
-            Data = ReadBinaryString();
-#endif
         }
 
         /// <summary>
@@ -132,11 +112,7 @@ namespace Renci.SshNet.Messages.Connection
         protected override void SaveData()
         {
             base.SaveData();
-#if TUNING
             WriteBinary(Data, Offset, Size);
-#else
-            WriteBinaryString(Data);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelExtendedDataMessage.cs b/src/Renci.SshNet/Messages/Connection/ChannelExtendedDataMessage.cs
index 4bb5c695..8a610b4d 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelExtendedDataMessage.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelExtendedDataMessage.cs
@@ -16,7 +16,6 @@
         /// </summary>
         public byte[] Data { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -34,14 +33,12 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ChannelExtendedDataMessage"/> class.
         /// </summary>
         public ChannelExtendedDataMessage()
         {
-
         }
 
         /// <summary>
@@ -64,11 +61,7 @@
         {
             base.LoadData();
             DataTypeCode = ReadUInt32();
-#if TUNING
             Data = ReadBinary();
-#else
-            Data = ReadBinaryString();
-#endif
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelMessage.cs b/src/Renci.SshNet/Messages/Connection/ChannelMessage.cs
index 36c85cdb..95fa3b2f 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelMessage.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelMessage.cs
@@ -15,7 +15,6 @@ namespace Renci.SshNet.Messages.Connection
         /// </value>
         public uint LocalChannelNumber { get; protected set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -31,7 +30,6 @@ namespace Renci.SshNet.Messages.Connection
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new <see cref="ChannelMessage"/>.
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelOpen/ChannelOpenMessage.cs b/src/Renci.SshNet/Messages/Connection/ChannelOpen/ChannelOpenMessage.cs
index 3a3b9d13..add9c5bb 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelOpen/ChannelOpenMessage.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelOpen/ChannelOpenMessage.cs
@@ -11,7 +11,6 @@ namespace Renci.SshNet.Messages.Connection
     {
         internal const byte MessageNumber = 90;
 
-#if TUNING
         private byte[] _infoBytes;
 
         /// <summary>
@@ -21,21 +20,6 @@ namespace Renci.SshNet.Messages.Connection
         /// The type of the channel.
         /// </value>
         public byte[] ChannelType { get; private set; }
-#else
-        /// <summary>
-        /// Gets the type of the channel.
-        /// </summary>
-        /// <value>
-        /// The type of the channel.
-        /// </value>
-        public string ChannelType
-        {
-            get
-            {
-                return Info.ChannelType;
-            }
-        }
-#endif
 
         /// <summary>
         /// Gets or sets the local channel number.
@@ -66,7 +50,6 @@ namespace Renci.SshNet.Messages.Connection
         /// </summary>
         public ChannelOpenInfo Info { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -87,7 +70,6 @@ namespace Renci.SshNet.Messages.Connection
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ChannelOpenMessage"/> class.
@@ -110,16 +92,12 @@ namespace Renci.SshNet.Messages.Connection
             if (info == null)
                 throw new ArgumentNullException("info");
 
-#if TUNING
             ChannelType = Ascii.GetBytes(info.ChannelType);
-#endif
             LocalChannelNumber = channelNumber;
             InitialWindowSize = initialWindowSize;
             MaximumPacketSize = maximumPacketSize;
             Info = info;
-#if TUNING
             _infoBytes = info.GetBytes();
-#endif
         }
 
         /// <summary>
@@ -127,21 +105,13 @@ namespace Renci.SshNet.Messages.Connection
         /// </summary>
         protected override void LoadData()
         {
-#if TUNING
             ChannelType = ReadBinary();
-#else
-            var channelName = ReadAsciiString();
-#endif
             LocalChannelNumber = ReadUInt32();
             InitialWindowSize = ReadUInt32();
             MaximumPacketSize = ReadUInt32();
-#if TUNING
             _infoBytes = ReadBytes();
 
             var channelName = Ascii.GetString(ChannelType, 0, ChannelType.Length);
-#else
-            var _infoBytes = ReadBytes();
-#endif
 
             switch (channelName)
             {
@@ -167,19 +137,11 @@ namespace Renci.SshNet.Messages.Connection
         /// </summary>
         protected override void SaveData()
         {
-#if TUNING
             WriteBinaryString(ChannelType);
-#else
-            WriteAscii(ChannelType);
-#endif
             Write(LocalChannelNumber);
             Write(InitialWindowSize);
             Write(MaximumPacketSize);
-#if TUNING
             Write(_infoBytes);
-#else
-            Write(Info.GetBytes());
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelOpen/DirectTcpipChannelInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelOpen/DirectTcpipChannelInfo.cs
index 26bc1ba5..199a8d05 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelOpen/DirectTcpipChannelInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelOpen/DirectTcpipChannelInfo.cs
@@ -7,10 +7,8 @@ namespace Renci.SshNet.Messages.Connection
     /// </summary>
     internal class DirectTcpipChannelInfo : ChannelOpenInfo
     {
-#if TUNING
         private byte[] _hostToConnect;
         private byte[] _originatorAddress;
-#endif
 
         /// <summary>
         /// Specifies channel open type
@@ -31,15 +29,11 @@ namespace Renci.SshNet.Messages.Connection
         /// <summary>
         /// Gets the host to connect.
         /// </summary>
-#if TUNING
         public string HostToConnect
         {
             get { return Utf8.GetString(_hostToConnect, 0, _hostToConnect.Length); }
             private set { _hostToConnect = Utf8.GetBytes(value); }
         }
-#else
-        public string HostToConnect { get; private set; }
-#endif
 
         /// <summary>
         /// Gets the port to connect.
@@ -49,22 +43,17 @@ namespace Renci.SshNet.Messages.Connection
         /// <summary>
         /// Gets the originator address.
         /// </summary>
-#if TUNING
         public string OriginatorAddress
         {
             get { return Utf8.GetString(_originatorAddress, 0, _originatorAddress.Length); }
             private set { _originatorAddress = Utf8.GetBytes(value); }
         }
-#else
-        public string OriginatorAddress { get; private set; }
-#endif
 
         /// <summary>
         /// Gets the originator port.
         /// </summary>
         public uint OriginatorPort { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -85,7 +74,6 @@ namespace Renci.SshNet.Messages.Connection
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DirectTcpipChannelInfo"/> class from the
@@ -119,17 +107,9 @@ namespace Renci.SshNet.Messages.Connection
         {
             base.LoadData();
 
-#if TUNING
             _hostToConnect = ReadBinary();
-#else
-            HostToConnect = ReadString();
-#endif
             PortToConnect = ReadUInt32();
-#if TUNING
             _originatorAddress = ReadBinary();
-#else
-            OriginatorAddress = ReadString();
-#endif
             OriginatorPort = ReadUInt32();
         }
 
@@ -140,17 +120,9 @@ namespace Renci.SshNet.Messages.Connection
         {
             base.SaveData();
 
-#if TUNING
             WriteBinaryString(_hostToConnect);
-#else
-            Write(HostToConnect);
-#endif
             Write(PortToConnect);
-#if TUNING
             WriteBinaryString(_originatorAddress);
-#else
-            Write(OriginatorAddress);
-#endif
             Write(OriginatorPort);
         }
     }
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelOpen/ForwardedTcpipChannelInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelOpen/ForwardedTcpipChannelInfo.cs
index 706690e0..bc3d1177 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelOpen/ForwardedTcpipChannelInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelOpen/ForwardedTcpipChannelInfo.cs
@@ -7,10 +7,8 @@ namespace Renci.SshNet.Messages.Connection
     /// </summary>
     internal class ForwardedTcpipChannelInfo : ChannelOpenInfo
     {
-#if TUNING
         private byte[] _connectedAddress;
         private byte[] _originatorAddress;
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ForwardedTcpipChannelInfo"/> class from the
@@ -53,15 +51,11 @@ namespace Renci.SshNet.Messages.Connection
         /// <summary>
         /// Gets the connected address.
         /// </summary>
-#if TUNING
         public string ConnectedAddress
         {
             get { return Utf8.GetString(_connectedAddress, 0, _connectedAddress.Length); }
             private set { _connectedAddress = Utf8.GetBytes(value); }
         }
-#else
-        public string ConnectedAddress { get; private set; }
-#endif
 
         /// <summary>
         /// Gets the connected port.
@@ -71,22 +65,17 @@ namespace Renci.SshNet.Messages.Connection
         /// <summary>
         /// Gets the originator address.
         /// </summary>
-#if TUNING
         public string OriginatorAddress
         {
             get { return Utf8.GetString(_originatorAddress, 0, _originatorAddress.Length); }
             private set { _originatorAddress = Utf8.GetBytes(value); }
         }
-#else
-        public string OriginatorAddress { get; private set; }
-#endif
 
         /// <summary>
         /// Gets the originator port.
         /// </summary>
         public uint OriginatorPort { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -107,7 +96,6 @@ namespace Renci.SshNet.Messages.Connection
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Called when type specific data need to be loaded.
@@ -116,17 +104,9 @@ namespace Renci.SshNet.Messages.Connection
         {
             base.LoadData();
 
-#if TUNING
             _connectedAddress = ReadBinary();
-#else
-            ConnectedAddress = ReadString();
-#endif
             ConnectedPort = ReadUInt32();
-#if TUNING
             _originatorAddress = ReadBinary();
-#else
-            OriginatorAddress = ReadString();
-#endif
             OriginatorPort = ReadUInt32();
         }
 
@@ -137,17 +117,9 @@ namespace Renci.SshNet.Messages.Connection
         {
             base.SaveData();
 
-#if TUNING
             WriteBinaryString(_connectedAddress);
-#else
-            Write(ConnectedAddress);
-#endif
             Write(ConnectedPort);
-#if TUNING
             WriteBinaryString(_originatorAddress);
-#else
-            Write(OriginatorAddress);
-#endif
             Write(OriginatorPort);
         }
     }
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelOpen/X11ChannelOpenInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelOpen/X11ChannelOpenInfo.cs
index ca638145..efa280a4 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelOpen/X11ChannelOpenInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelOpen/X11ChannelOpenInfo.cs
@@ -7,9 +7,7 @@ namespace Renci.SshNet.Messages.Connection
     /// </summary>
     internal class X11ChannelOpenInfo : ChannelOpenInfo
     {
-#if TUNING
         private byte[] _originatorAddress;
-#endif
 
         /// <summary>
         /// Specifies channel open type
@@ -30,22 +28,17 @@ namespace Renci.SshNet.Messages.Connection
         /// <summary>
         /// Gets the originator address.
         /// </summary>
-#if TUNING
         public string OriginatorAddress
         {
             get { return Utf8.GetString(_originatorAddress, 0, _originatorAddress.Length); }
             private set { _originatorAddress = Utf8.GetBytes(value); }
         }
-#else
-        public string OriginatorAddress { get; private set; }
-#endif
 
         /// <summary>
         /// Gets the originator port.
         /// </summary>
         public uint OriginatorPort { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -63,7 +56,6 @@ namespace Renci.SshNet.Messages.Connection
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="X11ChannelOpenInfo"/> class from the
@@ -94,11 +86,7 @@ namespace Renci.SshNet.Messages.Connection
         {
             base.LoadData();
 
-#if TUNING
             _originatorAddress = ReadBinary();
-#else
-            OriginatorAddress = ReadString();
-#endif
             OriginatorPort = ReadUInt32();
         }
 
@@ -109,11 +97,7 @@ namespace Renci.SshNet.Messages.Connection
         {
             base.SaveData();
 
-#if TUNING
             WriteBinaryString(_originatorAddress);
-#else
-            Write(OriginatorAddress);
-#endif
             Write(OriginatorPort);
         }
     }
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelOpenConfirmationMessage.cs b/src/Renci.SshNet/Messages/Connection/ChannelOpenConfirmationMessage.cs
index 37b6b66b..f52e0d1c 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelOpenConfirmationMessage.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelOpenConfirmationMessage.cs
@@ -27,7 +27,6 @@
         /// </value>
         public uint MaximumPacketSize { get; private set; }
 
-#if TUNING
         protected override int BufferCapacity
         {
             get
@@ -39,7 +38,6 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ChannelOpenConfirmationMessage"/> class.
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelOpenFailureMessage.cs b/src/Renci.SshNet/Messages/Connection/ChannelOpenFailureMessage.cs
index 599ea5b3..5f8201a4 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelOpenFailureMessage.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelOpenFailureMessage.cs
@@ -11,10 +11,8 @@
         internal const uint UnknownChannelType = 3;
         internal const uint ResourceShortage = 4;
 
-#if TUNING
         private byte[] _description;
         private byte[] _language;
-#endif
 
         /// <summary>
         /// Gets failure reason code.
@@ -24,30 +22,21 @@
         /// <summary>
         /// Gets description for failure.
         /// </summary>
-#if TUNING
         public string Description
         {
             get { return Utf8.GetString(_description, 0, _description.Length); }
             private set { _description = Utf8.GetBytes(value); }
         }
-#else
-        public string Description { get; private set; }
-#endif
 
         /// <summary>
         /// Gets message language.
         /// </summary>
-#if TUNING
         public string Language
         {
             get { return Utf8.GetString(_language, 0, _language.Length); }
             private set { _language = Utf8.GetBytes(value); }
         }
-#else
-        public string Language { get; private set; }
-#endif
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -67,7 +56,6 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ChannelOpenFailureMessage"/> class.
@@ -110,13 +98,8 @@
         {
             base.LoadData();
             ReasonCode = ReadUInt32();
-#if TUNING
             _description = ReadBinary();
             _language = ReadBinary();
-#else
-            Description = ReadString();
-            Language = ReadString();
-#endif
         }
 
         /// <summary>
@@ -126,13 +109,8 @@
         {
             base.SaveData();
             Write(ReasonCode);
-#if TUNING
             WriteBinaryString(_description);
             WriteBinaryString(_language);
-#else
-            Write(Description ?? string.Empty);
-            Write(Language ?? "en");
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/BreakRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/BreakRequestInfo.cs
index 79733b7c..5bbef290 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/BreakRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/BreakRequestInfo.cs
@@ -28,7 +28,6 @@ namespace Renci.SshNet.Messages.Connection
         /// </summary>
         public UInt32 BreakLength { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -44,7 +43,6 @@ namespace Renci.SshNet.Messages.Connection
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ExecRequestInfo"/> class.
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/ChannelRequestMessage.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/ChannelRequestMessage.cs
index 047125f6..424920af 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/ChannelRequestMessage.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/ChannelRequestMessage.cs
@@ -6,10 +6,8 @@
     [Message("SSH_MSG_CHANNEL_REQUEST", 98)]
     public class ChannelRequestMessage : ChannelMessage
     {
-#if TUNING
         private string _requestName;
         private byte[] _requestNameBytes;
-#endif
 
         /// <summary>
         /// Gets the name of the request.
@@ -17,7 +15,6 @@
         /// <value>
         /// The name of the request.
         /// </value>
-#if TUNING
         public string RequestName
         {
             get { return _requestName; }
@@ -27,16 +24,12 @@
                 _requestNameBytes = Ascii.GetBytes(value);
             }
         }
-#else
-        public string RequestName { get; private set; }
-#endif
 
         /// <summary>
         /// Gets channel request data.
         /// </summary>
         public byte[] RequestData { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -54,7 +47,6 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ChannelRequestMessage"/> class.
@@ -83,12 +75,8 @@
         {
             base.LoadData();
 
-#if TUNING
             _requestNameBytes = ReadBinary();
             _requestName = Ascii.GetString(_requestNameBytes, 0, _requestNameBytes.Length);
-#else
-            RequestName = ReadAsciiString();
-#endif
             RequestData = ReadBytes();
         }
 
@@ -99,11 +87,7 @@
         {
             base.SaveData();
 
-#if TUNING
             WriteBinaryString(_requestNameBytes);
-#else
-            WriteAscii(RequestName);
-#endif
             Write(RequestData);
         }
     }
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/EnvironmentVariableRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/EnvironmentVariableRequestInfo.cs
index 07c0ad98..68b3236a 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/EnvironmentVariableRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/EnvironmentVariableRequestInfo.cs
@@ -5,10 +5,8 @@
     /// </summary>
     internal class EnvironmentVariableRequestInfo : RequestInfo
     {
-#if TUNING
         private byte[] _variableName;
         private byte[] _variableValue;
-#endif
 
         /// <summary>
         /// Channel request name
@@ -32,14 +30,10 @@
         /// <value>
         /// The name of the variable.
         /// </value>
-#if TUNING
         public string VariableName
         {
             get { return Utf8.GetString(_variableName, 0, _variableName.Length); }
         }
-#else
-        public string VariableName { get; set; }
-#endif
 
         /// <summary>
         /// Gets or sets the variable value.
@@ -47,16 +41,11 @@
         /// <value>
         /// The variable value.
         /// </value>
-#if TUNING
         public string VariableValue
         {
             get { return Utf8.GetString(_variableValue, 0, _variableValue.Length); }
         }
-#else
-        public string VariableValue { get; set; }
-#endif
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -75,7 +64,6 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="EnvironmentVariableRequestInfo"/> class.
@@ -93,13 +81,8 @@
         public EnvironmentVariableRequestInfo(string variableName, string variableValue)
             : this()
         {
-#if TUNING
             _variableName = Utf8.GetBytes(variableName);
             _variableValue = Utf8.GetBytes(variableValue);
-#else
-            VariableName = variableName;
-            VariableValue = variableValue;
-#endif
         }
 
         /// <summary>
@@ -109,13 +92,8 @@
         {
             base.LoadData();
 
-#if TUNING
             _variableName = ReadBinary();
             _variableValue = ReadBinary();
-#else
-            VariableName = ReadString();
-            VariableValue = ReadString();
-#endif
         }
 
         /// <summary>
@@ -125,13 +103,8 @@
         {
             base.SaveData();
 
-#if TUNING
             WriteBinaryString(_variableName);
             WriteBinaryString(_variableValue);
-#else
-            Write(VariableName);
-            Write(VariableValue);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExecRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExecRequestInfo.cs
index 3d1fdbb6..9aef09b7 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExecRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExecRequestInfo.cs
@@ -8,9 +8,7 @@ namespace Renci.SshNet.Messages.Connection
     /// </summary>
     internal class ExecRequestInfo : RequestInfo
     {
-#if TUNING
         private byte[] _command;
-#endif
 
         /// <summary>
         /// Channel request name
@@ -34,14 +32,10 @@ namespace Renci.SshNet.Messages.Connection
         /// <value>
         /// The command.
         /// </value>
-#if TUNING
         public string Command
         {
             get { return Encoding.GetString(_command, 0, _command.Length); }
         }
-#else
-        public string Command { get; private set; }
-#endif
 
         /// <summary>
         /// Gets the encoding.
@@ -51,7 +45,6 @@ namespace Renci.SshNet.Messages.Connection
         /// </value>
         public Encoding Encoding { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -68,7 +61,6 @@ namespace Renci.SshNet.Messages.Connection
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ExecRequestInfo"/> class.
@@ -92,11 +84,7 @@ namespace Renci.SshNet.Messages.Connection
             if (encoding == null)
                 throw new ArgumentNullException("encoding");
 
-#if TUNING
             _command = encoding.GetBytes(command);
-#else
-            Command = command;
-#endif
             Encoding = encoding;
         }
 
@@ -107,12 +95,8 @@ namespace Renci.SshNet.Messages.Connection
         {
             base.LoadData();
 
-#if TUNING
             _command = ReadBinary();
             Encoding = Utf8;
-#else
-            Command = ReadString();
-#endif
         }
 
         /// <summary>
@@ -122,11 +106,7 @@ namespace Renci.SshNet.Messages.Connection
         {
             base.SaveData();
 
-#if TUNING
             WriteBinaryString(_command);
-#else
-            Write(Command, Encoding);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExitSignalRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExitSignalRequestInfo.cs
index bc37d96e..64fc16a8 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExitSignalRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExitSignalRequestInfo.cs
@@ -5,11 +5,9 @@
     /// </summary>
     internal class ExitSignalRequestInfo : RequestInfo
     {
-#if TUNING
         private byte[] _signalName;
         private byte[] _errorMessage;
         private byte[] _language;
-#endif
 
         /// <summary>
         /// Channel request name
@@ -33,15 +31,11 @@
         /// <value>
         /// The name of the signal.
         /// </value>
-#if TUNING
         public string SignalName
         {
             get { return Ascii.GetString(_signalName, 0, _signalName.Length); }
             private set { _signalName = Ascii.GetBytes(value); }
         }
-#else
-        public string SignalName { get; private set; }
-#endif
 
         /// <summary>
         /// Gets a value indicating whether core is dumped.
@@ -54,30 +48,21 @@
         /// <summary>
         /// Gets the error message.
         /// </summary>
-#if TUNING
         public string ErrorMessage
         {
             get { return Utf8.GetString(_errorMessage, 0, _errorMessage.Length); }
             private set { _errorMessage = Utf8.GetBytes(value); }
         }
-#else
-        public string ErrorMessage { get; private set; }
-#endif
 
         /// <summary>
         /// Gets message language.
         /// </summary>
-#if TUNING
         public string Language
         {
             get { return Utf8.GetString(_language, 0, _language.Length); }
             private set { _language = Utf8.GetBytes(value); }
         }
-#else
-        public string Language { get; private set; }
-#endif
 
-#if TUNING
         protected override int BufferCapacity
         {
             get
@@ -93,7 +78,6 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ExitSignalRequestInfo"/> class.
@@ -126,19 +110,10 @@
         {
             base.LoadData();
 
-#if TUNING
             _signalName = ReadBinary();
-#else
-            SignalName = ReadAsciiString();
-#endif
             CoreDumped = ReadBoolean();
-#if TUNING
             _errorMessage = ReadBinary();
             _language = ReadBinary();
-#else
-            ErrorMessage = ReadString();
-            Language = ReadString();
-#endif
         }
 
         /// <summary>
@@ -148,20 +123,10 @@
         {
             base.SaveData();
 
-#if TUNING
             WriteBinaryString(_signalName);
-#else
-            WriteAscii(SignalName);
-#endif
             Write(CoreDumped);
-#if TUNING
             Write(_errorMessage);
             Write(_language);
-#else
-            Write(ErrorMessage);
-            Write(Language);
-#endif
         }
-
     }
 }
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExitStatusRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExitStatusRequestInfo.cs
index cc0c4607..dbb588cc 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExitStatusRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExitStatusRequestInfo.cs
@@ -26,7 +26,6 @@
         /// </summary>
         public uint ExitStatus { get; private set; }
 
-#if TUNING
         protected override int BufferCapacity
         {
             get
@@ -36,7 +35,6 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ExitStatusRequestInfo"/> class.
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/PseudoTerminalInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/PseudoTerminalInfo.cs
index 785339d0..da92d5ab 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/PseudoTerminalInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/PseudoTerminalInfo.cs
@@ -72,7 +72,6 @@ namespace Renci.SshNet.Messages.Connection
         /// </value>
         public IDictionary<TerminalModes, uint> TerminalModeValues { get; set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -84,7 +83,6 @@ namespace Renci.SshNet.Messages.Connection
         {
             get { return -1; }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PseudoTerminalRequestInfo"/> class.
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/RequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/RequestInfo.cs
index 15b622ad..5d5229d0 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/RequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/RequestInfo.cs
@@ -23,7 +23,6 @@ namespace Renci.SshNet.Messages.Connection
         /// </value>
         public bool WantReply { get; protected set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -39,7 +38,6 @@ namespace Renci.SshNet.Messages.Connection
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Called when type specific data need to be loaded.
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/SignalRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/SignalRequestInfo.cs
index 356f2aac..519413e1 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/SignalRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/SignalRequestInfo.cs
@@ -5,9 +5,7 @@
     /// </summary>
     internal class SignalRequestInfo : RequestInfo
     {
-#if TUNING
         private byte[] _signalName;
-#endif
 
         /// <summary>
         /// Channel request name.
@@ -31,17 +29,12 @@
         /// <value>
         /// The name of the signal.
         /// </value>
-#if TUNING
         public string SignalName
         {
             get { return Ascii.GetString(_signalName, 0, _signalName.Length); }
             private set { _signalName = Ascii.GetBytes(value); }
         }
-#else
-        public string SignalName { get; private set; }
-#endif
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -58,7 +51,6 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SignalRequestInfo"/> class.
@@ -85,11 +77,7 @@
         {
             base.LoadData();
 
-#if TUNING
             _signalName = ReadBinary();
-#else
-            SignalName = ReadAsciiString();
-#endif
         }
 
         /// <summary>
@@ -99,11 +87,7 @@
         {
             base.SaveData();
 
-#if TUNING
             WriteBinaryString(_signalName);
-#else
-            WriteAscii(SignalName);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/SubsystemRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/SubsystemRequestInfo.cs
index 298a49be..5aa35b61 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/SubsystemRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/SubsystemRequestInfo.cs
@@ -5,9 +5,7 @@
     /// </summary>
     internal class SubsystemRequestInfo : RequestInfo
     {
-#if TUNING
         private byte[] _subsystemName;
-#endif
 
         /// <summary>
         /// Channel request name
@@ -31,17 +29,12 @@
         /// <value>
         /// The name of the subsystem.
         /// </value>
-#if TUNING
         public string SubsystemName
         {
             get { return Ascii.GetString(_subsystemName, 0, _subsystemName.Length); }
             private set { _subsystemName = Ascii.GetBytes(value); }
         }
-#else
-        public string SubsystemName { get; private set; }
-#endif
 
-#if TUNING
         protected override int BufferCapacity
         {
             get
@@ -52,7 +45,6 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SubsystemRequestInfo"/> class.
@@ -79,11 +71,7 @@
         {
             base.LoadData();
 
-#if TUNING
             _subsystemName = ReadBinary();
-#else
-            SubsystemName = ReadAsciiString();
-#endif
         }
 
         /// <summary>
@@ -93,11 +81,7 @@
         {
             base.SaveData();
 
-#if TUNING
             WriteBinaryString(_subsystemName);
-#else
-            WriteAscii(SubsystemName);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/WindowChangeRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/WindowChangeRequestInfo.cs
index 15a69275..7a01d5a2 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/WindowChangeRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/WindowChangeRequestInfo.cs
@@ -41,7 +41,6 @@
         /// </summary>
         public uint Height { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -60,7 +59,6 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="WindowChangeRequestInfo"/> class.
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/X11ForwardingRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/X11ForwardingRequestInfo.cs
index ef26dde0..0b7487ed 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/X11ForwardingRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/X11ForwardingRequestInfo.cs
@@ -5,9 +5,7 @@
     /// </summary>
     internal class X11ForwardingRequestInfo : RequestInfo
     {
-#if TUNING
         private byte[] _authenticationProtocol;
-#endif
 
         /// <summary>
         /// Channel request name
@@ -39,15 +37,11 @@
         /// <value>
         /// The authentication protocol.
         /// </value>
-#if TUNING
         public string AuthenticationProtocol
         {
             get { return Ascii.GetString(_authenticationProtocol, 0, _authenticationProtocol.Length); }
             private set { _authenticationProtocol = Ascii.GetBytes(value); }
         }
-#else
-        public string AuthenticationProtocol { get; set; }
-#endif
 
         /// <summary>
         /// Gets or sets the authentication cookie.
@@ -65,7 +59,6 @@
         /// </value>
         public uint ScreenNumber { get; set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -86,7 +79,6 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="X11ForwardingRequestInfo"/> class.
@@ -120,13 +112,8 @@
             base.LoadData();
 
             IsSingleConnection = ReadBoolean();
-#if TUNING
             _authenticationProtocol = ReadBinary();
             AuthenticationCookie = ReadBinary();
-#else
-            AuthenticationProtocol = ReadAsciiString();
-            AuthenticationCookie = ReadBinaryString();
-#endif
             ScreenNumber = ReadUInt32();
         }
 
@@ -138,11 +125,7 @@
             base.SaveData();
 
             Write(IsSingleConnection);
-#if TUNING
             WriteBinaryString(_authenticationProtocol);
-#else
-            WriteAscii(AuthenticationProtocol);
-#endif
             WriteBinaryString(AuthenticationCookie);
             Write(ScreenNumber);
         }
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/XonXoffRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/XonXoffRequestInfo.cs
index 86c664b8..230eb6ab 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/XonXoffRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/XonXoffRequestInfo.cs
@@ -29,7 +29,6 @@
         /// </value>
         public bool ClientCanDo { get; set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -45,7 +44,6 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="XonXoffRequestInfo"/> class.
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelWindowAdjustMessage.cs b/src/Renci.SshNet/Messages/Connection/ChannelWindowAdjustMessage.cs
index 79b43880..e6a84a20 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelWindowAdjustMessage.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelWindowAdjustMessage.cs
@@ -11,7 +11,6 @@
         /// </summary>
         public uint BytesToAdd { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -27,7 +26,6 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ChannelWindowAdjustMessage"/> class.
diff --git a/src/Renci.SshNet/Messages/Connection/GlobalRequestMessage.cs b/src/Renci.SshNet/Messages/Connection/GlobalRequestMessage.cs
index 0bffefad..d72da72b 100644
--- a/src/Renci.SshNet/Messages/Connection/GlobalRequestMessage.cs
+++ b/src/Renci.SshNet/Messages/Connection/GlobalRequestMessage.cs
@@ -9,10 +9,8 @@ namespace Renci.SshNet.Messages.Connection
     [Message("SSH_MSG_GLOBAL_REQUEST", 80)]
     public class GlobalRequestMessage : Message
     {
-#if TUNING
         private byte[] _requestName;
         private byte[] _addressToBind;
-#endif
 
         /// <summary>
         /// Gets the name of the request.
@@ -20,14 +18,10 @@ namespace Renci.SshNet.Messages.Connection
         /// <value>
         /// The name of the request.
         /// </value>
-#if TUNING
         public GlobalRequestName RequestName
         {
             get { return _requestName.ToGlobalRequestName(); }
         }
-#else
-        public GlobalRequestName RequestName { get; private set; }
-#endif
 
         /// <summary>
         /// Gets a value indicating whether message reply should be sent..
@@ -40,23 +34,17 @@ namespace Renci.SshNet.Messages.Connection
         /// <summary>
         /// Gets the address to bind to.
         /// </summary>
-#if TUNING
         public string AddressToBind
         {
             get { return Utf8.GetString(_addressToBind, 0, _addressToBind.Length); }
             private set { _addressToBind = Utf8.GetBytes(value); }
         }
-#else
-        public string AddressToBind { get; private set; }
-        //  TODO:   Extract AddressToBind property to be in different class and GlobalREquestMessage to be a base class fo it.
-#endif
 
         /// <summary>
         /// Gets port number to bind to.
         /// </summary>
-        public UInt32 PortToBind { get; private set; }
+        public uint PortToBind { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -77,29 +65,14 @@ namespace Renci.SshNet.Messages.Connection
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="GlobalRequestMessage"/> class.
         /// </summary>
         public GlobalRequestMessage()
         {
-
         }
 
-#if !TUNING
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GlobalRequestMessage"/> class.
-        /// </summary>
-        /// <param name="requestName">Name of the request.</param>
-        /// <param name="wantReply">if set to <c>true</c> [want reply].</param>
-        public GlobalRequestMessage(GlobalRequestName requestName, bool wantReply)
-        {
-            RequestName = requestName;
-            WantReply = wantReply;
-        }
-#endif
-
         /// <summary>
         /// Initializes a new instance of the <see cref="GlobalRequestMessage"/> class.
         /// </summary>
@@ -108,14 +81,9 @@ namespace Renci.SshNet.Messages.Connection
         /// <param name="addressToBind">The address to bind.</param>
         /// <param name="portToBind">The port to bind.</param>
         public GlobalRequestMessage(GlobalRequestName requestName, bool wantReply, string addressToBind, uint portToBind)
-#if !TUNING
-            : this(requestName, wantReply)
-#endif
         {
-#if TUNING
             _requestName = requestName.ToArray();
             WantReply = wantReply;
-#endif
             AddressToBind = addressToBind;
             PortToBind = portToBind;
         }
@@ -125,32 +93,10 @@ namespace Renci.SshNet.Messages.Connection
         /// </summary>
         protected override void LoadData()
         {
-#if TUNING
             _requestName = ReadBinary();
-#else
-            var requestName = ReadAsciiString();
-#endif
-
             WantReply = ReadBoolean();
-
-#if TUNING
             _addressToBind = ReadBinary();
             PortToBind = ReadUInt32();
-#else
-            switch (requestName)
-            {
-                case "tcpip-forward":
-                    RequestName = GlobalRequestName.TcpIpForward;
-                    AddressToBind = ReadString();
-                    PortToBind = ReadUInt32();
-                    break;
-                case "cancel-tcpip-forward":
-                    RequestName = GlobalRequestName.CancelTcpIpForward;
-                    AddressToBind = ReadString();
-                    PortToBind = ReadUInt32();
-                    break;
-            }
-#endif
         }
 
         /// <summary>
@@ -158,35 +104,10 @@ namespace Renci.SshNet.Messages.Connection
         /// </summary>
         protected override void SaveData()
         {
-#if TUNING
             WriteBinaryString(_requestName);
-#else
-            switch (RequestName)
-            {
-                case GlobalRequestName.TcpIpForward:
-                    WriteAscii("tcpip-forward");
-                    break;
-                case GlobalRequestName.CancelTcpIpForward:
-                    WriteAscii("cancel-tcpip-forward");
-                    break;
-            }
-#endif
-
             Write(WantReply);
-
-#if TUNING
             WriteBinaryString(_addressToBind);
             Write(PortToBind);
-#else
-            switch (RequestName)
-            {
-                case GlobalRequestName.TcpIpForward:
-                case GlobalRequestName.CancelTcpIpForward:
-                    Write(AddressToBind);
-                    Write(PortToBind);
-                    break;
-            }
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Messages/Connection/RequestSuccessMessage.cs b/src/Renci.SshNet/Messages/Connection/RequestSuccessMessage.cs
index 1a1c47e4..7b3dd745 100644
--- a/src/Renci.SshNet/Messages/Connection/RequestSuccessMessage.cs
+++ b/src/Renci.SshNet/Messages/Connection/RequestSuccessMessage.cs
@@ -11,7 +11,6 @@
         /// </summary>
         public uint? BoundPort { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -28,7 +27,6 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestSuccessMessage"/> class.
diff --git a/src/Renci.SshNet/Messages/Message.cs b/src/Renci.SshNet/Messages/Message.cs
index 68ad5560..cf79ff54 100644
--- a/src/Renci.SshNet/Messages/Message.cs
+++ b/src/Renci.SshNet/Messages/Message.cs
@@ -27,7 +27,6 @@ namespace Renci.SshNet.Messages
             }
         }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -163,26 +162,6 @@ namespace Renci.SshNet.Messages
             return paddingLength;
         }
 
-#else
-        /// <summary>
-        /// Gets data bytes array
-        /// </summary>
-        /// <returns>Byte array representation of the message</returns>
-        public override byte[] GetBytes()
-        {
-            var messageAttribute = GetType().GetTypeInfo().GetCustomAttributes(typeof(MessageAttribute), true).SingleOrDefault() as MessageAttribute;
-
-            if (messageAttribute == null)
-                throw new SshException(string.Format(CultureInfo.CurrentCulture, "Type '{0}' is not a valid message type.", GetType().AssemblyQualifiedName));
-
-            var data = new List<byte>(base.GetBytes());
-
-            data.Insert(0, messageAttribute.Number);
-
-            return data.ToArray();
-        }
-#endif
-
         /// <summary>
         /// Returns a <see cref="System.String"/> that represents this instance.
         /// </summary>
diff --git a/src/Renci.SshNet/Messages/Transport/DebugMessage.cs b/src/Renci.SshNet/Messages/Transport/DebugMessage.cs
index d7802ead..0a76feb1 100644
--- a/src/Renci.SshNet/Messages/Transport/DebugMessage.cs
+++ b/src/Renci.SshNet/Messages/Transport/DebugMessage.cs
@@ -6,10 +6,8 @@
     [Message("SSH_MSG_DEBUG", 4)]
     public class DebugMessage : Message
     {
-#if TUNING
         private byte[] _message;
         private byte[] _language;
-#endif
 
         /// <summary>
         /// Gets a value indicating whether the message to be always displayed.
@@ -22,28 +20,19 @@
         /// <summary>
         /// Gets debug message.
         /// </summary>
-#if TUNING
         public string Message
         {
             get { return Utf8.GetString(_message, 0, _message.Length); }
         }
-#else
-        public string Message { get; private set; }
-#endif
 
         /// <summary>
         /// Gets message language.
         /// </summary>
-#if TUNING
         public string Language
         {
             get { return Utf8.GetString(_language, 0, _language.Length); }
         }
-#else
-        public string Language { get; private set; }
-#endif
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -63,7 +52,6 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Called when type specific data need to be loaded.
@@ -71,13 +59,8 @@
         protected override void LoadData()
         {
             IsAlwaysDisplay = ReadBoolean();
-#if TUNING
             _message = ReadBinary();
             _language = ReadBinary();
-#else
-            Message = ReadString();
-            Language = ReadString();
-#endif
         }
 
         /// <summary>
@@ -86,13 +69,8 @@
         protected override void SaveData()
         {
             Write(IsAlwaysDisplay);
-#if TUNING
             WriteBinaryString(_message);
             WriteBinaryString(_language);
-#else
-            Write(Message);
-            Write(Language);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Messages/Transport/DisconnectMessage.cs b/src/Renci.SshNet/Messages/Transport/DisconnectMessage.cs
index 100d8327..9563f400 100644
--- a/src/Renci.SshNet/Messages/Transport/DisconnectMessage.cs
+++ b/src/Renci.SshNet/Messages/Transport/DisconnectMessage.cs
@@ -6,10 +6,8 @@
     [Message("SSH_MSG_DISCONNECT", 1)]
     public class DisconnectMessage : Message, IKeyExchangedAllowed
     {
-#if TUNING
         private byte[] _description;
         private byte[] _language;
-#endif
 
         /// <summary>
         /// Gets disconnect reason code.
@@ -19,30 +17,21 @@
         /// <summary>
         /// Gets disconnect description.
         /// </summary>
-#if TUNING
         public string Description
         {
             get { return Utf8.GetString(_description, 0, _description.Length); }
             private set { _description = Utf8.GetBytes(value); }
         }
-#else
-        public string Description { get; private set; }
-#endif
 
         /// <summary>
         /// Gets message language.
         /// </summary>
-#if TUNING
         public string Language
         {
             get { return Utf8.GetString(_language, 0, _language.Length); }
             private set { _language = Utf8.GetBytes(value); }
         }
-#else
-        public string Language { get; private set; }
-#endif
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -62,7 +51,6 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DisconnectMessage"/> class.
@@ -80,9 +68,7 @@
         {
             ReasonCode = reasonCode;
             Description = message;
-#if TUNING
             Language = "en";
-#endif
         }
 
         /// <summary>
@@ -90,14 +76,9 @@
         /// </summary>
         protected override void LoadData()
         {
-            ReasonCode = (DisconnectReason)ReadUInt32();
-#if TUNING
+            ReasonCode = (DisconnectReason) ReadUInt32();
             _description = ReadBinary();
             _language = ReadBinary();
-#else
-            Description = ReadString();
-            Language = ReadString();
-#endif
         }
 
         /// <summary>
@@ -105,14 +86,9 @@
         /// </summary>
         protected override void SaveData()
         {
-            Write((uint)ReasonCode);
-#if TUNING
+            Write((uint) ReasonCode);
             WriteBinaryString(_description);
             WriteBinaryString(_language);
-#else
-            Write(Description);
-            Write(Language ?? "en");
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Messages/Transport/IgnoreMessage.cs b/src/Renci.SshNet/Messages/Transport/IgnoreMessage.cs
index cf2f94dd..0d364106 100644
--- a/src/Renci.SshNet/Messages/Transport/IgnoreMessage.cs
+++ b/src/Renci.SshNet/Messages/Transport/IgnoreMessage.cs
@@ -23,7 +23,6 @@ namespace Renci.SshNet.Messages.Transport
             Data = new byte[0];
         }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -40,7 +39,6 @@ namespace Renci.SshNet.Messages.Transport
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="IgnoreMessage"/> class.
@@ -59,11 +57,7 @@ namespace Renci.SshNet.Messages.Transport
         /// </summary>
         protected override void LoadData()
         {
-#if TUNING
             Data = ReadBinary();
-#else
-            Data = ReadBinaryString();
-#endif
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeGroup.cs b/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeGroup.cs
index 37176ff1..bb6e6914 100644
--- a/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeGroup.cs
+++ b/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeGroup.cs
@@ -10,10 +10,8 @@ namespace Renci.SshNet.Messages.Transport
     {
         internal const byte MessageNumber = 31;
 
-#if TUNING
         private byte[] _safePrime;
         private byte[] _subGroup;
-#endif
 
         /// <summary>
         /// Gets or sets the safe prime.
@@ -21,14 +19,10 @@ namespace Renci.SshNet.Messages.Transport
         /// <value>
         /// The safe prime.
         /// </value>
-#if TUNING
         public BigInteger SafePrime
         {
             get { return _safePrime.ToBigInteger(); }
         }
-#else
-        public BigInteger SafePrime { get; private set; }
-#endif
 
         /// <summary>
         /// Gets or sets the generator for subgroup in GF(p).
@@ -36,16 +30,11 @@ namespace Renci.SshNet.Messages.Transport
         /// <value>
         /// The sub group.
         /// </value>
-#if TUNING
         public BigInteger SubGroup
         {
             get { return _subGroup.ToBigInteger(); }
         }
-#else
-        public BigInteger SubGroup { get; private set; }
-#endif
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -65,20 +54,14 @@ namespace Renci.SshNet.Messages.Transport
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Called when type specific data need to be loaded.
         /// </summary>
         protected override void LoadData()
         {
-#if TUNING
             _safePrime = ReadBinary();
             _subGroup = ReadBinary();
-#else
-            SafePrime = ReadBigInt();
-            SubGroup = ReadBigInt();
-#endif
         }
 
         /// <summary>
@@ -86,13 +69,8 @@ namespace Renci.SshNet.Messages.Transport
         /// </summary>
         protected override void SaveData()
         {
-#if TUNING
             WriteBinaryString(_safePrime);
             WriteBinaryString(_subGroup);
-#else
-            Write(SafePrime);
-            Write(SubGroup);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeInit.cs b/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeInit.cs
index 0aa9d3bf..ba28de9a 100644
--- a/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeInit.cs
+++ b/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeInit.cs
@@ -8,23 +8,16 @@ namespace Renci.SshNet.Messages.Transport
     [Message("SSH_MSG_KEX_DH_GEX_INIT", 32)]
     internal class KeyExchangeDhGroupExchangeInit : Message, IKeyExchangedAllowed
     {
-#if TUNING
         private byte[] _eBytes;
-#endif
 
         /// <summary>
         /// Gets the E value.
         /// </summary>
-#if TUNING
         public BigInteger E
         {
             get { return _eBytes.ToBigInteger(); }
         }
-#else
-        public BigInteger E { get; private set; }
-#endif
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -41,7 +34,6 @@ namespace Renci.SshNet.Messages.Transport
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="KeyExchangeDhGroupExchangeInit"/> class.
@@ -49,11 +41,7 @@ namespace Renci.SshNet.Messages.Transport
         /// <param name="clientExchangeValue">The client exchange value.</param>
         public KeyExchangeDhGroupExchangeInit(BigInteger clientExchangeValue)
         {
-#if TUNING
             _eBytes = clientExchangeValue.ToByteArray().Reverse();
-#else
-            E = clientExchangeValue;
-#endif
         }
 
         /// <summary>
@@ -61,11 +49,7 @@ namespace Renci.SshNet.Messages.Transport
         /// </summary>
         protected override void LoadData()
         {
-#if TUNING
             _eBytes = ReadBinary();
-#else
-            E = ReadBigInt();
-#endif
         }
 
         /// <summary>
@@ -73,11 +57,7 @@ namespace Renci.SshNet.Messages.Transport
         /// </summary>
         protected override void SaveData()
         {
-#if TUNING
             WriteBinaryString(_eBytes);
-#else
-            Write(E);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeReply.cs b/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeReply.cs
index 1e3aa872..b42b37e8 100644
--- a/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeReply.cs
+++ b/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeReply.cs
@@ -10,9 +10,7 @@ namespace Renci.SshNet.Messages.Transport
     {
         internal const byte MessageNumber = 33;
 
-#if TUNING
         private byte[] _fBytes;
-#endif
 
         /// <summary>
         /// Gets server public host key and certificates
@@ -23,14 +21,10 @@ namespace Renci.SshNet.Messages.Transport
         /// <summary>
         /// Gets the F value.
         /// </summary>
-#if TUNING
         public BigInteger F
         {
             get { return _fBytes.ToBigInteger(); }
         }
-#else
-        public BigInteger F { get; private set; }
-#endif
 
         /// <summary>
         /// Gets the signature of H.
@@ -38,7 +32,6 @@ namespace Renci.SshNet.Messages.Transport
         /// <value>The signature.</value>
         public byte[] Signature { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -59,22 +52,15 @@ namespace Renci.SshNet.Messages.Transport
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Called when type specific data need to be loaded.
         /// </summary>
         protected override void LoadData()
         {
-#if TUNING
             HostKey = ReadBinary();
             _fBytes = ReadBinary();
             Signature = ReadBinary();
-#else
-            HostKey = ReadBinaryString();
-            F = ReadBigInt();
-            Signature = ReadBinaryString();
-#endif
         }
 
         /// <summary>
@@ -83,11 +69,7 @@ namespace Renci.SshNet.Messages.Transport
         protected override void SaveData()
         {
             WriteBinaryString(HostKey);
-#if TUNING
             WriteBinaryString(_fBytes);
-#else
-            Write(F);
-#endif
             WriteBinaryString(Signature);
         }
     }
diff --git a/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeRequest.cs b/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeRequest.cs
index 100e4ae7..81b35fe9 100644
--- a/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeRequest.cs
+++ b/src/Renci.SshNet/Messages/Transport/KeyExchangeDhGroupExchangeRequest.cs
@@ -16,7 +16,7 @@ namespace Renci.SshNet.Messages.Transport
         /// <value>
         /// The minimum.
         /// </value>
-        public UInt32 Minimum { get; private set; }
+        public uint Minimum { get; private set; }
 
         /// <summary>
         /// Gets or sets the preferred size in bits of the group the server will send.
@@ -24,7 +24,7 @@ namespace Renci.SshNet.Messages.Transport
         /// <value>
         /// The preferred.
         /// </value>
-        public UInt32 Preferred { get; private set; }
+        public uint Preferred { get; private set; }
 
         /// <summary>
         /// Gets or sets the maximal size in bits of an acceptable group.
@@ -32,9 +32,8 @@ namespace Renci.SshNet.Messages.Transport
         /// <value>
         /// The maximum.
         /// </value>
-        public UInt32 Maximum { get; private set; }
+        public uint Maximum { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -52,7 +51,6 @@ namespace Renci.SshNet.Messages.Transport
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="KeyExchangeDhGroupExchangeRequest"/> class.
diff --git a/src/Renci.SshNet/Messages/Transport/KeyExchangeDhInitMessage.cs b/src/Renci.SshNet/Messages/Transport/KeyExchangeDhInitMessage.cs
index b75dbc61..0d3e3027 100644
--- a/src/Renci.SshNet/Messages/Transport/KeyExchangeDhInitMessage.cs
+++ b/src/Renci.SshNet/Messages/Transport/KeyExchangeDhInitMessage.cs
@@ -8,23 +8,16 @@ namespace Renci.SshNet.Messages.Transport
     [Message("SSH_MSG_KEXDH_INIT", 30)]
     internal class KeyExchangeDhInitMessage : Message, IKeyExchangedAllowed
     {
-#if TUNING
         private byte[] _eBytes;
-#endif
 
         /// <summary>
         /// Gets the E value.
         /// </summary>
-#if TUNING
         public BigInteger E
         {
             get { return _eBytes.ToBigInteger(); }
         }
-#else
-        public BigInteger E { get; private set; }
-#endif
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -41,7 +34,6 @@ namespace Renci.SshNet.Messages.Transport
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="KeyExchangeDhInitMessage"/> class.
@@ -49,11 +41,7 @@ namespace Renci.SshNet.Messages.Transport
         /// <param name="clientExchangeValue">The client exchange value.</param>
         public KeyExchangeDhInitMessage(BigInteger clientExchangeValue)
         {
-#if TUNING
             _eBytes = clientExchangeValue.ToByteArray().Reverse();
-#else
-            E = clientExchangeValue;
-#endif
         }
 
         /// <summary>
@@ -62,11 +50,7 @@ namespace Renci.SshNet.Messages.Transport
         protected override void LoadData()
         {
             ResetReader();
-#if TUNING
             _eBytes = ReadBinary();
-#else
-            E = ReadBigInt();
-#endif
         }
 
         /// <summary>
@@ -74,11 +58,7 @@ namespace Renci.SshNet.Messages.Transport
         /// </summary>
         protected override void SaveData()
         {
-#if TUNING
             WriteBinaryString(_eBytes);
-#else
-            Write(E);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Messages/Transport/KeyExchangeDhReplyMessage.cs b/src/Renci.SshNet/Messages/Transport/KeyExchangeDhReplyMessage.cs
index 0efbba32..53148655 100644
--- a/src/Renci.SshNet/Messages/Transport/KeyExchangeDhReplyMessage.cs
+++ b/src/Renci.SshNet/Messages/Transport/KeyExchangeDhReplyMessage.cs
@@ -8,9 +8,7 @@ namespace Renci.SshNet.Messages.Transport
     [Message("SSH_MSG_KEXDH_REPLY", 31)]
     public class KeyExchangeDhReplyMessage : Message
     {
-#if TUNING
         private byte[] _fBytes;
-#endif
 
         /// <summary>
         /// Gets server public host key and certificates
@@ -21,14 +19,10 @@ namespace Renci.SshNet.Messages.Transport
         /// <summary>
         /// Gets the F value.
         /// </summary>
-#if TUNING
         public BigInteger F
         {
             get { return _fBytes.ToBigInteger(); }
         }
-#else
-        public BigInteger F { get; private set; }
-#endif
 
         /// <summary>
         /// Gets the signature of H.
@@ -36,7 +30,6 @@ namespace Renci.SshNet.Messages.Transport
         /// <value>The signature.</value>
         public byte[] Signature { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -57,7 +50,6 @@ namespace Renci.SshNet.Messages.Transport
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Called when type specific data need to be loaded.
@@ -65,15 +57,9 @@ namespace Renci.SshNet.Messages.Transport
         protected override void LoadData()
         {
             ResetReader();
-#if TUNING
             HostKey = ReadBinary();
             _fBytes = ReadBinary();
             Signature = ReadBinary();
-#else
-            HostKey = ReadBinaryString();
-            F = ReadBigInt();
-            Signature = ReadBinaryString();
-#endif
         }
 
         /// <summary>
@@ -82,11 +68,7 @@ namespace Renci.SshNet.Messages.Transport
         protected override void SaveData()
         {
             WriteBinaryString(HostKey);
-#if TUNING
             WriteBinaryString(_fBytes);
-#else
-            Write(F);
-#endif
             WriteBinaryString(Signature);
         }
     }
diff --git a/src/Renci.SshNet/Messages/Transport/KeyExchangeEcdhInitMessage.cs b/src/Renci.SshNet/Messages/Transport/KeyExchangeEcdhInitMessage.cs
index 270818a4..7259ba6d 100644
--- a/src/Renci.SshNet/Messages/Transport/KeyExchangeEcdhInitMessage.cs
+++ b/src/Renci.SshNet/Messages/Transport/KeyExchangeEcdhInitMessage.cs
@@ -14,7 +14,6 @@ namespace Renci.SshNet.Messages.Transport
         /// </summary>
         public byte[] QC { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -31,14 +30,12 @@ namespace Renci.SshNet.Messages.Transport
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="KeyExchangeEcdhInitMessage"/> class.
         /// </summary>
         public KeyExchangeEcdhInitMessage(BigInteger d, BigInteger q)
         {
-#if TUNING
             var dBytes = d.ToByteArray().Reverse();
             var qBytes = q.ToByteArray().Reverse();
 
@@ -47,16 +44,6 @@ namespace Renci.SshNet.Messages.Transport
             Buffer.BlockCopy(dBytes, 0, data, 1, dBytes.Length);
             Buffer.BlockCopy(qBytes, 0, data, dBytes.Length + 1, qBytes.Length);
             QC = data;
-#else
-            var dBytes = d.ToByteArray();
-            var qBytes = q.ToByteArray();
-
-            var data = new List<byte>();
-            data.Add(0x04);
-            data.AddRange(d.ToByteArray().Reverse());
-            data.AddRange(q.ToByteArray().Reverse());
-            QC = data.ToArray();
-#endif
         }
 
         /// <summary>
@@ -65,11 +52,7 @@ namespace Renci.SshNet.Messages.Transport
         protected override void LoadData()
         {
             ResetReader();
-#if TUNING
             QC = ReadBinary();
-#else
-            QC = ReadBinaryString();
-#endif
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Messages/Transport/KeyExchangeEcdhReplyMessage.cs b/src/Renci.SshNet/Messages/Transport/KeyExchangeEcdhReplyMessage.cs
index e0525406..813c72e0 100644
--- a/src/Renci.SshNet/Messages/Transport/KeyExchangeEcdhReplyMessage.cs
+++ b/src/Renci.SshNet/Messages/Transport/KeyExchangeEcdhReplyMessage.cs
@@ -23,7 +23,6 @@
         /// <value>The signature.</value>
         public byte[] Signature { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -44,7 +43,6 @@
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Called when type specific data need to be loaded.
@@ -52,15 +50,9 @@
         protected override void LoadData()
         {
             ResetReader();
-#if TUNING
             KS = ReadBinary();
             QS = ReadBinary();
             Signature = ReadBinary();
-#else
-            KS = ReadBinaryString();
-            QS = ReadBinaryString();
-            Signature = ReadBinaryString();
-#endif
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Messages/Transport/KeyExchangeInitMessage.cs b/src/Renci.SshNet/Messages/Transport/KeyExchangeInitMessage.cs
index 293e1153..c2751756 100644
--- a/src/Renci.SshNet/Messages/Transport/KeyExchangeInitMessage.cs
+++ b/src/Renci.SshNet/Messages/Transport/KeyExchangeInitMessage.cs
@@ -1,5 +1,4 @@
-using System;
-using Renci.SshNet.Security.Cryptography;
+using Renci.SshNet.Security.Cryptography;
 
 namespace Renci.SshNet.Messages.Transport
 {
@@ -110,7 +109,7 @@ namespace Renci.SshNet.Messages.Transport
         /// Gets or sets a value indicating whether first key exchange packet follows.
         /// </summary>
         /// <value>
-        /// 	<c>true</c> if first key exchange packet follows; otherwise, <c>false</c>.
+        /// <c>true</c> if first key exchange packet follows; otherwise, <c>false</c>.
         /// </value>
         public bool FirstKexPacketFollows { get; set; }
 
@@ -120,11 +119,10 @@ namespace Renci.SshNet.Messages.Transport
         /// <value>
         /// The reserved value.
         /// </value>
-        public UInt32 Reserved { get; set; }
+        public uint Reserved { get; set; }
 
         #endregion
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -136,7 +134,6 @@ namespace Renci.SshNet.Messages.Transport
         {
             get { return -1; }
         }
-#endif
 
         /// <summary>
         /// Called when type specific data need to be loaded.
diff --git a/src/Renci.SshNet/Messages/Transport/ServiceAcceptMessage.cs b/src/Renci.SshNet/Messages/Transport/ServiceAcceptMessage.cs
index 77e420cd..4099d1ca 100644
--- a/src/Renci.SshNet/Messages/Transport/ServiceAcceptMessage.cs
+++ b/src/Renci.SshNet/Messages/Transport/ServiceAcceptMessage.cs
@@ -24,20 +24,7 @@ namespace Renci.SshNet.Messages.Transport
         /// </summary>
         protected override void LoadData()
         {
-#if TUNING
             ServiceName = ReadBinary().ToServiceName();
-#else
-            var serviceName = ReadAsciiString();
-            switch (serviceName)
-            {
-                case "ssh-userauth":
-                    ServiceName = ServiceName.UserAuthentication;
-                    break;
-                case "ssh-connection":
-                    ServiceName = ServiceName.Connection;
-                    break;
-            }
-#endif
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Messages/Transport/ServiceRequestMessage.cs b/src/Renci.SshNet/Messages/Transport/ServiceRequestMessage.cs
index f9d07d83..55b8d259 100644
--- a/src/Renci.SshNet/Messages/Transport/ServiceRequestMessage.cs
+++ b/src/Renci.SshNet/Messages/Transport/ServiceRequestMessage.cs
@@ -9,9 +9,7 @@ namespace Renci.SshNet.Messages.Transport
     [Message("SSH_MSG_SERVICE_REQUEST", 5)]
     public class ServiceRequestMessage : Message
     {
-#if TUNING
         private readonly byte[] _serviceName;
-#endif
 
         /// <summary>
         /// Gets the name of the service.
@@ -19,16 +17,11 @@ namespace Renci.SshNet.Messages.Transport
         /// <value>
         /// The name of the service.
         /// </value>
-#if TUNING
         public ServiceName ServiceName
         {
             get { return _serviceName.ToServiceName(); }
         }
-#else
-        public ServiceName ServiceName { get; private set; }
-#endif
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -45,7 +38,6 @@ namespace Renci.SshNet.Messages.Transport
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ServiceRequestMessage"/> class.
@@ -53,11 +45,7 @@ namespace Renci.SshNet.Messages.Transport
         /// <param name="serviceName">Name of the service.</param>
         public ServiceRequestMessage(ServiceName serviceName)
         {
-#if TUNING
             _serviceName = serviceName.ToArray();
-#else
-            ServiceName = serviceName;
-#endif
         }
 
         /// <summary>
@@ -73,22 +61,7 @@ namespace Renci.SshNet.Messages.Transport
         /// </summary>
         protected override void SaveData()
         {
-#if TUNING
             WriteBinaryString(_serviceName);
-#else
-            switch (ServiceName)
-            {
-                case ServiceName.UserAuthentication:
-                    WriteAscii("ssh-userauth");
-                    break;
-                case ServiceName.Connection:
-                    WriteAscii("ssh-connection");
-                    break;
-                default:
-                    throw new NotSupportedException("Not supported service name");
-            }
-
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/NetConfClient.cs b/src/Renci.SshNet/NetConfClient.cs
index 3d4ccbdc..1f111074 100644
--- a/src/Renci.SshNet/NetConfClient.cs
+++ b/src/Renci.SshNet/NetConfClient.cs
@@ -223,7 +223,7 @@ namespace Renci.SshNet
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources
         /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged ResourceMessages.</param>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected override void Dispose(bool disposing)
         {
             base.Dispose(disposing);
diff --git a/src/Renci.SshNet/NoneAuthenticationMethod.cs b/src/Renci.SshNet/NoneAuthenticationMethod.cs
index 0769f8c6..d96f6521 100644
--- a/src/Renci.SshNet/NoneAuthenticationMethod.cs
+++ b/src/Renci.SshNet/NoneAuthenticationMethod.cs
@@ -106,9 +106,10 @@ namespace Renci.SshNet
 
             if (disposing)
             {
-                if (_authenticationCompleted != null)
+                var authenticationCompleted = _authenticationCompleted;
+                if (authenticationCompleted != null)
                 {
-                    _authenticationCompleted.Dispose();
+                    authenticationCompleted.Dispose();
                     _authenticationCompleted = null;
                 }
 
@@ -118,13 +119,10 @@ namespace Renci.SshNet
 
         /// <summary>
         /// Releases unmanaged resources and performs other cleanup operations before the
-        /// <see cref="PasswordConnectionInfo"/> is reclaimed by garbage collection.
+        /// <see cref="NoneAuthenticationMethod"/> is reclaimed by garbage collection.
         /// </summary>
         ~NoneAuthenticationMethod()
         {
-            // Do not re-create Dispose clean-up code here.
-            // Calling Dispose(false) is optimal in terms of
-            // readability and maintainability.
             Dispose(false);
         }
 
diff --git a/src/Renci.SshNet/PasswordAuthenticationMethod.cs b/src/Renci.SshNet/PasswordAuthenticationMethod.cs
index 6730d360..252cf784 100644
--- a/src/Renci.SshNet/PasswordAuthenticationMethod.cs
+++ b/src/Renci.SshNet/PasswordAuthenticationMethod.cs
@@ -175,9 +175,10 @@ namespace Renci.SshNet
            
             if (disposing)
             {
-                if (_authenticationCompleted != null)
+                var authenticationCompleted = _authenticationCompleted;
+                if (authenticationCompleted != null)
                 {
-                    _authenticationCompleted.Dispose();
+                    authenticationCompleted.Dispose();
                     _authenticationCompleted = null;
                 }
 
@@ -187,13 +188,10 @@ namespace Renci.SshNet
 
         /// <summary>
         /// Releases unmanaged resources and performs other cleanup operations before the
-        /// <see cref="PasswordConnectionInfo"/> is reclaimed by garbage collection.
+        /// <see cref="PasswordAuthenticationMethod"/> is reclaimed by garbage collection.
         /// </summary>
         ~PasswordAuthenticationMethod()
         {
-            // Do not re-create Dispose clean-up code here.
-            // Calling Dispose(false) is optimal in terms of
-            // readability and maintainability.
             Dispose(false);
         }
 
diff --git a/src/Renci.SshNet/PrivateKeyAuthenticationMethod.cs b/src/Renci.SshNet/PrivateKeyAuthenticationMethod.cs
index 82919de9..b8cb46b1 100644
--- a/src/Renci.SshNet/PrivateKeyAuthenticationMethod.cs
+++ b/src/Renci.SshNet/PrivateKeyAuthenticationMethod.cs
@@ -166,9 +166,10 @@ namespace Renci.SshNet
 
             if (disposing)
             {
-                if (_authenticationCompleted != null)
+                var authenticationCompleted = _authenticationCompleted;
+                if (authenticationCompleted != null)
                 {
-                    _authenticationCompleted.Dispose();
+                    authenticationCompleted.Dispose();
                     _authenticationCompleted = null;
                 }
 
@@ -182,9 +183,6 @@ namespace Renci.SshNet
         /// </summary>
         ~PrivateKeyAuthenticationMethod()
         {
-            // Do not re-create Dispose clean-up code here.
-            // Calling Dispose(false) is optimal in terms of
-            // readability and maintainability.
             Dispose(false);
         }
 
@@ -198,30 +196,28 @@ namespace Renci.SshNet
             private readonly byte[] _serviceName;
             private readonly byte[] _authenticationMethod;
 
-#if TUNING
-        protected override int BufferCapacity
-        {
-            get
+            protected override int BufferCapacity
             {
-                var capacity = base.BufferCapacity;
-                capacity += 4; // SessionId length
-                capacity += _sessionId.Length; // SessionId
-                capacity += 1; // Authentication Message Code
-                capacity += 4; // UserName length
-                capacity += _message.Username.Length; // UserName
-                capacity += 4; // ServiceName length
-                capacity += _serviceName.Length; // ServiceName
-                capacity += 4; // AuthenticationMethod length
-                capacity += _authenticationMethod.Length; // AuthenticationMethod
-                capacity += 1; // TRUE
-                capacity += 4; // PublicKeyAlgorithmName length
-                capacity += _message.PublicKeyAlgorithmName.Length; // PublicKeyAlgorithmName
-                capacity += 4; // PublicKeyData length
-                capacity += _message.PublicKeyData.Length; // PublicKeyData
-                return capacity;
+                get
+                {
+                    var capacity = base.BufferCapacity;
+                    capacity += 4; // SessionId length
+                    capacity += _sessionId.Length; // SessionId
+                    capacity += 1; // Authentication Message Code
+                    capacity += 4; // UserName length
+                    capacity += _message.Username.Length; // UserName
+                    capacity += 4; // ServiceName length
+                    capacity += _serviceName.Length; // ServiceName
+                    capacity += 4; // AuthenticationMethod length
+                    capacity += _authenticationMethod.Length; // AuthenticationMethod
+                    capacity += 1; // TRUE
+                    capacity += 4; // PublicKeyAlgorithmName length
+                    capacity += _message.PublicKeyAlgorithmName.Length; // PublicKeyAlgorithmName
+                    capacity += 4; // PublicKeyData length
+                    capacity += _message.PublicKeyData.Length; // PublicKeyData
+                    return capacity;
+                }
             }
-        }
-#endif
 
             public SignatureData(RequestMessagePublicKey message, byte[] sessionId)
             {
diff --git a/src/Renci.SshNet/PrivateKeyFile.cs b/src/Renci.SshNet/PrivateKeyFile.cs
index 4357fac3..eb70705c 100644
--- a/src/Renci.SshNet/PrivateKeyFile.cs
+++ b/src/Renci.SshNet/PrivateKeyFile.cs
@@ -348,7 +348,7 @@ namespace Renci.SshNet
         private bool _isDisposed;
 
         /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged ResourceMessages.
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
         public void Dispose()
         {
@@ -359,38 +359,31 @@ namespace Renci.SshNet
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources
         /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged ResourceMessages.</param>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected virtual void Dispose(bool disposing)
         {
-            // Check to see if Dispose has already been called.
-            if (!_isDisposed)
+            if (_isDisposed)
+                return;
+
+            if (disposing)
             {
-                // If disposing equals true, dispose all managed
-                // and unmanaged ResourceMessages.
-                if (disposing)
+                var key = _key;
+                if (key != null)
                 {
-                    // Dispose managed ResourceMessages.
-                    if (_key != null)
-                    {
-                        ((IDisposable)_key).Dispose();
-                        _key = null;
-                    }
+                    ((IDisposable) key).Dispose();
+                    _key = null;
                 }
 
-                // Note disposing has been done.
                 _isDisposed = true;
             }
         }
 
         /// <summary>
         /// Releases unmanaged resources and performs other cleanup operations before the
-        /// <see cref="BaseClient"/> is reclaimed by garbage collection.
+        /// <see cref="PrivateKeyFile"/> is reclaimed by garbage collection.
         /// </summary>
         ~PrivateKeyFile()
         {
-            // Do not re-create Dispose clean-up code here.
-            // Calling Dispose(false) is optimal in terms of
-            // readability and maintainability.
             Dispose(false);
         }
 
@@ -424,7 +417,7 @@ namespace Renci.SshNet
             /// <returns>mpint read.</returns>
             public BigInteger ReadBigIntWithBits()
             {
-                var length = (int)base.ReadUInt32();
+                var length = (int) base.ReadUInt32();
 
                 length = (length + 7) / 8;
 
diff --git a/src/Renci.SshNet/Renci.SshNet.csproj b/src/Renci.SshNet/Renci.SshNet.csproj
index 7d3bc289..1e8fbc2d 100644
--- a/src/Renci.SshNet/Renci.SshNet.csproj
+++ b/src/Renci.SshNet/Renci.SshNet.csproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TUNING;FEATURE_RNG_CSP;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1;FEATURE_HASH_SHA256;FEATURE_HASH_SHA384;FEATURE_HASH_SHA512;FEATURE_HASH_RIPEMD160;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;FEATURE_RNG_CSP;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1;FEATURE_HASH_SHA256;FEATURE_HASH_SHA384;FEATURE_HASH_SHA512;FEATURE_HASH_RIPEMD160;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Debug\Renci.SshNet.xml</DocumentationFile>
@@ -27,7 +27,7 @@
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TUNING;FEATURE_RNG_CSP;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1;FEATURE_HASH_SHA256;FEATURE_HASH_SHA384;FEATURE_HASH_SHA512;FEATURE_HASH_RIPEMD160;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE</DefineConstants>
+    <DefineConstants>FEATURE_RNG_CSP;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1;FEATURE_HASH_SHA256;FEATURE_HASH_SHA384;FEATURE_HASH_SHA512;FEATURE_HASH_RIPEMD160;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Release\Renci.SshNet.xml</DocumentationFile>
diff --git a/src/Renci.SshNet/ScpClient.cs b/src/Renci.SshNet/ScpClient.cs
index 02fc20c1..e84357b8 100644
--- a/src/Renci.SshNet/ScpClient.cs
+++ b/src/Renci.SshNet/ScpClient.cs
@@ -254,8 +254,8 @@ namespace Renci.SshNet
         private void InternalSetTimestamp(IChannelSession channel, Stream input, DateTime lastWriteTime, DateTime lastAccessime)
         {
             var zeroTime = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
-            var modificationSeconds = (long)(lastWriteTime - zeroTime).TotalSeconds;
-            var accessSeconds = (long)(lastAccessime - zeroTime).TotalSeconds;
+            var modificationSeconds = (long) (lastWriteTime - zeroTime).TotalSeconds;
+            var accessSeconds = (long) (lastAccessime - zeroTime).TotalSeconds;
             SendData(channel, string.Format("T{0} 0 {1} 0\n", modificationSeconds, accessSeconds));
             CheckReturnCode(input);
         }
@@ -288,14 +288,14 @@ namespace Renci.SshNet
             CheckReturnCode(input);
         }
 
-        private void InternalDownload(IChannelSession channel, Stream input, Stream output, string filename, long length)
+        private void InternalDownload(IChannel channel, Stream input, Stream output, string filename, long length)
         {
             var buffer = new byte[Math.Min(length, BufferSize)];
             var needToRead = length;
 
             do
             {
-                var read = input.Read(buffer, 0, (int)Math.Min(needToRead, BufferSize));
+                var read = input.Read(buffer, 0, (int) Math.Min(needToRead, BufferSize));
 
                 output.Write(buffer, 0, read);
 
@@ -332,12 +332,12 @@ namespace Renci.SshNet
             }
         }
 
-        private void SendConfirmation(IChannelSession channel)
+        private void SendConfirmation(IChannel channel)
         {
             SendData(channel, new byte[] { 0 });
         }
 
-        private void SendConfirmation(IChannelSession channel, byte errorCode, string message)
+        private void SendConfirmation(IChannel channel, byte errorCode, string message)
         {
             SendData(channel, new[] { errorCode });
             SendData(channel, string.Format("{0}\n", message));
@@ -359,28 +359,17 @@ namespace Renci.SshNet
             }
         }
 
-        private void SendData(IChannelSession channel, string command)
+        private void SendData(IChannel channel, string command)
         {
             channel.SendData(SshData.Utf8.GetBytes(command));
         }
 
-        private void SendData(IChannelSession channel, byte[] buffer, int length)
+        private void SendData(IChannel channel, byte[] buffer, int length)
         {
-#if TUNING
             channel.SendData(buffer, 0, length);
-#else
-            if (length == buffer.Length)
-            {
-                channel.SendData(buffer);
-            }
-            else
-            {
-                channel.SendData(buffer.Take(length).ToArray());
-            }
-#endif
         }
 
-        private void SendData(IChannelSession channel, byte[] buffer)
+        private void SendData(IChannel channel, byte[] buffer)
         {
             channel.SendData(buffer);
         }
diff --git a/src/Renci.SshNet/Security/Cryptography/Ciphers/RsaCipher.cs b/src/Renci.SshNet/Security/Cryptography/Ciphers/RsaCipher.cs
index 27ac8a33..fe42cf2c 100644
--- a/src/Renci.SshNet/Security/Cryptography/Ciphers/RsaCipher.cs
+++ b/src/Renci.SshNet/Security/Cryptography/Ciphers/RsaCipher.cs
@@ -1,8 +1,4 @@
 using System;
-#if !TUNING
-using System.Collections.Generic;
-using System.Linq;
-#endif
 using Renci.SshNet.Common;
 
 namespace Renci.SshNet.Security.Cryptography.Ciphers
@@ -84,16 +80,10 @@ namespace Renci.SshNet.Security.Cryptography.Ciphers
 
         private byte[] Transform(byte[] data)
         {
-#if TUNING
             Array.Reverse(data);
 
             var inputBytes = new byte[data.Length + 1];
             Buffer.BlockCopy(data, 0, inputBytes, 0, data.Length);
-#else
-            var bytes = new List<byte>(data.Reverse());
-            bytes.Add(0);
-            var inputBytes = bytes.ToArray();
-#endif
 
             var input = new BigInteger(inputBytes);
 
@@ -136,11 +126,7 @@ namespace Renci.SshNet.Security.Cryptography.Ciphers
                 result = BigInteger.ModPow(input, _key.Exponent, _key.Modulus);
             }
 
-#if TUNING
             return result.ToByteArray().Reverse();
-#else
-            return result.ToByteArray().Reverse().ToArray();
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Security/Cryptography/DsaDigitalSignature.cs b/src/Renci.SshNet/Security/Cryptography/DsaDigitalSignature.cs
index 97f65a63..480a3238 100644
--- a/src/Renci.SshNet/Security/Cryptography/DsaDigitalSignature.cs
+++ b/src/Renci.SshNet/Security/Cryptography/DsaDigitalSignature.cs
@@ -154,50 +154,42 @@ namespace Renci.SshNet.Security.Cryptography
         private bool _isDisposed;
 
         /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged ResourceMessages.
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
         public void Dispose()
         {
             Dispose(true);
-
             GC.SuppressFinalize(this);
         }
 
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources
         /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged ResourceMessages.</param>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected virtual void Dispose(bool disposing)
         {
-            // Check to see if Dispose has already been called.
-            if (!_isDisposed)
+            if (_isDisposed)
+                return;
+
+            if (disposing)
             {
-                // If disposing equals true, dispose all managed
-                // and unmanaged ResourceMessages.
-                if (disposing)
+                var hash = _hash;
+                if (hash != null)
                 {
-                    // Dispose managed ResourceMessages.
-                    if (_hash != null)
-                    {
-                        _hash.Dispose();
-                        _hash = null;
-                    }
+                    hash.Dispose();
+                    _hash = null;
                 }
 
-                // Note disposing has been done.
                 _isDisposed = true;
             }
         }
 
         /// <summary>
         /// Releases unmanaged resources and performs other cleanup operations before the
-        /// <see cref="SshCommand"/> is reclaimed by garbage collection.
+        /// <see cref="DsaDigitalSignature"/> is reclaimed by garbage collection.
         /// </summary>
         ~DsaDigitalSignature()
         {
-            // Do not re-create Dispose clean-up code here.
-            // Calling Dispose(false) is optimal in terms of
-            // readability and maintainability.
             Dispose(false);
         }
 
diff --git a/src/Renci.SshNet/Security/Cryptography/DsaKey.cs b/src/Renci.SshNet/Security/Cryptography/DsaKey.cs
index bf5e9727..0a6644c4 100644
--- a/src/Renci.SshNet/Security/Cryptography/DsaKey.cs
+++ b/src/Renci.SshNet/Security/Cryptography/DsaKey.cs
@@ -157,50 +157,42 @@ namespace Renci.SshNet.Security
         private bool _isDisposed;
 
         /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged ResourceMessages.
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
         public void Dispose()
         {
             Dispose(true);
-
             GC.SuppressFinalize(this);
         }
 
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources
         /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged ResourceMessages.</param>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected virtual void Dispose(bool disposing)
         {
-            // Check to see if Dispose has already been called.
-            if (!_isDisposed)
+            if (_isDisposed)
+                return;
+
+            if (disposing)
             {
-                // If disposing equals true, dispose all managed
-                // and unmanaged ResourceMessages.
-                if (disposing)
+                var digitalSignature = _digitalSignature;
+                if (digitalSignature != null)
                 {
-                    // Dispose managed ResourceMessages.
-                    if (_digitalSignature != null)
-                    {
-                        _digitalSignature.Dispose();
-                        _digitalSignature = null;
-                    }
+                    digitalSignature.Dispose();
+                    _digitalSignature = null;
                 }
 
-                // Note disposing has been done.
                 _isDisposed = true;
             }
         }
 
         /// <summary>
         /// Releases unmanaged resources and performs other cleanup operations before the
-        /// <see cref="SshCommand"/> is reclaimed by garbage collection.
+        /// <see cref="DsaKey"/> is reclaimed by garbage collection.
         /// </summary>
         ~DsaKey()
         {
-            // Do not re-create Dispose clean-up code here.
-            // Calling Dispose(false) is optimal in terms of
-            // readability and maintainability.
             Dispose(false);
         }
 
diff --git a/src/Renci.SshNet/Security/Cryptography/RsaDigitalSignature.cs b/src/Renci.SshNet/Security/Cryptography/RsaDigitalSignature.cs
index 15ab48cf..7c27aed5 100644
--- a/src/Renci.SshNet/Security/Cryptography/RsaDigitalSignature.cs
+++ b/src/Renci.SshNet/Security/Cryptography/RsaDigitalSignature.cs
@@ -39,7 +39,7 @@ namespace Renci.SshNet.Security.Cryptography
         private bool _isDisposed;
 
         /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged ResourceMessages.
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
         public void Dispose()
         {
@@ -50,7 +50,7 @@ namespace Renci.SshNet.Security.Cryptography
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources
         /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged ResourceMessages.</param>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected virtual void Dispose(bool disposing)
         {
             if (_isDisposed)
@@ -58,9 +58,10 @@ namespace Renci.SshNet.Security.Cryptography
 
             if (disposing)
             {
-                if (_hash != null)
+                var hash = _hash;
+                if (hash != null)
                 {
-                    _hash.Dispose();
+                    hash.Dispose();
                     _hash = null;
                 }
 
@@ -70,13 +71,10 @@ namespace Renci.SshNet.Security.Cryptography
 
         /// <summary>
         /// Releases unmanaged resources and performs other cleanup operations before the
-        /// <see cref="SshCommand"/> is reclaimed by garbage collection.
+        /// <see cref="RsaDigitalSignature"/> is reclaimed by garbage collection.
         /// </summary>
         ~RsaDigitalSignature()
         {
-            // Do not re-create Dispose clean-up code here.
-            // Calling Dispose(false) is optimal in terms of
-            // readability and maintainability.
             Dispose(false);
         }
 
diff --git a/src/Renci.SshNet/Security/Cryptography/RsaKey.cs b/src/Renci.SshNet/Security/Cryptography/RsaKey.cs
index a5f4f669..54e58841 100644
--- a/src/Renci.SshNet/Security/Cryptography/RsaKey.cs
+++ b/src/Renci.SshNet/Security/Cryptography/RsaKey.cs
@@ -212,50 +212,42 @@ namespace Renci.SshNet.Security
         private bool _isDisposed;
 
         /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged ResourceMessages.
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
         public void Dispose()
         {
             Dispose(true);
-
             GC.SuppressFinalize(this);
         }
 
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources
         /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged ResourceMessages.</param>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected virtual void Dispose(bool disposing)
         {
-            // Check to see if Dispose has already been called.
-            if (!_isDisposed)
+            if (_isDisposed)
+                return;
+
+            if (disposing)
             {
-                // If disposing equals true, dispose all managed
-                // and unmanaged ResourceMessages.
-                if (disposing)
+                var digitalSignature = _digitalSignature;
+                if (digitalSignature != null)
                 {
-                    // Dispose managed ResourceMessages.
-                    if (_digitalSignature != null)
-                    {
-                        _digitalSignature.Dispose();
-                        _digitalSignature = null;
-                    }
+                    digitalSignature.Dispose();
+                    _digitalSignature = null;
                 }
 
-                // Note disposing has been done.
                 _isDisposed = true;
             }
         }
 
         /// <summary>
         /// Releases unmanaged resources and performs other cleanup operations before the
-        /// <see cref="SshCommand"/> is reclaimed by garbage collection.
+        /// <see cref="RsaKey"/> is reclaimed by garbage collection.
         /// </summary>
         ~RsaKey()
         {
-            // Do not re-create Dispose clean-up code here.
-            // Calling Dispose(false) is optimal in terms of
-            // readability and maintainability.
             Dispose(false);
         }
 
diff --git a/src/Renci.SshNet/Security/GroupExchangeHashData.cs b/src/Renci.SshNet/Security/GroupExchangeHashData.cs
index 5e276aaf..a0cb4788 100644
--- a/src/Renci.SshNet/Security/GroupExchangeHashData.cs
+++ b/src/Renci.SshNet/Security/GroupExchangeHashData.cs
@@ -5,7 +5,6 @@ namespace Renci.SshNet.Security
 {
     internal class GroupExchangeHashData : SshData
     {
-#if TUNING
         private byte[] _serverVersion;
         private byte[] _clientVersion;
         private byte[] _prime;
@@ -13,27 +12,19 @@ namespace Renci.SshNet.Security
         private byte[] _clientExchangeValue;
         private byte[] _serverExchangeValue;
         private byte[] _sharedKey;
-#endif
 
-#if TUNING
         public string ServerVersion
         {
             private get { return Utf8.GetString(_serverVersion, 0, _serverVersion.Length); }
             set { _serverVersion = Utf8.GetBytes(value); }
         }
-#else
-        public string ServerVersion { get; set; }
-#endif
 
-#if TUNING
+
         public string ClientVersion
         {
             private get { return Utf8.GetString(_clientVersion, 0, _clientVersion.Length); }
             set { _clientVersion = Utf8.GetBytes(value); }
         }
-#else
-        public string ClientVersion { get; set; }
-#endif
 
         public byte[] ClientPayload { get; set; }
 
@@ -47,57 +38,36 @@ namespace Renci.SshNet.Security
 
         public uint MaximumGroupSize { get; set; }
 
-#if TUNING
         public BigInteger Prime
         {
             private get { return _prime.ToBigInteger(); }
             set { _prime = value.ToByteArray().Reverse(); }
         }
-#else
-        public BigInteger Prime { get; set; }
-#endif
 
-#if TUNING
         public BigInteger SubGroup
         {
             private get { return _subGroup.ToBigInteger(); }
             set { _subGroup = value.ToByteArray().Reverse(); }
         }
-#else
-        public BigInteger SubGroup { get; set; }
-#endif
 
-#if TUNING
         public BigInteger ClientExchangeValue
         {
             private get { return _clientExchangeValue.ToBigInteger(); }
             set { _clientExchangeValue = value.ToByteArray().Reverse(); }
         }
-#else
-        public BigInteger ClientExchangeValue { get; set; }
-#endif
 
-#if TUNING
         public BigInteger ServerExchangeValue
         {
             private get { return _serverExchangeValue.ToBigInteger(); }
             set { _serverExchangeValue = value.ToByteArray().Reverse(); }
         }
-#else
-        public BigInteger ServerExchangeValue { get; set; }
-#endif
 
-#if TUNING
         public BigInteger SharedKey
         {
             private get { return _sharedKey.ToBigInteger(); }
             set { _sharedKey = value.ToByteArray().Reverse(); }
         }
-#else
-        public BigInteger SharedKey { get; set; }
-#endif
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -135,7 +105,6 @@ namespace Renci.SshNet.Security
                 return capacity;
             }
         }
-#endif
 
         protected override void LoadData()
         {
@@ -144,32 +113,19 @@ namespace Renci.SshNet.Security
 
         protected override void SaveData()
         {
-#if TUNING
             WriteBinaryString(_clientVersion);
             WriteBinaryString(_serverVersion);
-#else
-            Write(ClientVersion);
-            Write(ServerVersion);
-#endif
             WriteBinaryString(ClientPayload);
             WriteBinaryString(ServerPayload);
             WriteBinaryString(HostKey);
             Write(MinimumGroupSize);
             Write(PreferredGroupSize);
             Write(MaximumGroupSize);
-#if TUNING
             WriteBinaryString(_prime);
             WriteBinaryString(_subGroup);
             WriteBinaryString(_clientExchangeValue);
             WriteBinaryString(_serverExchangeValue);
             WriteBinaryString(_sharedKey);
-#else
-            Write(Prime);
-            Write(SubGroup);
-            Write(ClientExchangeValue);
-            Write(ServerExchangeValue);
-            Write(SharedKey);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Security/KeyExchange.cs b/src/Renci.SshNet/Security/KeyExchange.cs
index b2e348ba..ef991633 100644
--- a/src/Renci.SshNet/Security/KeyExchange.cs
+++ b/src/Renci.SshNet/Security/KeyExchange.cs
@@ -378,7 +378,6 @@ namespace Renci.SshNet.Security
 
         private class _SessionKeyGeneration : SshData
         {
-#if TUNING
             private byte[] _sharedKey;
 
             public BigInteger SharedKey
@@ -386,14 +385,10 @@ namespace Renci.SshNet.Security
                 private get { return _sharedKey.ToBigInteger(); }
                 set { _sharedKey = value.ToByteArray().Reverse(); }
             }
-#else
-            public BigInteger SharedKey { get; set; }
-#endif
             public byte[] ExchangeHash { get; set; }
             public char Char { get; set; }
             public byte[] SessionId { get; set; }
 
-#if TUNING
             /// <summary>
             /// Gets the size of the message in bytes.
             /// </summary>
@@ -413,7 +408,6 @@ namespace Renci.SshNet.Security
                     return capacity;
                 }
             }
-#endif
 
             protected override void LoadData()
             {
@@ -422,20 +416,15 @@ namespace Renci.SshNet.Security
 
             protected override void SaveData()
             {
-#if TUNING
                 WriteBinaryString(_sharedKey);
-#else
-                this.Write(this.SharedKey);
-#endif
                 Write(ExchangeHash);
-                Write((byte)Char);
+                Write((byte) Char);
                 Write(SessionId);
             }
         }
 
         private class _SessionKeyAdjustment : SshData
         {
-#if TUNING
             private byte[] _sharedKey;
 
             public BigInteger SharedKey
@@ -443,13 +432,9 @@ namespace Renci.SshNet.Security
                 private get { return _sharedKey.ToBigInteger(); }
                 set { _sharedKey = value.ToByteArray().Reverse(); }
             }
-#else
-            public BigInteger SharedKey { get; set; }
-#endif
             public byte[] ExcahngeHash { get; set; }
             public byte[] Key { get; set; }
 
-#if TUNING
             /// <summary>
             /// Gets the size of the message in bytes.
             /// </summary>
@@ -468,7 +453,6 @@ namespace Renci.SshNet.Security
                     return capacity;
                 }
             }
-#endif
 
             protected override void LoadData()
             {
@@ -477,11 +461,7 @@ namespace Renci.SshNet.Security
 
             protected override void SaveData()
             {
-#if TUNING
                 WriteBinaryString(_sharedKey);
-#else
-                this.Write(this.SharedKey);
-#endif
                 Write(ExcahngeHash);
                 Write(Key);
             }
@@ -490,19 +470,18 @@ namespace Renci.SshNet.Security
         #region IDisposable Members
 
         /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged ResourceMessages.
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
         public void Dispose()
         {
             Dispose(true);
-
             GC.SuppressFinalize(this);
         }
 
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources
         /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged ResourceMessages.</param>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected virtual void Dispose(bool disposing)
         {
         }
@@ -513,9 +492,6 @@ namespace Renci.SshNet.Security
         /// </summary>
         ~KeyExchange()
         {
-            // Do not re-create Dispose clean-up code here.
-            // Calling Dispose(false) is optimal in terms of
-            // readability and maintainability.
             Dispose(false);
         }
 
diff --git a/src/Renci.SshNet/Security/KeyExchangeDiffieHellmanGroupSha1.cs b/src/Renci.SshNet/Security/KeyExchangeDiffieHellmanGroupSha1.cs
index d124f8a3..94e0a729 100644
--- a/src/Renci.SshNet/Security/KeyExchangeDiffieHellmanGroupSha1.cs
+++ b/src/Renci.SshNet/Security/KeyExchangeDiffieHellmanGroupSha1.cs
@@ -91,7 +91,6 @@ namespace Renci.SshNet.Security
 
         private class _ExchangeHashData : SshData
         {
-#if TUNING
             private byte[] _serverVersion;
             private byte[] _clientVersion;
             private byte[] _clientExchangeValue;
@@ -103,19 +102,12 @@ namespace Renci.SshNet.Security
                 private get { return Utf8.GetString(_serverVersion, 0, _serverVersion.Length); }
                 set { _serverVersion = Utf8.GetBytes(value); }
             }
-#else
-            public string ServerVersion { get; set; }
-#endif
 
-#if TUNING
             public string ClientVersion
             {
                 private get { return Utf8.GetString(_clientVersion, 0, _clientVersion.Length); }
                 set { _clientVersion = Utf8.GetBytes(value); }
             }
-#else
-            public string ClientVersion { get; set; }
-#endif
 
             public byte[] ClientPayload { get; set; }
 
@@ -123,37 +115,24 @@ namespace Renci.SshNet.Security
 
             public byte[] HostKey { get; set; }
 
-#if TUNING
             public BigInteger ClientExchangeValue
             {
                 private get { return _clientExchangeValue.ToBigInteger(); }
                 set { _clientExchangeValue = value.ToByteArray().Reverse(); }
             }
-#else
-            public BigInteger ClientExchangeValue { get; set; }
-#endif
 
-#if TUNING
             public BigInteger ServerExchangeValue
             {
                 private get { return _serverExchangeValue.ToBigInteger(); }
                 set { _serverExchangeValue = value.ToByteArray().Reverse(); }
             }
-#else
-            public BigInteger ServerExchangeValue { get; set; }
-#endif
 
-#if TUNING
             public BigInteger SharedKey
             {
                 private get { return _sharedKey.ToBigInteger(); }
                 set { _sharedKey = value.ToByteArray().Reverse(); }
             }
-#else
-            public BigInteger SharedKey { get; set; }
-#endif
 
-#if TUNING
             /// <summary>
             /// Gets the size of the message in bytes.
             /// </summary>
@@ -184,7 +163,6 @@ namespace Renci.SshNet.Security
                     return capacity;
                 }
             }
-#endif
 
             protected override void LoadData()
             {
@@ -193,25 +171,14 @@ namespace Renci.SshNet.Security
 
             protected override void SaveData()
             {
-#if TUNING
                 WriteBinaryString(_clientVersion);
                 WriteBinaryString(_serverVersion);
-#else
-                Write(ClientVersion);
-                Write(ServerVersion);
-#endif
                 WriteBinaryString(ClientPayload);
                 WriteBinaryString(ServerPayload);
                 WriteBinaryString(HostKey);
-#if TUNING
                 WriteBinaryString(_clientExchangeValue);
                 WriteBinaryString(_serverExchangeValue);
                 WriteBinaryString(_sharedKey);
-#else
-                Write(ClientExchangeValue);
-                Write(ServerExchangeValue);
-                Write(SharedKey);
-#endif
             }
         }
     }
diff --git a/src/Renci.SshNet/Security/KeyHostAlgorithm.cs b/src/Renci.SshNet/Security/KeyHostAlgorithm.cs
index f5322aa8..b02f0985 100644
--- a/src/Renci.SshNet/Security/KeyHostAlgorithm.cs
+++ b/src/Renci.SshNet/Security/KeyHostAlgorithm.cs
@@ -81,7 +81,6 @@ namespace Renci.SshNet.Security
 
         private class SshKeyData : SshData
         {
-#if TUNING
             private byte[] _name;
             private IList<byte[]> _keys;
 
@@ -106,37 +105,28 @@ namespace Renci.SshNet.Security
                     }
                 }
             }
-#else
-            public BigInteger[] Keys { get; private set; }
-#endif
 
-#if TUNING
             private string Name
             {
                 get { return Utf8.GetString(_name, 0, _name.Length); }
                 set { _name = Utf8.GetBytes(value); }
             }
-#else
-            private string Name { get; set; }
-#endif
 
-#if TUNING
-        protected override int BufferCapacity
-        {
-            get
+            protected override int BufferCapacity
             {
-                var capacity = base.BufferCapacity;
-                capacity += 4; // Name length
-                capacity += _name.Length; // Name
-                foreach (var key in _keys)
+                get
                 {
-                    capacity += 4; // Key length
-                    capacity += key.Length; // Key
+                    var capacity = base.BufferCapacity;
+                    capacity += 4; // Name length
+                    capacity += _name.Length; // Name
+                    foreach (var key in _keys)
+                    {
+                        capacity += 4; // Key length
+                        capacity += key.Length; // Key
+                    }
+                    return capacity;
                 }
-                return capacity;
             }
-        }
-#endif
 
             public SshKeyData()
             {
@@ -150,44 +140,23 @@ namespace Renci.SshNet.Security
 
             protected override void LoadData()
             {
-#if TUNING
                 _name = ReadBinary();
                 _keys = new List<byte[]>();
-#else
-                this.Name = this.ReadString();
-                var keys = new List<BigInteger>();
-#endif
+
                 while (!IsEndOfData)
                 {
-#if TUNING
                     _keys.Add(ReadBinary());
-#else
-                    keys.Add(this.ReadBigInt());
-#endif
                 }
-#if !TUNING
-                this.Keys = keys.ToArray();
-#endif
             }
 
             protected override void SaveData()
             {
-#if TUNING
                 WriteBinaryString(_name);
-#else
-                this.Write(this.Name);
-#endif
-#if TUNING
+
                 foreach (var key in _keys)
                 {
                     WriteBinaryString(key);
                 }
-#else
-                foreach (var key in this.Keys)
-                {
-                    this.Write(key);
-                }
-#endif
             }
         }
 
@@ -199,11 +168,7 @@ namespace Renci.SshNet.Security
             /// <value>
             /// The name of the algorithm.
             /// </value>
-#if TUNING
             private byte[] AlgorithmName { get; set; }
-#else
-            private string AlgorithmName { get; set; }
-#endif
 
             /// <summary>
             /// Gets or sets the signature.
@@ -213,7 +178,6 @@ namespace Renci.SshNet.Security
             /// </value>
             public byte[] Signature { get; private set; }
 
-#if TUNING
             /// <summary>
             /// Gets the size of the message in bytes.
             /// </summary>
@@ -232,7 +196,6 @@ namespace Renci.SshNet.Security
                     return capacity;
                 }
             }
-#endif
 
             public SignatureKeyData()
             {
@@ -240,11 +203,7 @@ namespace Renci.SshNet.Security
 
             public SignatureKeyData(string name, byte[] signature)
             {
-#if TUNING
                 AlgorithmName = Utf8.GetBytes(name);
-#else
-                this.AlgorithmName = name;
-#endif
                 Signature = signature;
             }
 
@@ -253,13 +212,8 @@ namespace Renci.SshNet.Security
             /// </summary>
             protected override void LoadData()
             {
-#if TUNING
                 AlgorithmName = ReadBinary();
                 Signature = ReadBinary();
-#else
-                this.AlgorithmName = this.ReadString();
-                this.Signature = this.ReadBinaryString();
-#endif
             }
 
             /// <summary>
@@ -267,11 +221,7 @@ namespace Renci.SshNet.Security
             /// </summary>
             protected override void SaveData()
             {
-#if TUNING
                 WriteBinaryString(AlgorithmName);
-#else
-                this.Write(this.AlgorithmName);
-#endif
                 WriteBinaryString(Signature);
             }
         }
diff --git a/src/Renci.SshNet/Session.NET.cs b/src/Renci.SshNet/Session.NET.cs
index 5284e23e..b509e2b6 100644
--- a/src/Renci.SshNet/Session.NET.cs
+++ b/src/Renci.SshNet/Session.NET.cs
@@ -11,6 +11,7 @@ namespace Renci.SshNet
         private readonly object _socketReadLock = new object();
 #endif // FEATURE_SOCKET_POLL
 
+#if FEATURE_SOCKET_POLL
         /// <summary>
         /// Gets a value indicating whether the socket is connected.
         /// </summary>
@@ -21,7 +22,6 @@ namespace Renci.SshNet
         /// <c>true</c>. However, this only returns the state of the socket as of
         /// the last I/O operation.
         /// </para>
-#if FEATURE_SOCKET_POLL
         /// <para>
         /// Therefore we use the combination of <see cref="Socket.Poll(int, SelectMode)"/> with mode <see cref="SelectMode.SelectRead"/>
         /// and <see cref="Socket.Available"/> to verify if the socket is still connected.
@@ -49,6 +49,15 @@ namespace Renci.SshNet
         /// when bytes are read from the <see cref="Socket"/>.
         /// </para>
         /// </remarks>
+#else
+        /// <summary>
+        /// Gets a value indicating whether the socket is connected.
+        /// </summary>
+        /// <param name="isConnected"><c>true</c> if the socket is connected; otherwise, <c>false</c></param>
+        /// <remarks>
+        /// We verify whether <see cref="Socket.Connected"/> is <c>true</c>. However, this only returns the state
+        /// of the socket as of the last I/O operation.
+        /// </remarks>
 #endif
         partial void IsSocketConnected(ref bool isConnected)
         {
diff --git a/src/Renci.SshNet/Session.cs b/src/Renci.SshNet/Session.cs
index 61b5f802..2d98e322 100644
--- a/src/Renci.SshNet/Session.cs
+++ b/src/Renci.SshNet/Session.cs
@@ -67,10 +67,6 @@ namespace Renci.SshNet
         /// </value>
         private const int LocalChannelDataPacketSize = 1024*64;
 
-#if !TUNING
-        private static readonly RandomNumberGenerator Randomizer = HashAlgorithmFactory.CreateRandomNumberGenerator();
-#endif
-
 #if SILVERLIGHT
         private static readonly Regex ServerVersionRe = new Regex("^SSH-(?<protoversion>[^-]+)-(?<softwareversion>.+)( SP.+)?$");
 #else
@@ -786,40 +782,7 @@ namespace Renci.SshNet
             //  Messages can be sent by different thread so we need to synchronize it
             var paddingMultiplier = _clientCipher == null ? (byte)8 : Math.Max((byte)8, _serverCipher.MinimumSize);    //    Should be recalculate base on cipher min length if cipher specified
 
-#if TUNING
             var packetData = message.GetPacket(paddingMultiplier, _clientCompression);
-#else
-            var messageData = message.GetBytes();
-
-            if (_clientCompression != null)
-            {
-                messageData = _clientCompression.Compress(messageData);
-            }
-
-            var packetLength = messageData.Length + 4 + 1; //  add length bytes and padding byte
-            var paddingLength = (byte)((-packetLength) & (paddingMultiplier - 1));
-            if (paddingLength < paddingMultiplier)
-            {
-                paddingLength += paddingMultiplier;
-            }
-
-            //  Build Packet data
-            var packetData = new byte[4 + 1 + messageData.Length + paddingLength];
-
-            //  Add packet length
-            ((uint)packetData.Length - 4).GetBytes().CopyTo(packetData, 0);
-
-            //  Add packet padding length
-            packetData[4] = paddingLength;
-
-            //  Add packet payload
-            messageData.CopyTo(packetData, 4 + 1);
-
-            //  Add random padding
-            var paddingBytes = new byte[paddingLength];
-            Randomizer.GetBytes(paddingBytes);
-            paddingBytes.CopyTo(packetData, 4 + 1 + messageData.Length);
-#endif
 
             //  Lock handling of _outboundPacketSequence since it must be sent sequently to server
             lock (_socketLock)
@@ -827,7 +790,6 @@ namespace Renci.SshNet
                 if (_socket == null || !_socket.Connected)
                     throw new SshConnectionException("Client not connected.");
 
-#if TUNING
                 byte[] hash = null;
                 var packetDataOffset = 4; // first four bytes are reserved for outbound packet sequence
 
@@ -838,22 +800,12 @@ namespace Renci.SshNet
                     //  calculate packet hash
                     hash = _clientMac.ComputeHash(packetData);
                 }
-#else
-                //  Calculate packet hash
-                var hashData = new byte[4 + packetData.Length];
-                _outboundPacketSequence.GetBytes().CopyTo(hashData, 0);
-                packetData.CopyTo(hashData, 4);
-#endif
 
                 //  Encrypt packet data
                 if (_clientCipher != null)
                 {
-#if TUNING
                     packetData = _clientCipher.Encrypt(packetData, packetDataOffset, (packetData.Length - packetDataOffset));
                     packetDataOffset = 0;
-#else
-                    packetData = _clientCipher.Encrypt(packetData);
-#endif
                 }
 
                 if (packetData.Length > MaximumSshPacketSize)
@@ -861,31 +813,16 @@ namespace Renci.SshNet
                     throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, "Packet is too big. Maximum packet size is {0} bytes.", MaximumSshPacketSize));
                 }
 
-#if TUNING
                 var packetLength = packetData.Length - packetDataOffset;
                 if (hash == null)
                 {
                     SocketAbstraction.Send(_socket, packetData, packetDataOffset, packetLength);
                 }
-#else
-                if (_clientMac == null)
-                {
-                    SocketAbstraction.Send(_socket, packetData, 0, packetData.Length);
-                }
-#endif
                 else
                 {
-#if TUNING
                     var data = new byte[packetLength + (_clientMac.HashSize / 8)];
                     Buffer.BlockCopy(packetData, packetDataOffset, data, 0, packetLength);
                     Buffer.BlockCopy(hash, 0, data, packetLength, hash.Length);
-#else
-                    var hash = _clientMac.ComputeHash(hashData.ToArray());
-
-                    var data = new byte[packetData.Length + _clientMac.HashSize / 8];
-                    packetData.CopyTo(data, 0);
-                    hash.CopyTo(data, packetData.Length);
-#endif
 
                     SocketAbstraction.Send(_socket, data, 0, data.Length);
                 }
@@ -977,9 +914,7 @@ namespace Renci.SshNet
         /// <exception cref="SshConnectionException"></exception>
         private Message ReceiveMessage()
         {
-#if TUNING
             const int inboundPacketSequenceLength = 4;
-#endif
 
             //  No lock needed since all messages read by only one thread
             var blockSize = _serverCipher == null ? (byte)8 : Math.Max((byte)8, _serverCipher.MinimumSize);
@@ -1001,15 +936,9 @@ namespace Renci.SshNet
             //  Read rest of the packet data
             var bytesToRead = (int)(packetLength - (blockSize - 4));
 
-#if TUNING
             var data = new byte[bytesToRead + blockSize + inboundPacketSequenceLength];
             _inboundPacketSequence.Write(data, 0);
             Buffer.BlockCopy(firstBlock, 0, data, inboundPacketSequenceLength, firstBlock.Length);
-#else
-            var data = new byte[bytesToRead + blockSize];
-
-            firstBlock.CopyTo(data, 0);
-#endif
 
             byte[] serverHash = null;
             if (_serverMac != null)
@@ -1034,43 +963,20 @@ namespace Renci.SshNet
                     {
                         nextBlocks = _serverCipher.Decrypt(nextBlocks);
                     }
-#if TUNING
+
                     nextBlocks.CopyTo(data, blockSize + inboundPacketSequenceLength);
-#else
-                    nextBlocks.CopyTo(data, blockSize);
-#endif
                 }
             }
 
-#if TUNING
             var paddingLength = data[inboundPacketSequenceLength + 4];
-#else
-            var paddingLength = data[4];
-#endif
 
             var messagePayloadLength = (int) (packetLength - paddingLength - 1);
-#if TUNING
             const int messagePayloadOffset = inboundPacketSequenceLength + 4 + 1;
-#else
-            var messagePayload = new byte[messagePayloadLength];
-            Buffer.BlockCopy(data, 5, messagePayload, 0, messagePayload.Length);
-#endif
 
             //  Validate message against MAC
             if (_serverMac != null)
             {
-#if TUNING
                 var clientHash = _serverMac.ComputeHash(data);
-#else
-                var clientHashData = new byte[4 + data.Length];
-                var lengthBytes = _inboundPacketSequence.GetBytes();
-
-                lengthBytes.CopyTo(clientHashData, 0);
-                data.CopyTo(clientHashData, 4);
-
-                //  Calculate packet hash
-                var clientHash = _serverMac.ComputeHash(clientHashData);
-#endif
 
                 if (!serverHash.SequenceEqual(clientHash))
                 {
@@ -1080,20 +986,12 @@ namespace Renci.SshNet
 
             if (_serverDecompression != null)
             {
-#if TUNING
                 data = _serverDecompression.Decompress(data, inboundPacketSequenceLength + 4 + 1, messagePayloadLength);
-#else
-                messagePayload = _serverDecompression.Decompress(messagePayload);
-#endif
             }
 
             _inboundPacketSequence++;
 
-#if TUNING
             return LoadMessage(data, messagePayloadOffset);
-#else
-            return LoadMessage(messagePayload);
-#endif
         }
 
         private void SendDisconnect(DisconnectReason reasonCode, string message)
@@ -1776,7 +1674,6 @@ namespace Renci.SshNet
             InternalUnRegisterMessage(messageName);
         }
 
-#if TUNING
         /// <summary>
         /// Loads a message from a given buffer.
         /// </summary>
@@ -1801,28 +1698,6 @@ namespace Renci.SshNet
 
             return message;
         }
-#else
-        /// <summary>
-        /// Loads the message.
-        /// </summary>
-        /// <param name="data">Message data.</param>
-        /// <returns>New message</returns>
-        private Message LoadMessage(byte[] data)
-        {
-            var messageType = data[0];
-            var messageMetadata = (from m in _messagesMetadata where m.Number == messageType && m.Enabled && m.Activated select m).SingleOrDefault();
-            if (messageMetadata == null)
-                throw new SshException(string.Format(CultureInfo.CurrentCulture, "Message type {0} is not valid.", messageType));
-
-            var message = messageMetadata.Type.CreateInstance<Message>();
-
-            message.Load(data);
-
-            DiagnosticAbstraction.Log(string.Format("ReceiveMessage from server: '{0}': '{1}'.", message.GetType().Name, message));
-
-            return message;
-        }
-#endif
 
         partial void InternalRegisterMessage(string messageName);
 
@@ -2348,7 +2223,7 @@ namespace Renci.SshNet
         private bool _disposed;
 
         /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged ResourceMessages.
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
         public void Dispose()
         {
@@ -2359,69 +2234,73 @@ namespace Renci.SshNet
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources
         /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged ResourceMessages.</param>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected virtual void Dispose(bool disposing)
         {
-            // Check to see if Dispose has already been called.
-            if (!_disposed)
+            if (_disposed)
+                return;
+
+            if (disposing)
             {
-                // If disposing equals true, dispose all managed
-                // and unmanaged ResourceMessages.
-                if (disposing)
+                Disconnect();
+
+                var serviceAccepted = _serviceAccepted;
+                if (serviceAccepted != null)
                 {
-                    Disconnect();
-
-                    if (_serviceAccepted != null)
-                    {
-                        _serviceAccepted.Dispose();
-                        _serviceAccepted = null;
-                    }
-
-                    if (_exceptionWaitHandle != null)
-                    {
-                        _exceptionWaitHandle.Dispose();
-                        _exceptionWaitHandle = null;
-                    }
-
-                    if (_keyExchangeCompletedWaitHandle != null)
-                    {
-                        _keyExchangeCompletedWaitHandle.Dispose();
-                        _keyExchangeCompletedWaitHandle = null;
-                    }
-
-                    if (_serverMac != null)
-                    {
-                        _serverMac.Dispose();
-                        _serverMac = null;
-                    }
-
-                    if (_clientMac != null)
-                    {
-                        _clientMac.Dispose();
-                        _clientMac = null;
-                    }
-
-                    if (_keyExchange != null)
-                    {
-                        _keyExchange.HostKeyReceived -= KeyExchange_HostKeyReceived;
-                        _keyExchange.Dispose();
-                        _keyExchange = null;
-                    }
-
-                    if (_bytesReadFromSocket != null)
-                    {
-                        _bytesReadFromSocket.Dispose();
-                        _bytesReadFromSocket = null;
-                    }
-
-                    if (_messageListenerCompleted != null)
-                    {
-                        _messageListenerCompleted.Dispose();
-                        _messageListenerCompleted = null;
-                    }
+                    serviceAccepted.Dispose();
+                    _serviceAccepted = null;
+                }
+
+                var exceptionWaitHandle = _exceptionWaitHandle;
+                if (exceptionWaitHandle != null)
+                {
+                    exceptionWaitHandle.Dispose();
+                    _exceptionWaitHandle = null;
+                }
+
+                var keyExchangeCompletedWaitHandle = _keyExchangeCompletedWaitHandle;
+                if (keyExchangeCompletedWaitHandle != null)
+                {
+                    keyExchangeCompletedWaitHandle.Dispose();
+                    _keyExchangeCompletedWaitHandle = null;
+                }
+
+                var serverMac = _serverMac;
+                if (serverMac != null)
+                {
+                    serverMac.Dispose();
+                    _serverMac = null;
+                }
+
+                var clientMac = _clientMac;
+                if (clientMac != null)
+                {
+                    clientMac.Dispose();
+                    _clientMac = null;
+                }
+
+                var keyExchange = _keyExchange;
+                if (keyExchange != null)
+                {
+                    keyExchange.HostKeyReceived -= KeyExchange_HostKeyReceived;
+                    keyExchange.Dispose();
+                    _keyExchange = null;
+                }
+
+                var bytesReadFromSocket = _bytesReadFromSocket;
+                if (bytesReadFromSocket != null)
+                {
+                    bytesReadFromSocket.Dispose();
+                    _bytesReadFromSocket = null;
+                }
+
+                var messageListenerCompleted = _messageListenerCompleted;
+                if (messageListenerCompleted != null)
+                {
+                    messageListenerCompleted.Dispose();
+                    _messageListenerCompleted = null;
                 }
 
-                // Note disposing has been done.
                 _disposed = true;
             }
         }
@@ -2432,9 +2311,6 @@ namespace Renci.SshNet
         /// </summary>
         ~Session()
         {
-            // Do not re-create Dispose clean-up code here.
-            // Calling Dispose(false) is optimal in terms of
-            // readability and maintainability.
             Dispose(false);
         }
 
diff --git a/src/Renci.SshNet/Sftp/ISftpSession.cs b/src/Renci.SshNet/Sftp/ISftpSession.cs
index 94a3c3ef..f3297ed6 100644
--- a/src/Renci.SshNet/Sftp/ISftpSession.cs
+++ b/src/Renci.SshNet/Sftp/ISftpSession.cs
@@ -156,17 +156,13 @@ namespace Renci.SshNet.Sftp
         /// <param name="handle">The handle.</param>
         /// <param name="offset">The offset.</param>
         /// <param name="data">The data to send.</param>
-#if TUNING
         /// <param name="length">The number of bytes of <paramref name="data"/> to send.</param>
-#endif
         /// <param name="wait">The wait event handle if needed.</param>
         /// <param name="writeCompleted">The callback to invoke when the write has completed.</param>
         void RequestWrite(byte[] handle,
                           ulong offset,
                           byte[] data,
-#if TUNING
                           int length,
-#endif
                           AutoResetEvent wait,
                           Action<SftpStatusResponse> writeCompleted = null);
 
diff --git a/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/FStatVfsRequest.cs b/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/FStatVfsRequest.cs
index 80c18c7b..d2c89524 100644
--- a/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/FStatVfsRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/FStatVfsRequest.cs
@@ -7,7 +7,6 @@ namespace Renci.SshNet.Sftp.Requests
     {
         public byte[] Handle { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -24,7 +23,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public FStatVfsRequest(uint protocolVersion, uint requestId, byte[] handle, Action<SftpExtendedReplyResponse> extendedAction, Action<SftpStatusResponse> statusAction)
             : base(protocolVersion, requestId, statusAction, "fstatvfs@openssh.com")
diff --git a/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/HardLinkRequest.cs b/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/HardLinkRequest.cs
index 3171bcd8..e2ff4b4e 100644
--- a/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/HardLinkRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/HardLinkRequest.cs
@@ -20,7 +20,6 @@ namespace Renci.SshNet.Sftp.Requests
             private set { _newPath = Utf8.GetBytes(value); }
         }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -39,7 +38,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public HardLinkRequest(uint protocolVersion, uint requestId, string oldPath, string newPath, Action<SftpStatusResponse> statusAction)
             : base(protocolVersion, requestId, statusAction, "hardlink@openssh.com")
diff --git a/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/PosixRenameRequest.cs b/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/PosixRenameRequest.cs
index 115a20cf..3a9e8b25 100644
--- a/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/PosixRenameRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/PosixRenameRequest.cs
@@ -23,7 +23,6 @@ namespace Renci.SshNet.Sftp.Requests
 
         public Encoding Encoding { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -42,7 +41,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public PosixRenameRequest(uint protocolVersion, uint requestId, string oldPath, string newPath, Encoding encoding, Action<SftpStatusResponse> statusAction)
             : base(protocolVersion, requestId, statusAction, "posix-rename@openssh.com")
diff --git a/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/StatVfsRequest.cs b/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/StatVfsRequest.cs
index 6c4b1cc7..9dad0ebe 100644
--- a/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/StatVfsRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/ExtendedRequests/StatVfsRequest.cs
@@ -16,7 +16,6 @@ namespace Renci.SshNet.Sftp.Requests
 
         public Encoding Encoding { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -33,7 +32,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public StatVfsRequest(uint protocolVersion, uint requestId, string path, Encoding encoding, Action<SftpExtendedReplyResponse> extendedAction, Action<SftpStatusResponse> statusAction)
             : base(protocolVersion, requestId, statusAction, "statvfs@openssh.com")
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpBlockRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpBlockRequest.cs
index 159a979f..cb9c5a0e 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpBlockRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpBlockRequest.cs
@@ -18,7 +18,6 @@ namespace Renci.SshNet.Sftp.Requests
 
         public uint LockMask { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -38,7 +37,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public SftpBlockRequest(uint protocolVersion, uint requestId, byte[] handle, UInt64 offset, UInt64 length, UInt32 lockMask, Action<SftpStatusResponse> statusAction)
             : base(protocolVersion, requestId, statusAction)
@@ -52,11 +50,7 @@ namespace Renci.SshNet.Sftp.Requests
         protected override void LoadData()
         {
             base.LoadData();
-#if TUNING
             Handle = ReadBinary();
-#else
-            Handle = this.ReadBinaryString();
-#endif
             Offset = ReadUInt64();
             Length = ReadUInt64();
             LockMask = ReadUInt32();
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpCloseRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpCloseRequest.cs
index bbca1857..80ab3be7 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpCloseRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpCloseRequest.cs
@@ -12,7 +12,6 @@ namespace Renci.SshNet.Sftp.Requests
 
         public byte[] Handle { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -29,7 +28,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public SftpCloseRequest(uint protocolVersion, uint requestId, byte[] handle, Action<SftpStatusResponse> statusAction)
             : base(protocolVersion, requestId, statusAction)
@@ -40,11 +38,7 @@ namespace Renci.SshNet.Sftp.Requests
         protected override void LoadData()
         {
             base.LoadData();
-#if TUNING
             Handle = ReadBinary();
-#else
-            Handle = this.ReadBinaryString();
-#endif
         }
 
         protected override void SaveData()
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpExtendedRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpExtendedRequest.cs
index a940f7b2..1ac9d771 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpExtendedRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpExtendedRequest.cs
@@ -23,7 +23,6 @@ namespace Renci.SshNet.Sftp.Requests
             }
         }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -40,7 +39,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         protected SftpExtendedRequest(uint protocolVersion, uint requestId, Action<SftpStatusResponse> statusAction, string name)
             : base(protocolVersion, requestId, statusAction)
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpFSetStatRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpFSetStatRequest.cs
index cdff836d..8240b079 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpFSetStatRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpFSetStatRequest.cs
@@ -5,9 +5,7 @@ namespace Renci.SshNet.Sftp.Requests
 {
     internal class SftpFSetStatRequest : SftpRequest
     {
-#if TUNING
         private byte[] _attributesBytes;
-#endif
 
         public override SftpMessageTypes SftpMessageType
         {
@@ -16,7 +14,6 @@ namespace Renci.SshNet.Sftp.Requests
 
         public byte[] Handle { get; private set; }
 
-#if TUNING
         private SftpFileAttributes Attributes { get; set; }
 
         private byte[] AttributesBytes
@@ -30,11 +27,7 @@ namespace Renci.SshNet.Sftp.Requests
                 return _attributesBytes;
             }
         }
-#else
-        public SftpFileAttributes Attributes { get; private set; }
-#endif
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -52,7 +45,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public SftpFSetStatRequest(uint protocolVersion, uint requestId, byte[] handle, SftpFileAttributes attributes, Action<SftpStatusResponse> statusAction)
             : base(protocolVersion, requestId, statusAction)
@@ -64,11 +56,7 @@ namespace Renci.SshNet.Sftp.Requests
         protected override void LoadData()
         {
             base.LoadData();
-#if TUNING
             Handle = ReadBinary();
-#else
-            Handle = this.ReadBinaryString();
-#endif
             Attributes = ReadAttributes();
         }
 
@@ -76,11 +64,7 @@ namespace Renci.SshNet.Sftp.Requests
         {
             base.SaveData();
             WriteBinaryString(Handle);
-#if TUNING
             Write(AttributesBytes);
-#else
-            Write(Attributes);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpFStatRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpFStatRequest.cs
index d5e5d63a..b1dc7358 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpFStatRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpFStatRequest.cs
@@ -12,7 +12,6 @@ namespace Renci.SshNet.Sftp.Requests
 
         public byte[] Handle { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -29,7 +28,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public SftpFStatRequest(uint protocolVersion, uint requestId, byte[] handle, Action<SftpAttrsResponse> attrsAction, Action<SftpStatusResponse> statusAction)
             : base(protocolVersion, requestId, statusAction)
@@ -41,11 +39,7 @@ namespace Renci.SshNet.Sftp.Requests
         protected override void LoadData()
         {
             base.LoadData();
-#if TUNING
             Handle = ReadBinary();
-#else
-            Handle = ReadBinaryString();
-#endif
         }
 
         protected override void SaveData()
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpInitRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpInitRequest.cs
index f7764a59..1dcaebe0 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpInitRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpInitRequest.cs
@@ -9,7 +9,6 @@
 
         public uint Version { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -25,7 +24,6 @@
                 return capacity;
             }
         }
-#endif
 
         public SftpInitRequest(uint version)
         {
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpLStatRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpLStatRequest.cs
index 7a4665b0..8f99e347 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpLStatRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpLStatRequest.cs
@@ -6,28 +6,21 @@ namespace Renci.SshNet.Sftp.Requests
 {
     internal class SftpLStatRequest : SftpRequest
     {
-#if TUNING
         private byte[] _path;
-#endif
 
         public override SftpMessageTypes SftpMessageType
         {
             get { return SftpMessageTypes.LStat; }
         }
 
-#if TUNING
         public string Path
         {
             get { return Encoding.GetString(_path, 0, _path.Length); }
             private set { _path = Encoding.GetBytes(value); }
         }
-#else
-        public string Path { get; private set; }
-#endif
 
         public Encoding Encoding { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -44,7 +37,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public SftpLStatRequest(uint protocolVersion, uint requestId, string path, Encoding encoding, Action<SftpAttrsResponse> attrsAction, Action<SftpStatusResponse> statusAction)
             : base(protocolVersion, requestId, statusAction)
@@ -57,21 +49,13 @@ namespace Renci.SshNet.Sftp.Requests
         protected override void LoadData()
         {
             base.LoadData();
-#if TUNING
             _path = ReadBinary();
-#else
-            Path = ReadString(Encoding);
-#endif
         }
 
         protected override void SaveData()
         {
             base.SaveData();
-#if TUNING
             WriteBinaryString(_path);
-#else
-            Write(Path, Encoding);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpLinkRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpLinkRequest.cs
index 240758ba..2d9f60a4 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpLinkRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpLinkRequest.cs
@@ -5,39 +5,28 @@ namespace Renci.SshNet.Sftp.Requests
 {
     internal class SftpLinkRequest : SftpRequest
     {
-#if TUNING
         private byte[] _newLinkPath;
         private byte[] _existingPath;
-#endif
 
         public override SftpMessageTypes SftpMessageType
         {
             get { return SftpMessageTypes.Link; }
         }
 
-#if TUNING
         public string NewLinkPath
         {
             get { return Utf8.GetString(_newLinkPath, 0, _newLinkPath.Length); }
             private set { _newLinkPath = Utf8.GetBytes(value); }
         }
-#else
-        public string NewLinkPath { get; private set; }
-#endif
 
-#if TUNING
         public string ExistingPath
         {
             get { return Utf8.GetString(_existingPath, 0, _existingPath.Length); }
             private set { _existingPath = Utf8.GetBytes(value); }
         }
-#else
-        public string ExistingPath { get; private set; }
-#endif
 
         public bool IsSymLink { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -57,7 +46,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SftpLinkRequest" /> class.
@@ -79,26 +67,16 @@ namespace Renci.SshNet.Sftp.Requests
         protected override void LoadData()
         {
             base.LoadData();
-#if TUNING
             _newLinkPath = ReadBinary();
             _existingPath = ReadBinary();
-#else
-            NewLinkPath = ReadString();
-            ExistingPath = ReadString();
-#endif
             IsSymLink = ReadBoolean();
         }
 
         protected override void SaveData()
         {
             base.SaveData();
-#if TUNING
             WriteBinaryString(_newLinkPath);
             WriteBinaryString(_existingPath);
-#else
-            Write(NewLinkPath);
-            Write(ExistingPath);
-#endif
             Write(IsSymLink);
         }
     }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpMkDirRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpMkDirRequest.cs
index 12f33021..176ca071 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpMkDirRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpMkDirRequest.cs
@@ -6,29 +6,22 @@ namespace Renci.SshNet.Sftp.Requests
 {
     internal class SftpMkDirRequest : SftpRequest
     {
-#if TUNING
         private byte[] _path;
         private byte[] _attributesBytes;
-#endif
 
         public override SftpMessageTypes SftpMessageType
         {
             get { return SftpMessageTypes.MkDir; }
         }
 
-#if TUNING
         public string Path
         {
             get { return Encoding.GetString(_path, 0, _path.Length); }
             private set { _path = Encoding.GetBytes(value); }
         }
-#else
-        public string Path { get; private set; }
-#endif
 
         public Encoding Encoding { get; private set; }
 
-#if TUNING
         private SftpFileAttributes Attributes { get; set; }
 
         private byte[] AttributesBytes
@@ -42,11 +35,7 @@ namespace Renci.SshNet.Sftp.Requests
                 return _attributesBytes;
             }
         }
-#else
-        public SftpFileAttributes Attributes { get; private set; }
-#endif
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -64,14 +53,9 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public SftpMkDirRequest(uint protocolVersion, uint requestId, string path, Encoding encoding, Action<SftpStatusResponse> statusAction)
-#if TUNING
             : this(protocolVersion, requestId, path, encoding, SftpFileAttributes.Empty, statusAction)
-#else
-            : this(protocolVersion, requestId, path, encoding, null, statusAction)
-#endif
         {
         }
 
@@ -86,24 +70,15 @@ namespace Renci.SshNet.Sftp.Requests
         protected override void LoadData()
         {
             base.LoadData();
-#if TUNING
             _path = ReadBinary();
-#else
-            Path = ReadString(Encoding);
-#endif
             Attributes = ReadAttributes();
         }
 
         protected override void SaveData()
         {
             base.SaveData();
-#if TUNING
             WriteBinaryString(_path);
             Write(AttributesBytes);
-#else
-            Write(Path, Encoding);
-            Write(Attributes);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpOpenDirRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpOpenDirRequest.cs
index d66158b4..0e6e76a7 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpOpenDirRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpOpenDirRequest.cs
@@ -6,28 +6,21 @@ namespace Renci.SshNet.Sftp.Requests
 {
     internal class SftpOpenDirRequest : SftpRequest
     {
-#if TUNING
         private byte[] _path;
-#endif
 
         public override SftpMessageTypes SftpMessageType
         {
             get { return SftpMessageTypes.OpenDir; }
         }
 
-#if TUNING
         public string Path
         {
             get { return Encoding.GetString(_path, 0, _path.Length); }
             private set { _path = Encoding.GetBytes(value); }
         }
-#else
-        public string Path { get; private set; }
-#endif
 
         public Encoding Encoding { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -44,7 +37,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public SftpOpenDirRequest(uint protocolVersion, uint requestId, string path, Encoding encoding, Action<SftpHandleResponse> handleAction, Action<SftpStatusResponse> statusAction)
             : base(protocolVersion, requestId, statusAction)
@@ -58,22 +50,14 @@ namespace Renci.SshNet.Sftp.Requests
         {
             base.LoadData();
 
-#if TUNING
             _path = ReadBinary();
-#else
-            Path = ReadString(Encoding);
-#endif
         }
 
         protected override void SaveData()
         {
             base.SaveData();
 
-#if TUNING
             WriteBinaryString(_path);
-#else
-            Write(Path, Encoding);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpOpenRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpOpenRequest.cs
index a4f35aa5..aafccf95 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpOpenRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpOpenRequest.cs
@@ -6,41 +6,30 @@ namespace Renci.SshNet.Sftp.Requests
 {
     internal class SftpOpenRequest : SftpRequest
     {
-#if TUNING
         private byte[] _fileName;
         private byte[] _attributes;
-#endif
 
         public override SftpMessageTypes SftpMessageType
         {
             get { return SftpMessageTypes.Open; }
         }
 
-#if TUNING
         public string Filename
         {
             get { return Encoding.GetString(_fileName, 0, _fileName.Length); }
             private set { _fileName = Encoding.GetBytes(value); }
         }
-#else
-        public string Filename { get; private set; }
-#endif
 
         public Flags Flags { get; private set; }
 
-#if TUNING
         public SftpFileAttributes Attributes
         {
             get { return SftpFileAttributes.FromBytes(_attributes); }
             private set { _attributes = value.GetBytes(); }
         }
-#else
-        public SftpFileAttributes Attributes { get; private set; }
-#endif
 
         public Encoding Encoding { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -59,7 +48,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public SftpOpenRequest(uint protocolVersion, uint requestId, string fileName, Encoding encoding, Flags flags, Action<SftpHandleResponse> handleAction, Action<SftpStatusResponse> statusAction)
             : this(protocolVersion, requestId, fileName, encoding, flags, SftpFileAttributes.Empty, handleAction, statusAction)
@@ -87,17 +75,9 @@ namespace Renci.SshNet.Sftp.Requests
         {
             base.SaveData();
 
-#if TUNING
             WriteBinaryString(_fileName);
-#else
-            Write(Filename, Encoding);
-#endif
-            Write((uint)Flags);
-#if TUNING
+            Write((uint) Flags);
             Write(_attributes);
-#else
-            Write(Attributes);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpReadDirRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpReadDirRequest.cs
index 94509795..e0fefd5f 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpReadDirRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpReadDirRequest.cs
@@ -12,7 +12,6 @@ namespace Renci.SshNet.Sftp.Requests
 
         public byte[] Handle { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -29,7 +28,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public SftpReadDirRequest(uint protocolVersion, uint requestId, byte[] handle, Action<SftpNameResponse> nameAction, Action<SftpStatusResponse> statusAction)
             : base(protocolVersion, requestId, statusAction)
@@ -41,11 +39,7 @@ namespace Renci.SshNet.Sftp.Requests
         protected override void LoadData()
         {
             base.LoadData();
-#if TUNING
             Handle = ReadBinary();
-#else
-            Handle = ReadBinaryString();
-#endif
         }
 
         protected override void SaveData()
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpReadLinkRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpReadLinkRequest.cs
index 6464646f..8fd071ff 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpReadLinkRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpReadLinkRequest.cs
@@ -6,28 +6,21 @@ namespace Renci.SshNet.Sftp.Requests
 {
     internal class SftpReadLinkRequest : SftpRequest
     {
-#if TUNING
         private byte[] _path;
-#endif
 
         public override SftpMessageTypes SftpMessageType
         {
             get { return SftpMessageTypes.ReadLink; }
         }
 
-#if TUNING
         public string Path
         {
             get { return Encoding.GetString(_path, 0, _path.Length); }
             private set { _path = Encoding.GetBytes(value); }
         }
-#else
-        public string Path { get; private set; }
-#endif
 
         public Encoding Encoding { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -44,7 +37,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public SftpReadLinkRequest(uint protocolVersion, uint requestId, string path, Encoding encoding, Action<SftpNameResponse> nameAction, Action<SftpStatusResponse> statusAction)
             : base(protocolVersion, requestId, statusAction)
@@ -58,22 +50,14 @@ namespace Renci.SshNet.Sftp.Requests
         {
             base.LoadData();
 
-#if TUNING
             _path = ReadBinary();
-#else
-            Path = ReadString(Encoding);
-#endif
         }
 
         protected override void SaveData()
         {
             base.SaveData();
 
-#if TUNING
             WriteBinaryString(_path);
-#else
-            Write(Path, Encoding);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpReadRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpReadRequest.cs
index 4f2a3138..0e26d83e 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpReadRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpReadRequest.cs
@@ -16,7 +16,6 @@ namespace Renci.SshNet.Sftp.Requests
 
         public uint Length { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -35,7 +34,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public SftpReadRequest(uint protocolVersion, uint requestId, byte[] handle, UInt64 offset, UInt32 length, Action<SftpDataResponse> dataAction, Action<SftpStatusResponse> statusAction)
             : base(protocolVersion, requestId, statusAction)
@@ -49,11 +47,7 @@ namespace Renci.SshNet.Sftp.Requests
         protected override void LoadData()
         {
             base.LoadData();
-#if TUNING
             Handle = ReadBinary();
-#else
-            Handle = ReadBinaryString();
-#endif
             Offset = ReadUInt64();
             Length = ReadUInt32();
         }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpRealPathRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpRealPathRequest.cs
index 290b6094..6e967815 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpRealPathRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpRealPathRequest.cs
@@ -6,28 +6,21 @@ namespace Renci.SshNet.Sftp.Requests
 {
     internal class SftpRealPathRequest : SftpRequest
     {
-#if TUNING
         private byte[] _path;
-#endif
 
         public override SftpMessageTypes SftpMessageType
         {
             get { return SftpMessageTypes.RealPath; }
         }
 
-#if TUNING
         public string Path
         {
             get { return Encoding.GetString(_path, 0, _path.Length); }
             private set { _path = Encoding.GetBytes(value); }
         }
-#else
-        public string Path { get; private set; }
-#endif
 
         public Encoding Encoding { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -44,7 +37,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public SftpRealPathRequest(uint protocolVersion, uint requestId, string path, Encoding encoding, Action<SftpNameResponse> nameAction, Action<SftpStatusResponse> statusAction)
             : base(protocolVersion, requestId, statusAction)
@@ -63,11 +55,7 @@ namespace Renci.SshNet.Sftp.Requests
         protected override void SaveData()
         {
             base.SaveData();
-#if TUNING
             WriteBinaryString(_path);
-#else
-            Write(Path, Encoding);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpRemoveRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpRemoveRequest.cs
index a86e2758..79d6a455 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpRemoveRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpRemoveRequest.cs
@@ -6,28 +6,21 @@ namespace Renci.SshNet.Sftp.Requests
 {
     internal class SftpRemoveRequest : SftpRequest
     {
-#if TUNING
         private byte[] _fileName;
-#endif
 
         public override SftpMessageTypes SftpMessageType
         {
             get { return SftpMessageTypes.Remove; }
         }
 
-#if TUNING
         public string Filename
         {
             get { return Encoding.GetString(_fileName, 0, _fileName.Length); }
             private set { _fileName = Encoding.GetBytes(value); }
         }
-#else
-        public string Filename { get; private set; }
-#endif
 
         public Encoding Encoding { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -44,7 +37,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public SftpRemoveRequest(uint protocolVersion, uint requestId, string filename, Encoding encoding, Action<SftpStatusResponse> statusAction)
             : base(protocolVersion, requestId, statusAction)
@@ -56,21 +48,13 @@ namespace Renci.SshNet.Sftp.Requests
         protected override void LoadData()
         {
             base.LoadData();
-#if TUNING
             _fileName = ReadBinary();
-#else
-            Filename = ReadString(Encoding);
-#endif
         }
 
         protected override void SaveData()
         {
             base.SaveData();
-#if TUNING
             WriteBinaryString(_fileName);
-#else
-            Write(Filename, Encoding);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpRenameRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpRenameRequest.cs
index 898afa07..fbe75087 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpRenameRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpRenameRequest.cs
@@ -6,39 +6,28 @@ namespace Renci.SshNet.Sftp.Requests
 {
     internal class SftpRenameRequest : SftpRequest
     {
-#if TUNING
         private byte[] _oldPath;
         private byte[] _newPath;
-#endif
 
         public override SftpMessageTypes SftpMessageType
         {
             get { return SftpMessageTypes.Rename; }
         }
 
-#if TUNING
         public string OldPath
         {
             get { return Encoding.GetString(_oldPath, 0, _oldPath.Length); }
             private set { _oldPath = Encoding.GetBytes(value); }
         }
-#else
-        public string OldPath { get; private set; }
-#endif
 
-#if TUNING
         public string NewPath
         {
             get { return Encoding.GetString(_newPath, 0, _newPath.Length); }
             private set { _newPath = Encoding.GetBytes(value); }
         }
-#else
-        public string NewPath { get; private set; }
-#endif
 
         public Encoding Encoding { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -57,7 +46,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public SftpRenameRequest(uint protocolVersion, uint requestId, string oldPath, string newPath, Encoding encoding, Action<SftpStatusResponse> statusAction)
             : base(protocolVersion, requestId, statusAction)
@@ -71,27 +59,16 @@ namespace Renci.SshNet.Sftp.Requests
         {
             base.LoadData();
 
-#if TUNING
             _oldPath = ReadBinary();
             _newPath = ReadBinary();
-#else
-            OldPath = ReadString(Encoding);
-            NewPath = ReadString(Encoding);
-#endif
-
         }
 
         protected override void SaveData()
         {
             base.SaveData();
 
-#if TUNING
             WriteBinaryString(_oldPath);
             WriteBinaryString(_newPath);
-#else
-            Write(OldPath, Encoding);
-            Write(NewPath, Encoding);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpRequest.cs
index 7e677184..935b05b6 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpRequest.cs
@@ -16,7 +16,6 @@ namespace Renci.SshNet.Sftp.Requests
         
         public uint ProtocolVersion { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -32,7 +31,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         protected SftpRequest(uint protocolVersion, uint requestId, Action<SftpStatusResponse> statusAction)
         {
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpRmDirRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpRmDirRequest.cs
index 3d9ee74c..c66af067 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpRmDirRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpRmDirRequest.cs
@@ -6,28 +6,21 @@ namespace Renci.SshNet.Sftp.Requests
 {
     internal class SftpRmDirRequest : SftpRequest
     {
-#if TUNING
         private byte[] _path;
-#endif
 
         public override SftpMessageTypes SftpMessageType
         {
             get { return SftpMessageTypes.RmDir; }
         }
 
-#if TUNING
         public string Path
         {
             get { return Encoding.GetString(_path, 0, _path.Length); }
             private set { _path = Encoding.GetBytes(value); }
         }
-#else
-        public string Path { get; private set; }
-#endif
 
         public Encoding Encoding { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -44,7 +37,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public SftpRmDirRequest(uint protocolVersion, uint requestId, string path, Encoding encoding, Action<SftpStatusResponse> statusAction)
             : base(protocolVersion, requestId, statusAction)
@@ -56,21 +48,13 @@ namespace Renci.SshNet.Sftp.Requests
         protected override void LoadData()
         {
             base.LoadData();
-#if TUNING
             _path = ReadBinary();
-#else
-            Path = ReadString(Encoding);
-#endif
         }
 
         protected override void SaveData()
         {
             base.SaveData();
-#if TUNING
             WriteBinaryString(_path);
-#else
-            Write(Path, Encoding);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpSetStatRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpSetStatRequest.cs
index fe5c8eeb..65e56a29 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpSetStatRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpSetStatRequest.cs
@@ -6,29 +6,22 @@ namespace Renci.SshNet.Sftp.Requests
 {
     internal class SftpSetStatRequest : SftpRequest
     {
-#if TUNING
         private byte[] _path;
         private byte[] _attributesBytes;
-#endif
 
         public override SftpMessageTypes SftpMessageType
         {
             get { return SftpMessageTypes.SetStat; }
         }
 
-#if TUNING
         public string Path
         {
             get { return Encoding.GetString(_path, 0, _path.Length); }
             private set { _path = Encoding.GetBytes(value); }
         }
-#else
-        public string Path { get; private set; }
-#endif
 
         public Encoding Encoding { get; private set; }
 
-#if TUNING
         private SftpFileAttributes Attributes { get; set; }
 
         private byte[] AttributesBytes
@@ -42,11 +35,7 @@ namespace Renci.SshNet.Sftp.Requests
                 return _attributesBytes;
             }
         }
-#else
-        public SftpFileAttributes Attributes { get; private set; }
-#endif
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -64,7 +53,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public SftpSetStatRequest(uint protocolVersion, uint requestId, string path, Encoding encoding, SftpFileAttributes attributes, Action<SftpStatusResponse> statusAction)
             : base(protocolVersion, requestId, statusAction)
@@ -77,24 +65,15 @@ namespace Renci.SshNet.Sftp.Requests
         protected override void LoadData()
         {
             base.LoadData();
-#if TUNING
             _path = ReadBinary();
-#else
-            Path = ReadString(Encoding);
-#endif
             Attributes = ReadAttributes();
         }
 
         protected override void SaveData()
         {
             base.SaveData();
-#if TUNING
             WriteBinaryString(_path);
             Write(AttributesBytes);
-#else
-            Write(Path, Encoding);
-            Write(Attributes);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpStatRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpStatRequest.cs
index 97d04f0a..e56f1fde 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpStatRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpStatRequest.cs
@@ -6,28 +6,21 @@ namespace Renci.SshNet.Sftp.Requests
 {
     internal class SftpStatRequest : SftpRequest
     {
-#if TUNING
         private byte[] _path;
-#endif
 
         public override SftpMessageTypes SftpMessageType
         {
             get { return SftpMessageTypes.Stat; }
         }
 
-#if TUNING
         public string Path
         {
             get { return Encoding.GetString(_path, 0, _path.Length); }
             private set { _path = Encoding.GetBytes(value); }
         }
-#else
-        public string Path { get; private set; }
-#endif
 
         public Encoding Encoding { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -44,7 +37,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public SftpStatRequest(uint protocolVersion, uint requestId, string path, Encoding encoding, Action<SftpAttrsResponse> attrsAction, Action<SftpStatusResponse> statusAction)
             : base(protocolVersion, requestId, statusAction)
@@ -57,21 +49,13 @@ namespace Renci.SshNet.Sftp.Requests
         protected override void LoadData()
         {
             base.LoadData();
-#if TUNING
             _path = ReadBinary();
-#else
-            Path = ReadString(Encoding);
-#endif
         }
 
         protected override void SaveData()
         {
             base.SaveData();
-#if TUNING
             WriteBinaryString(_path);
-#else
-            Write(Path, Encoding);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpSymLinkRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpSymLinkRequest.cs
index 6d62d7ff..3071d651 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpSymLinkRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpSymLinkRequest.cs
@@ -6,39 +6,28 @@ namespace Renci.SshNet.Sftp.Requests
 {
     internal class SftpSymLinkRequest : SftpRequest
     {
-#if TUNING
         private byte[] _newLinkPath;
         private byte[] _existingPath;
-#endif
 
         public override SftpMessageTypes SftpMessageType
         {
             get { return SftpMessageTypes.SymLink; }
         }
 
-#if TUNING
         public string NewLinkPath
         {
             get { return Encoding.GetString(_newLinkPath, 0, _newLinkPath.Length); }
             private set { _newLinkPath = Encoding.GetBytes(value); }
         }
-#else
-        public string NewLinkPath { get; set; }
-#endif
 
-#if TUNING
         public string ExistingPath
         {
             get { return Encoding.GetString(_existingPath, 0, _existingPath.Length); }
             private set { _existingPath = Encoding.GetBytes(value); }
         }
-#else
-        public string ExistingPath { get; set; }
-#endif
 
         public Encoding Encoding { get; set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -57,43 +46,27 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public SftpSymLinkRequest(uint protocolVersion, uint requestId, string newLinkPath, string existingPath, Encoding encoding, Action<SftpStatusResponse> statusAction)
             : base(protocolVersion, requestId, statusAction)
         {
-#if TUNING
             Encoding = encoding;
-#endif
             NewLinkPath = newLinkPath;
             ExistingPath = existingPath;
-#if !TUNING
-            Encoding = encoding;
-#endif
         }
 
         protected override void LoadData()
         {
             base.LoadData();
-#if TUNING
             _newLinkPath = ReadBinary();
             _existingPath = ReadBinary();
-#else
-            NewLinkPath = ReadString(Encoding);
-            ExistingPath = ReadString(Encoding);
-#endif
         }
 
         protected override void SaveData()
         {
             base.SaveData();
-#if TUNING
             WriteBinaryString(_newLinkPath);
             WriteBinaryString(_existingPath);
-#else
-            Write(NewLinkPath, Encoding);
-            Write(ExistingPath, Encoding);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpUnblockRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpUnblockRequest.cs
index 4a60465a..474db5c4 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpUnblockRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpUnblockRequest.cs
@@ -16,7 +16,6 @@ namespace Renci.SshNet.Sftp.Requests
 
         public ulong Length { get; private set; }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -35,7 +34,6 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public SftpUnblockRequest(uint protocolVersion, uint requestId, byte[] handle, UInt64 offset, UInt64 length, Action<SftpStatusResponse> statusAction)
             : base(protocolVersion, requestId, statusAction)
@@ -48,11 +46,7 @@ namespace Renci.SshNet.Sftp.Requests
         protected override void LoadData()
         {
             base.LoadData();
-#if TUNING
             Handle = ReadBinary();
-#else
-            Handle = ReadBinaryString();
-#endif
             Offset = ReadUInt64();
             Length = ReadUInt64();
         }
diff --git a/src/Renci.SshNet/Sftp/Requests/SftpWriteRequest.cs b/src/Renci.SshNet/Sftp/Requests/SftpWriteRequest.cs
index ff027143..a212712e 100644
--- a/src/Renci.SshNet/Sftp/Requests/SftpWriteRequest.cs
+++ b/src/Renci.SshNet/Sftp/Requests/SftpWriteRequest.cs
@@ -16,7 +16,6 @@ namespace Renci.SshNet.Sftp.Requests
 
         public byte[] Data { get; private set; }
 
-#if TUNING
         public int Length { get; private set; }
 
         protected override int BufferCapacity
@@ -32,44 +31,29 @@ namespace Renci.SshNet.Sftp.Requests
                 return capacity;
             }
         }
-#endif
 
         public SftpWriteRequest(uint protocolVersion,
                                 uint requestId,
                                 byte[] handle,
                                 ulong offset,
                                 byte[] data,
-#if TUNING
                                 int length,
-#endif
                                 Action<SftpStatusResponse> statusAction)
             : base(protocolVersion, requestId, statusAction)
         {
             Handle = handle;
             Offset = offset;
             Data = data;
-#if TUNING
             Length = length;
-#endif
         }
 
         protected override void LoadData()
         {
             base.LoadData();
-#if TUNING
             Handle = ReadBinary();
-#else
-            Handle = ReadBinaryString();
-#endif
             Offset = ReadUInt64();
-#if TUNING
             Data = ReadBinary();
-#else
-            Data = ReadBinaryString();
-#endif
-#if TUNING
             Length = Data.Length;
-#endif
         }
 
         protected override void SaveData()
@@ -77,11 +61,7 @@ namespace Renci.SshNet.Sftp.Requests
             base.SaveData();
             WriteBinaryString(Handle);
             Write(Offset);
-#if TUNING
             WriteBinary(Data, 0, Length);
-#else
-            WriteBinaryString(Data);
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/Responses/ExtendedReplies/ExtendedReplyInfo.cs b/src/Renci.SshNet/Sftp/Responses/ExtendedReplies/ExtendedReplyInfo.cs
index ef6b2a2b..9e5a6d7c 100644
--- a/src/Renci.SshNet/Sftp/Responses/ExtendedReplies/ExtendedReplyInfo.cs
+++ b/src/Renci.SshNet/Sftp/Responses/ExtendedReplies/ExtendedReplyInfo.cs
@@ -7,10 +7,8 @@ namespace Renci.SshNet.Sftp.Responses
     {
         protected override void LoadData()
         {
-#if TUNING
             // skip packet length
             ReadUInt32();
-#endif
 
             //  skip message type
             ReadByte();
diff --git a/src/Renci.SshNet/Sftp/Responses/SftpDataResponse.cs b/src/Renci.SshNet/Sftp/Responses/SftpDataResponse.cs
index 89a96194..36fe6d56 100644
--- a/src/Renci.SshNet/Sftp/Responses/SftpDataResponse.cs
+++ b/src/Renci.SshNet/Sftp/Responses/SftpDataResponse.cs
@@ -20,11 +20,7 @@
         {
             base.LoadData();
             
-#if TUNING
             Data = ReadBinary();
-#else
-            Data = ReadBinaryString();
-#endif
 
             if (!IsEndOfData)
             {
diff --git a/src/Renci.SshNet/Sftp/Responses/SftpHandleResponse.cs b/src/Renci.SshNet/Sftp/Responses/SftpHandleResponse.cs
index f75adc0e..bb1b98e7 100644
--- a/src/Renci.SshNet/Sftp/Responses/SftpHandleResponse.cs
+++ b/src/Renci.SshNet/Sftp/Responses/SftpHandleResponse.cs
@@ -18,11 +18,7 @@
         {
             base.LoadData();
             
-#if TUNING
             Handle = ReadBinary();
-#else
-            Handle = ReadBinaryString();
-#endif
         }
     }
 }
diff --git a/src/Renci.SshNet/Sftp/SftpFileStream.cs b/src/Renci.SshNet/Sftp/SftpFileStream.cs
index 1b16ae32..40829ed1 100644
--- a/src/Renci.SshNet/Sftp/SftpFileStream.cs
+++ b/src/Renci.SshNet/Sftp/SftpFileStream.cs
@@ -633,21 +633,10 @@ namespace Renci.SshNet.Sftp
                     var tempLen = _writeBufferSize - _bufferPosition;
                     if (tempLen <= 0)
                     {
-#if !TUNING
-                        var data = new byte[_bufferPosition];
-
-                        Buffer.BlockCopy(_writeBuffer, 0, data, 0, _bufferPosition);
-#endif
-
                         using (var wait = new AutoResetEvent(false))
                         {
-#if TUNING
                             _session.RequestWrite(_handle, _serverFilePosition, _writeBuffer, _bufferPosition, wait);
                             _serverFilePosition += (ulong) _bufferPosition;
-#else
-                            _session.RequestWrite(_handle, _serverFilePosition, data, wait);
-                            _serverFilePosition += (ulong)data.Length;
-#endif
                         }
 
                         _bufferPosition = 0;
@@ -661,22 +650,10 @@ namespace Renci.SshNet.Sftp
                     // Can we short-cut the internal buffer?
                     if (_bufferPosition == 0 && tempLen == _writeBufferSize)
                     {
-#if !TUNING
-                        // Yes: write the data directly to the file.
-                        var data = new byte[tempLen];
-
-                        Buffer.BlockCopy(buffer, offset, data, 0, tempLen);
-#endif
-
                         using (var wait = new AutoResetEvent(false))
                         {
-#if TUNING
                             _session.RequestWrite(_handle, _serverFilePosition, buffer, tempLen, wait);
                             _serverFilePosition += (ulong) tempLen;
-#else
-                            _session.RequestWrite(_handle, _serverFilePosition, data, wait);
-                            _serverFilePosition += (ulong)data.Length;
-#endif
                         }
                     }
                     else
@@ -696,21 +673,10 @@ namespace Renci.SshNet.Sftp
                 // rather than waiting for the next call to this method.
                 if (_bufferPosition >= _writeBufferSize)
                 {
-#if !TUNING
-                    var data = new byte[_bufferPosition];
-
-                    Buffer.BlockCopy(_writeBuffer, 0, data, 0, _bufferPosition);
-#endif
-
                     using (var wait = new AutoResetEvent(false))
                     {
-#if TUNING
                         _session.RequestWrite(_handle, _serverFilePosition, _writeBuffer, _bufferPosition, wait);
                         _serverFilePosition += (ulong) _bufferPosition;
-#else
-                        _session.RequestWrite(_handle, _serverFilePosition, data, wait);
-                        _serverFilePosition += (ulong)data.Length;
-#endif
                     }
 
                     _bufferPosition = 0;
@@ -738,21 +704,10 @@ namespace Renci.SshNet.Sftp
                 // Flush the current buffer if it is full.
                 if (_bufferPosition >= _writeBufferSize)
                 {
-#if !TUNING
-                    var data = new byte[_bufferPosition];
-
-                    Buffer.BlockCopy(_writeBuffer, 0, data, 0, _bufferPosition);
-#endif
-
                     using (var wait = new AutoResetEvent(false))
                     {
-#if TUNING
                         _session.RequestWrite(_handle, _serverFilePosition, _writeBuffer, _bufferPosition, wait);
                         _serverFilePosition += (ulong) _bufferPosition;
-#else
-                        _session.RequestWrite(_handle, _serverFilePosition, data, wait);
-                        _serverFilePosition += (ulong)data.Length;
-#endif
                     }
 
                     _bufferPosition = 0;
@@ -832,21 +787,10 @@ namespace Renci.SshNet.Sftp
         {
             if (_bufferPosition > 0)
             {
-#if !TUNING
-                var data = new byte[_bufferPosition];
-
-                Buffer.BlockCopy(_writeBuffer, 0, data, 0, _bufferPosition);
-#endif
-
                 using (var wait = new AutoResetEvent(false))
                 {
-#if TUNING
                     _session.RequestWrite(_handle, _serverFilePosition, _writeBuffer, _bufferPosition, wait);
                     _serverFilePosition += (ulong) _bufferPosition;
-#else
-                    _session.RequestWrite(_handle, _serverFilePosition, data, wait);
-                    _serverFilePosition += (ulong)data.Length;
-#endif
                 }
 
                 _bufferPosition = 0;
diff --git a/src/Renci.SshNet/Sftp/SftpMessage.cs b/src/Renci.SshNet/Sftp/SftpMessage.cs
index e685178c..2f46af05 100644
--- a/src/Renci.SshNet/Sftp/SftpMessage.cs
+++ b/src/Renci.SshNet/Sftp/SftpMessage.cs
@@ -1,11 +1,5 @@
 using System;
-#if !TUNING
-using System.Collections.Generic;
-#endif
 using System.IO;
-#if !TUNING
-using System.Linq;
-#endif
 using Renci.SshNet.Common;
 using System.Globalization;
 using Renci.SshNet.Sftp.Responses;
@@ -17,11 +11,7 @@ namespace Renci.SshNet.Sftp
     {
         public static SftpMessage Load(uint protocolVersion, byte[] data, Encoding encoding)
         {
-#if TUNING
             var messageType = (SftpMessageTypes) data[4]; // skip packet length bytes
-#else
-            var messageType = (SftpMessageTypes)data.FirstOrDefault();
-#endif
 
             return Load(protocolVersion, data, messageType, encoding);
         }
@@ -30,17 +20,12 @@ namespace Renci.SshNet.Sftp
         {
             get
             {
-#if TUNING
                 // 4 bytes for the length of the SFTP data
                 // 1 byte for the SFTP message type
                 return 5;
-#else
-                return 1;
-#endif
             }
         }
 
-#if TUNING
         /// <summary>
         /// Gets the size of the message in bytes.
         /// </summary>
@@ -51,7 +36,6 @@ namespace Renci.SshNet.Sftp
         {
             get { return ZeroReaderIndex; }
         }
-#endif
 
         public abstract SftpMessageTypes SftpMessageType { get; }
 
@@ -64,7 +48,6 @@ namespace Renci.SshNet.Sftp
             Write((byte) SftpMessageType);
         }
 
-#if TUNING
         /// <summary>
         /// Writes the current message to the specified <see cref="SshDataStream"/>.
         /// </summary>
@@ -95,128 +78,12 @@ namespace Renci.SshNet.Sftp
             // move back to we were positioned when we finished writing the SFTP message data
             stream.Position = endPosition;
         }
-#endif
 
         protected SftpFileAttributes ReadAttributes()
         {
-#if TUNING
             return SftpFileAttributes.FromBytes(DataStream);
-#else
-            var flag = ReadUInt32();
-
-            long size = -1;
-            var userId = -1;
-            var groupId = -1;
-            uint permissions = 0;
-            var accessTime = DateTime.MinValue;
-            var modifyTime = DateTime.MinValue;
-            IDictionary<string, string> extensions = null;
-
-            if ((flag & 0x00000001) == 0x00000001)   //  SSH_FILEXFER_ATTR_SIZE
-            {
-                size = (long)ReadUInt64();
-            }
-
-            if ((flag & 0x00000002) == 0x00000002)   //  SSH_FILEXFER_ATTR_UIDGID
-            {
-                userId = (int)ReadUInt32();
-
-                groupId = (int)ReadUInt32();
-            }
-
-            if ((flag & 0x00000004) == 0x00000004)   //  SSH_FILEXFER_ATTR_PERMISSIONS
-            {
-                permissions = ReadUInt32();
-            }
-
-            if ((flag & 0x00000008) == 0x00000008)   //  SSH_FILEXFER_ATTR_ACMODTIME
-            {
-                var time = ReadUInt32();
-                accessTime = DateTime.FromFileTime((time + 11644473600) * 10000000);
-                time = ReadUInt32();
-                modifyTime = DateTime.FromFileTime((time + 11644473600) * 10000000);
-            }
-
-            if ((flag & 0x80000000) == 0x80000000)   //  SSH_FILEXFER_ATTR_ACMODTIME
-            {
-                var extendedCount = ReadUInt32();
-                extensions = ReadExtensionPair();
-            }
-            var attributes = new SftpFileAttributes(accessTime, modifyTime, size, userId, groupId, permissions, extensions);
-
-            return attributes;
-#endif
         }
 
-#if !TUNING
-        protected void Write(SftpFileAttributes attributes)
-        {
-            if (attributes == null)
-            {
-                Write((uint)0);
-                return;
-            }
-
-            UInt32 flag = 0;
-
-            if (attributes.IsSizeChanged && attributes.IsRegularFile)
-            {
-                flag |= 0x00000001;
-            }
-
-            if (attributes.IsUserIdChanged|| attributes.IsGroupIdChanged)
-            {
-                flag |= 0x00000002;
-            }
-
-            if (attributes.IsPermissionsChanged)
-            {
-                flag |= 0x00000004;
-            }
-
-            if (attributes.IsLastAccessTimeChanged || attributes.IsLastWriteTimeChanged)
-            {
-                flag |= 0x00000008;
-            }
-
-            if (attributes.IsExtensionsChanged)
-            {
-                flag |= 0x80000000;
-            }
-
-            Write(flag);
-
-            if (attributes.IsSizeChanged && attributes.IsRegularFile)
-            {
-                Write((UInt64)attributes.Size);
-            }
-
-            if (attributes.IsUserIdChanged|| attributes.IsGroupIdChanged)
-            {
-                Write((UInt32)attributes.UserId);
-                Write((UInt32)attributes.GroupId);
-            }
-
-            if (attributes.IsPermissionsChanged)
-            {
-                Write(attributes.Permissions);
-            }
-
-            if (attributes.IsLastAccessTimeChanged || attributes.IsLastWriteTimeChanged)
-            {
-                var time = (uint)(attributes.LastAccessTime.ToFileTime() / 10000000 - 11644473600);
-                Write(time);
-                time = (uint)(attributes.LastWriteTime.ToFileTime() / 10000000 - 11644473600);
-                Write(time);
-            }
-
-            if (attributes.IsExtensionsChanged)
-            {
-                Write(attributes.Extensions);
-            }
-        }
-#endif
-
         private static SftpMessage Load(uint protocolVersion, byte[] data, SftpMessageTypes messageType, Encoding encoding)
         {
             SftpMessage message;
@@ -248,15 +115,7 @@ namespace Renci.SshNet.Sftp
                     throw new NotSupportedException(string.Format(CultureInfo.CurrentCulture, "Message type '{0}' is not supported.", messageType));
             }
 
-#if TUNING
             message.Load(data);
-#else
-            message.LoadBytes(data);
-
-            message.ResetReader();
-
-            message.LoadData();
-#endif
 
             return message;
         }
diff --git a/src/Renci.SshNet/Sftp/SftpSession.cs b/src/Renci.SshNet/Sftp/SftpSession.cs
index b18cf8ae..739c8518 100644
--- a/src/Renci.SshNet/Sftp/SftpSession.cs
+++ b/src/Renci.SshNet/Sftp/SftpSession.cs
@@ -13,20 +13,12 @@ namespace Renci.SshNet.Sftp
     internal class SftpSession : SubsystemSession, ISftpSession
     {
         private const int MaximumSupportedVersion = 3;
-
         private const int MinimumSupportedVersion = 0;
 
         private readonly Dictionary<uint, SftpRequest> _requests = new Dictionary<uint, SftpRequest>();
-
-#if TUNING
-        private readonly List<byte> _data = new List<byte>(32 * 1024);
         //FIXME: obtain from SftpClient!
-#else
-        private readonly List<byte> _data = new List<byte>(16 * 1024);
-#endif
-
+        private readonly List<byte> _data = new List<byte>(32 * 1024);
         private EventWaitHandle _sftpVersionConfirmed = new AutoResetEvent(false);
-
         private IDictionary<string, string> _supportedExtensions;
 
         /// <summary>
@@ -61,7 +53,7 @@ namespace Renci.SshNet.Sftp
 
                 return (uint)this._requestId;
 #else
-                return ((uint)Interlocked.Increment(ref _requestId));
+                return ((uint) Interlocked.Increment(ref _requestId));
 #endif
             }
         }
@@ -78,27 +70,15 @@ namespace Renci.SshNet.Sftp
         public void ChangeDirectory(string path)
         {
             var fullPath = GetCanonicalPath(path);
-
             var handle = RequestOpenDir(fullPath);
 
             RequestClose(handle);
-
             WorkingDirectory = fullPath;
         }
 
         internal void SendMessage(SftpMessage sftpMessage)
         {
-#if TUNING
             var data = sftpMessage.GetBytes();
-#else
-            var messageData = sftpMessage.GetBytes();
-
-            var data = new byte[4 + messageData.Length];
-
-            ((uint)messageData.Length).GetBytes().CopyTo(data, 0);
-            messageData.CopyTo(data, 4);
-#endif
-
             SendData(data);
         }
 
@@ -207,7 +187,6 @@ namespace Renci.SshNet.Sftp
                     break;
                 }
 
-#if TUNING
                 var packetLengthIncludingBytesForLength = packetLength + 4;
 
                 //  Create buffer to hold packet data and 4 bytes for packet length
@@ -218,18 +197,6 @@ namespace Renci.SshNet.Sftp
 
                 //  Remove loaded data and bytes for length from _data holder
                 _data.RemoveRange(0, packetLengthIncludingBytesForLength);
-#else
-                _data.RemoveRange(0, 4);
-
-                //  Create buffer to hold packet data
-                var packetData = new byte[packetLength];
-
-                //  Cope packet data to array
-                _data.CopyTo(0, packetData, 0, packetLength);
-
-                //  Remove loaded data from _data holder
-                _data.RemoveRange(0, packetLength);
-#endif
 
                 //  Load SFTP Message and handle it
                 var response = SftpMessage.Load(ProtocolVersion, packetData, Encoding);
@@ -399,27 +366,19 @@ namespace Renci.SshNet.Sftp
         /// <param name="handle">The handle.</param>
         /// <param name="offset">The offset.</param>
         /// <param name="data">The data to send.</param>
-#if TUNING
         /// <param name="length">The number of bytes of <paramref name="data"/> to send.</param>
-#endif
         /// <param name="wait">The wait event handle if needed.</param>
         /// <param name="writeCompleted">The callback to invoke when the write has completed.</param>
         public void RequestWrite(byte[] handle,
                                  ulong offset,
                                  byte[] data,
-#if TUNING
                                  int length,
-#endif
                                  AutoResetEvent wait,
                                  Action<SftpStatusResponse> writeCompleted = null)
         {
             SshException exception = null;
 
-#if TUNING
             var request = new SftpWriteRequest(ProtocolVersion, NextRequestId, handle, offset, data, length,
-#else
-            var request = new SftpWriteRequest(ProtocolVersion, NextRequestId, handle, offset, data,
-#endif
                 response =>
                     {
                         if (writeCompleted != null)
diff --git a/src/Renci.SshNet/SftpClient.cs b/src/Renci.SshNet/SftpClient.cs
index 0c45e671..1f0c86ab 100644
--- a/src/Renci.SshNet/SftpClient.cs
+++ b/src/Renci.SshNet/SftpClient.cs
@@ -1871,25 +1871,9 @@ namespace Renci.SshNet
 
                 if (bytesRead > 0)
                 {
-#if TUNING
                     var writtenBytes = offset + (ulong) bytesRead;
-#else
-                    if (bytesRead < buffer.Length)
-                    {
-                        //  Replace buffer for last chunk of data
-                        var data = new byte[bytesRead];
-                        Buffer.BlockCopy(buffer, 0, data, 0, bytesRead);
-                        buffer = data;
-                    }
 
-                    var writtenBytes = offset + (ulong)buffer.Length;
-#endif
-
-#if TUNING
                     _sftpSession.RequestWrite(handle, offset, buffer, bytesRead, null, s =>
-#else
-                    _sftpSession.RequestWrite(handle, offset, buffer, null, s =>
-#endif
                     {
                         if (s.StatusCode == StatusCodes.Ok)
                         {
@@ -1951,7 +1935,7 @@ namespace Renci.SshNet
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources
         /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged ResourceMessages.</param>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected override void Dispose(bool disposing)
         {
             base.Dispose(disposing);
diff --git a/src/Renci.SshNet/Shell.cs b/src/Renci.SshNet/Shell.cs
index d98d9296..b8a83c22 100644
--- a/src/Renci.SshNet/Shell.cs
+++ b/src/Renci.SshNet/Shell.cs
@@ -136,11 +136,7 @@ namespace Renci.SshNet
                         if (WaitHandle.WaitAny(new[] {readWaitHandle, _channelClosedWaitHandle}) == 0)
                         {
                             var read = readTask.Result;
-#if TUNING
                             _channel.SendData(buffer, 0, read);
-#else
-                            _channel.SendData(buffer.Take(read).ToArray());
-#endif
                             continue;
                         }
 #elif FEATURE_STREAM_APM
@@ -153,11 +149,7 @@ namespace Renci.SshNet
                             var read = _input.EndRead(result);
                             if (read > 0)
                             {
-#if TUNING
                                 _channel.SendData(buffer, 0, read);
-#else
-                                _channel.SendData(buffer.Take(read).ToArray());
-#endif
                             }
 
                         }, null);
@@ -300,7 +292,7 @@ namespace Renci.SshNet
         private bool _disposed;
 
         /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged ResourceMessages.
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
         public void Dispose()
         {
@@ -311,7 +303,7 @@ namespace Renci.SshNet
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources
         /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged ResourceMessages.</param>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected virtual void Dispose(bool disposing)
         {
             if (_disposed)
@@ -321,41 +313,37 @@ namespace Renci.SshNet
             {
                 UnsubscribeFromSessionEvents(_session);
 
-                if (_channelClosedWaitHandle != null)
+                var channelClosedWaitHandle = _channelClosedWaitHandle;
+                if (channelClosedWaitHandle != null)
                 {
-                    _channelClosedWaitHandle.Dispose();
+                    channelClosedWaitHandle.Dispose();
                     _channelClosedWaitHandle = null;
                 }
 
-                if (_channel != null)
+                var channel = _channel;
+                if (channel != null)
                 {
-                    _channel.Dispose();
+                    channel.Dispose();
                     _channel = null;
                 }
 
-                if (_dataReaderTaskCompleted != null)
+                var dataReaderTaskCompleted = _dataReaderTaskCompleted;
+                if (dataReaderTaskCompleted != null)
                 {
-                    _dataReaderTaskCompleted.Dispose();
+                    dataReaderTaskCompleted.Dispose();
                     _dataReaderTaskCompleted = null;
                 }
 
                 _disposed = true;
             }
-            else
-            {
-                UnsubscribeFromSessionEvents(_session);
-            }
         }
 
         /// <summary>
         /// Releases unmanaged resources and performs other cleanup operations before the
-        /// <see cref="Session"/> is reclaimed by garbage collection.
+        /// <see cref="Shell"/> is reclaimed by garbage collection.
         /// </summary>
         ~Shell()
         {
-            // Do not re-create Dispose clean-up code here.
-            // Calling Dispose(false) is optimal in terms of
-            // readability and maintainability.
             Dispose(false);
         }
 
diff --git a/src/Renci.SshNet/SshClient.cs b/src/Renci.SshNet/SshClient.cs
index a94216c2..8c09cb07 100644
--- a/src/Renci.SshNet/SshClient.cs
+++ b/src/Renci.SshNet/SshClient.cs
@@ -460,24 +460,24 @@ namespace Renci.SshNet
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources
         /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged ResourceMessages.</param>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected override void Dispose(bool disposing)
         {
             base.Dispose(disposing);
 
-            if (!_isDisposed)
-            {
-                if (disposing)
-                {
-                    if (_inputStream != null)
-                    {
-                        _inputStream.Dispose();
-                        _inputStream = null;
-                    }
-                }
-            }
+            if (_isDisposed)
+                return;
 
-            _isDisposed = true;
+            if (disposing)
+            {
+                if (_inputStream != null)
+                {
+                    _inputStream.Dispose();
+                    _inputStream = null;
+                }
+
+                _isDisposed = true;
+            }
         }
 
         private void EnsureSessionIsOpen()
diff --git a/src/Renci.SshNet/SshCommand.cs b/src/Renci.SshNet/SshCommand.cs
index 7aa94896..391bec8b 100644
--- a/src/Renci.SshNet/SshCommand.cs
+++ b/src/Renci.SshNet/SshCommand.cs
@@ -295,7 +295,7 @@ namespace Renci.SshNet
             }
 
             var commandAsyncResult = asyncResult as CommandAsyncResult;
-            if (commandAsyncResult == null)
+            if (commandAsyncResult == null || _asyncResult != commandAsyncResult)
             {
                 throw new ArgumentException(string.Format("The {0} object was not returned from the corresponding asynchronous method on this class.", typeof(IAsyncResult).Name));
             }
@@ -524,7 +524,7 @@ namespace Renci.SshNet
         private bool _isDisposed;
 
         /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged ResourceMessages.
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
         public void Dispose()
         {
@@ -535,7 +535,7 @@ namespace Renci.SshNet
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources
         /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged ResourceMessages.</param>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected virtual void Dispose(bool disposing)
         {
             if (_isDisposed)
@@ -576,10 +576,10 @@ namespace Renci.SshNet
                     ExtendedOutputStream = null;
                 }
 
-                var handle = _sessionErrorOccuredWaitHandle;
-                if (handle != null)
+                var sessionErrorOccuredWaitHandle = _sessionErrorOccuredWaitHandle;
+                if (sessionErrorOccuredWaitHandle != null)
                 {
-                    handle.Dispose();
+                    sessionErrorOccuredWaitHandle.Dispose();
                     _sessionErrorOccuredWaitHandle = null;
                 }
 
@@ -593,9 +593,6 @@ namespace Renci.SshNet
         /// </summary>
         ~SshCommand()
         {
-            // Do not re-create Dispose clean-up code here.
-            // Calling Dispose(false) is optimal in terms of
-            // readability and maintainability.
             Dispose(false);
         }
 
diff --git a/src/Renci.SshNet/SubsystemSession.cs b/src/Renci.SshNet/SubsystemSession.cs
index 629b4d0d..5f9267eb 100644
--- a/src/Renci.SshNet/SubsystemSession.cs
+++ b/src/Renci.SshNet/SubsystemSession.cs
@@ -128,13 +128,14 @@ namespace Renci.SshNet
         {
             UnsubscribeFromSessionEvents(_session);
 
-            if (_channel != null)
+            var channel = _channel;
+            if (channel != null)
             {
-                _channel.DataReceived -= Channel_DataReceived;
-                _channel.Exception -= Channel_Exception;
-                _channel.Closed -= Channel_Closed;
-                _channel.Close();
-                _channel.Dispose();
+                channel.DataReceived -= Channel_DataReceived;
+                channel.Exception -= Channel_Exception;
+                channel.Closed -= Channel_Closed;
+                channel.Close();
+                channel.Dispose();
                 _channel = null;
             }
         }
@@ -314,30 +315,29 @@ namespace Renci.SshNet
 
                 _session = null;
 
-                if (_errorOccuredWaitHandle != null)
+                var errorOccuredWaitHandle = _errorOccuredWaitHandle;
+                if (errorOccuredWaitHandle != null)
                 {
-                    _errorOccuredWaitHandle.Dispose();
+                    errorOccuredWaitHandle.Dispose();
                     _errorOccuredWaitHandle = null;
                 }
 
-                if (_sessionDisconnectedWaitHandle != null)
+                var sessionDisconnectedWaitHandle = _sessionDisconnectedWaitHandle;
+                if (sessionDisconnectedWaitHandle != null)
                 {
-                    _sessionDisconnectedWaitHandle.Dispose();
+                    sessionDisconnectedWaitHandle.Dispose();
                     _sessionDisconnectedWaitHandle = null;
                 }
 
-                if (_channelClosedWaitHandle != null)
+                var channelClosedWaitHandle = _channelClosedWaitHandle;
+                if (channelClosedWaitHandle != null)
                 {
-                    _channelClosedWaitHandle.Dispose();
+                    channelClosedWaitHandle.Dispose();
                     _channelClosedWaitHandle = null;
                 }
 
                 _isDisposed = true;
             }
-            else
-            {
-                UnsubscribeFromSessionEvents(_session);
-            }
         }
 
         /// <summary>
@@ -345,9 +345,6 @@ namespace Renci.SshNet
         /// </summary>
         ~SubsystemSession()
         {
-            // Do not re-create Dispose clean-up code here.
-            // Calling Dispose(false) is optimal in terms of
-            // readability and maintainability.
             Dispose(false);
         }