diff --git a/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj b/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
index ae83c495..4ec535ec 100644
--- a/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
+++ b/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
@@ -366,6 +366,9 @@
     <Compile Include="..\Renci.SshNet\Messages\Authentication\SuccessMessage.cs">
       <Link>Messages\Authentication\SuccessMessage.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Messages\Connection\CancelTcpIpForwardGlobalRequestMessage.cs">
+      <Link>Messages\Connection\CancelTcpIpForwardGlobalRequestMessage.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Messages\Connection\ChannelCloseMessage.cs">
       <Link>Messages\Connection\ChannelCloseMessage.cs</Link>
     </Compile>
@@ -477,6 +480,9 @@
     <Compile Include="..\Renci.SshNet\Messages\Connection\RequestSuccessMessage.cs">
       <Link>Messages\Connection\RequestSuccessMessage.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Messages\Connection\TcpIpForwardGlobalRequestMessage.cs">
+      <Link>Messages\Connection\TcpIpForwardGlobalRequestMessage.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Messages\Message.cs">
       <Link>Messages\Message.cs</Link>
     </Compile>
@@ -896,8 +902,6 @@
     <Compile Include="..\Renci.SshNet\Properties\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="Session.SilverlightBrowser.cs" />
-    <Compile Include="Session.SilverlightShared.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\Renci.SshNet.snk">
@@ -913,7 +917,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.Silverlight/Session.SilverlightBrowser.cs b/src/Renci.SshNet.Silverlight/Session.SilverlightBrowser.cs
deleted file mode 100644
index 467b875d..00000000
--- a/src/Renci.SshNet.Silverlight/Session.SilverlightBrowser.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Renci.SshNet.Messages;
-
-namespace Renci.SshNet
-{
-    public partial class Session
-    {
-        partial void HandleMessageCore(Message message)
-        {
-            this.HandleMessage((dynamic) message);
-        }
-    }
-}
diff --git a/src/Renci.SshNet.Silverlight/Session.SilverlightShared.cs b/src/Renci.SshNet.Silverlight/Session.SilverlightShared.cs
deleted file mode 100644
index 929c3bc7..00000000
--- a/src/Renci.SshNet.Silverlight/Session.SilverlightShared.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Renci.SshNet
-{
-    public partial class Session
-    {
-        /// <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>
-        partial void IsSocketConnected(ref bool isConnected)
-        {
-            isConnected = (_socket != null && _socket.Connected);
-        }
-    }
-}
diff --git a/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj b/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj
index 82082683..4ea13cac 100644
--- a/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj
+++ b/src/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj
@@ -356,6 +356,9 @@
     <Compile Include="..\Renci.SshNet\Messages\Authentication\SuccessMessage.cs">
       <Link>Messages\Authentication\SuccessMessage.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Messages\Connection\CancelTcpIpForwardGlobalRequestMessage.cs">
+      <Link>Messages\Connection\CancelTcpIpForwardGlobalRequestMessage.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Messages\Connection\ChannelCloseMessage.cs">
       <Link>Messages\Connection\ChannelCloseMessage.cs</Link>
     </Compile>
@@ -467,6 +470,9 @@
     <Compile Include="..\Renci.SshNet\Messages\Connection\RequestSuccessMessage.cs">
       <Link>Messages\Connection\RequestSuccessMessage.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Messages\Connection\TcpIpForwardGlobalRequestMessage.cs">
+      <Link>Messages\Connection\TcpIpForwardGlobalRequestMessage.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Messages\Message.cs">
       <Link>Messages\Message.cs</Link>
     </Compile>
@@ -701,9 +707,6 @@
     <Compile Include="..\Renci.SshNet\Session.cs">
       <Link>Session.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet.Silverlight\Session.SilverlightShared.cs">
-      <Link>Session.cs</Link>
-    </Compile>
     <Compile Include="..\Renci.SshNet\SftpClient.cs">
       <Link>SftpClient.cs</Link>
     </Compile>
@@ -885,7 +888,6 @@
     <Compile Include="..\Renci.SshNet\Properties\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="Session.WP.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config">
