diff --git a/src/Renci.SshNet.Silverlight/ForwardedPortLocal.SilverlightShared.cs b/src/Renci.SshNet.Silverlight/ForwardedPortLocal.SilverlightShared.cs
deleted file mode 100644
index c2464cf7..00000000
--- a/src/Renci.SshNet.Silverlight/ForwardedPortLocal.SilverlightShared.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-
-namespace Renci.SshNet
-{
-    /// <summary>
-    /// Provides functionality for local port forwarding
-    /// </summary>
-    public partial class ForwardedPortLocal
-    {
-        partial void InternalStart()
-        {
-            throw new NotImplementedException();
-        }
-
-        partial void InternalStop(TimeSpan timeout)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/src/Renci.SshNet.Silverlight/PasswordConnectionInfo.SilverlightShared.cs b/src/Renci.SshNet.Silverlight/PasswordConnectionInfo.SilverlightShared.cs
deleted file mode 100644
index 430bca78..00000000
--- a/src/Renci.SshNet.Silverlight/PasswordConnectionInfo.SilverlightShared.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Threading;
-
-namespace Renci.SshNet
-{
-    /// <summary>
-    /// Provides connection information when password authentication method is used
-    /// </summary>
-    public partial class PasswordConnectionInfo
-    {
-        partial void ExecuteThread(Action action)
-        {
-            ThreadPool.QueueUserWorkItem((o) => { action(); });
-        }
-    }
-}
diff --git a/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj b/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
index 40f2393c..5dca649e 100644
--- a/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
+++ b/src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj
@@ -879,7 +879,6 @@
     </Compile>
     <Compile Include="Channels\ChannelDirectTcpip.SilverlightShared.cs" />
     <Compile Include="Common\Extensions.SilverlightShared.cs" />
-    <Compile Include="ForwardedPortLocal.SilverlightShared.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="..\Renci.SshNet\Properties\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
diff --git a/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj b/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
index 59a7bdf5..47e299b3 100644
--- a/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
+++ b/src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj
@@ -72,9 +72,6 @@
     <Compile Include="..\Renci.SshNet.Silverlight\Channels\ChannelDirectTcpip.SilverlightShared.cs">
       <Link>Channels\ChannelDirectTcpip.SilverlightShared.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet.Silverlight\ForwardedPortLocal.SilverlightShared.cs">
-      <Link>ForwardedPortLocal.SilverlightShared.cs</Link>
-    </Compile>
     <Compile Include="..\Renci.SshNet.Silverlight\Session.SilverlightBrowser.cs">
       <Link>Session.SilverlightBrowser.cs</Link>
     </Compile>
diff --git a/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj b/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
index 59f6486a..3e0b1a7f 100644
--- a/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
+++ b/src/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj
@@ -94,6 +94,9 @@
     <Compile Include="..\Renci.SshNet.Silverlight\Channels\ChannelDirectTcpip.SilverlightShared.cs">
       <Link>Channels\ChannelDirectTcpip.SilverlightShared.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet.WindowsPhone\Session.WP.cs">
+      <Link>Session.WP.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Abstractions\DnsAbstraction.cs">
       <Link>Abstractions\DnsAbstraction.cs</Link>
     </Compile>
@@ -911,7 +914,6 @@
     <Compile Include="..\Renci.SshNet\Properties\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="Session.WP.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Renci.Security.Cryptography, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/src/Renci.SshNet.WindowsPhone8/Session.WP.cs b/src/Renci.SshNet.WindowsPhone8/Session.WP.cs
deleted file mode 100644
index 447f9c69..00000000
--- a/src/Renci.SshNet.WindowsPhone8/Session.WP.cs
+++ /dev/null
@@ -1,78 +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");
-
-            if (message is DisconnectMessage)
-                this.HandleMessage((DisconnectMessage)message);
-            else if (message is IgnoreMessage)
-                this.HandleMessage((IgnoreMessage)message);
-            else if (message is UnimplementedMessage)
-                this.HandleMessage((UnimplementedMessage)message);
-            else if (message is DebugMessage)
-                this.HandleMessage((DebugMessage)message);
-            else if (message is ServiceRequestMessage)
-                this.HandleMessage((ServiceRequestMessage)message);
-            else if (message is ServiceAcceptMessage)
-                this.HandleMessage((ServiceAcceptMessage)message);
-            else if (message is KeyExchangeInitMessage)
-                this.HandleMessage((KeyExchangeInitMessage)message);
-            else if (message is NewKeysMessage)
-                this.HandleMessage((NewKeysMessage)message);
-            else if (message is RequestMessage)
-                this.HandleMessage((RequestMessage)message);
-            else if (message is FailureMessage)
-                this.HandleMessage((FailureMessage)message);
-            else if (message is SuccessMessage)
-                this.HandleMessage((SuccessMessage)message);
-            else if (message is BannerMessage)
-                this.HandleMessage((BannerMessage)message);
-            else if (message is GlobalRequestMessage)
-                this.HandleMessage((GlobalRequestMessage)message);
-            else if (message is RequestSuccessMessage)
-                this.HandleMessage((RequestSuccessMessage)message);
-            else if (message is RequestFailureMessage)
-                this.HandleMessage((RequestFailureMessage)message);
-            else if (message is ChannelOpenMessage)
-                this.HandleMessage((ChannelOpenMessage)message);
-            else if (message is ChannelOpenConfirmationMessage)
-                this.HandleMessage((ChannelOpenConfirmationMessage)message);
-            else if (message is ChannelOpenFailureMessage)
-                this.HandleMessage((ChannelOpenFailureMessage)message);
-            else if (message is ChannelWindowAdjustMessage)
-                this.HandleMessage((ChannelWindowAdjustMessage)message);
-            else if (message is ChannelDataMessage)
-                this.HandleMessage((ChannelDataMessage)message);
-            else if (message is ChannelExtendedDataMessage)
-                this.HandleMessage((ChannelExtendedDataMessage)message);
-            else if (message is ChannelEofMessage)
-                this.HandleMessage((ChannelEofMessage)message);
-            else if (message is ChannelCloseMessage)
-                this.HandleMessage((ChannelCloseMessage)message);
-            else if (message is ChannelRequestMessage)
-                this.HandleMessage((ChannelRequestMessage)message);
-            else if (message is ChannelSuccessMessage)
-                this.HandleMessage((ChannelSuccessMessage)message);
-            else if (message is ChannelFailureMessage)
-                this.HandleMessage((ChannelFailureMessage)message);
-            else
-            {
-                Debug.WriteLine("SSH.NET WARNING: unknown message type {0} - may need to add new type to Session.WP.cs, HandleMessageCore method",
-                    message.GetType().FullName);
-
-                this.HandleMessage(message);
-            }
-        }
-    }
-}