diff --git a/src/Renci.SshNet.WindowsPhone/Session.WP.cs b/src/Renci.SshNet.WindowsPhone/Session.WP.cs
deleted file mode 100644
index 2182e398..00000000
--- a/src/Renci.SshNet.WindowsPhone/Session.WP.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-using System;
-using Renci.SshNet.Messages.Transport;
-using Renci.SshNet.Messages;
-using Renci.SshNet.Messages.Authentication;
-using Renci.SshNet.Messages.Connection;
-using System.Diagnostics;
-
-namespace Renci.SshNet
-{
-    public partial class Session
-    {
-        partial void HandleMessageCore(Message message)
-        {
-            if (message == null)
-                throw new ArgumentNullException("message");
-
-            var disconnectMessage = message as DisconnectMessage;
-            if (disconnectMessage != null)
-            {
-                HandleMessage(disconnectMessage);
-                return;
-            }
-
-            var serviceRequestMessage = message as ServiceRequestMessage;
-            if (serviceRequestMessage != null)
-            {
-                HandleMessage(serviceRequestMessage);
-                return;
-            }
-
-            var serviceAcceptMessage = message as ServiceAcceptMessage;
-            if (serviceAcceptMessage != null)
-            {
-                HandleMessage(serviceAcceptMessage);
-                return;
-            }
-
-            var keyExchangeInitMessage = message as KeyExchangeInitMessage;
-            if (keyExchangeInitMessage != null)
-            {
-                HandleMessage(keyExchangeInitMessage);
-                return;
-            }
-
-            var newKeysMessage = message as NewKeysMessage;
-            if (newKeysMessage != null)
-            {
-                HandleMessage(newKeysMessage);
-                return;
-            }
-
-            var requestMessage = message as RequestMessage;
-            if (requestMessage != null)
-            {
-                HandleMessage(requestMessage);
-                return;
-            }
-
-            var failureMessage = message as FailureMessage;
-            if (failureMessage != null)
-            {
-                HandleMessage(failureMessage);
-                return;
-            }
-
-            var successMessage = message as SuccessMessage;
-            if (successMessage != null)
-            {
-                HandleMessage(successMessage);
-                return;
-            }
-
-            var bannerMessage = message as BannerMessage;
-            if (bannerMessage != null)
-            {
-                HandleMessage(bannerMessage);
-                return;
-            }
-
-            var globalRequestMessage = message as GlobalRequestMessage;
-            if (globalRequestMessage != null)
-            {
-                HandleMessage(globalRequestMessage);
-                return;
-            }
-
-            var requestSuccessMessage = message as RequestSuccessMessage;
-            if (requestSuccessMessage != null)
-            {
-                HandleMessage(requestSuccessMessage);
-                return;
-            }
-
-            var requestFailureMessage = message as RequestFailureMessage;
-            if (requestFailureMessage != null)
-            {
-                HandleMessage(requestFailureMessage);
-                return;
-            }
-
-            var channelOpenMessage = message as ChannelOpenMessage;
-            if (channelOpenMessage != null)
-            {
-                HandleMessage(channelOpenMessage);
-                return;
-            }
-
-            var channelOpenConfirmationMessage = message as ChannelOpenConfirmationMessage;
-            if (channelOpenConfirmationMessage != null)
-            {
-                HandleMessage(channelOpenConfirmationMessage);
-                return;
-            }
-
-            var channelOpenFailureMessage = message as ChannelOpenFailureMessage;
-            if (channelOpenFailureMessage != null)
-            {
-                HandleMessage(channelOpenFailureMessage);
-                return;
-            }
-
-            var channelWindowAdjustMessage = message as ChannelWindowAdjustMessage;
-            if (channelWindowAdjustMessage != null)
-            {
-                HandleMessage(channelWindowAdjustMessage);
-                return;
-            }
-
-            var channelDataMessage = message as ChannelDataMessage;
-            if (channelDataMessage != null)
-            {
-                HandleMessage(channelDataMessage);
-                return;
-            }
-
-            var channelExtendedDataMessage = message as ChannelExtendedDataMessage;
-            if (channelExtendedDataMessage != null)
-            {
-                HandleMessage(channelExtendedDataMessage);
-                return;
-            }
-
-            var channelEofMessage = message as ChannelEofMessage;
-            if (channelEofMessage != null)
-            {
-                HandleMessage(channelEofMessage);
-                return;
-            }
-
-            var channelCloseMessage = message as ChannelCloseMessage;
-            if (channelCloseMessage != null)
-            {
-                HandleMessage(channelCloseMessage);
-                return;
-            }
-
-            var channelRequestMessage = message as ChannelRequestMessage;
-            if (channelRequestMessage != null)
-            {
-                HandleMessage(channelRequestMessage);
-                return;
-            }
-
-            var channelSuccessMessage = message as ChannelSuccessMessage;
-            if (channelSuccessMessage != null)
-            {
-                HandleMessage(channelSuccessMessage);
-                return;
-            }
-
-            var channelFailureMessage = message as ChannelFailureMessage;
-            if (channelFailureMessage != null)
-            {
-                HandleMessage(channelFailureMessage);
-                return;
-            }
-
-            var ignoreMessage = message as IgnoreMessage;
-            if (ignoreMessage != null)
-            {
-                HandleMessage(ignoreMessage);
-                return;
-            }
-
-            var unimplementedMessage = message as UnimplementedMessage;
-            if (unimplementedMessage != null)
-            {
-                HandleMessage(unimplementedMessage);
-                return;
-            }
-
-            var debugMessage = message as DebugMessage;
-            if (debugMessage != null)
-            {
-                HandleMessage(debugMessage);
-                return;
-            }
-
-            Debug.WriteLine(
-                "SSH.NET WARNING: unknown message type {0} - may need to add new type to Session.WP.cs, HandleMessageCore method",
-                message.GetType().FullName);
-
-            HandleMessage(message);
-        }
-    }
-}