diff --git a/NzbDrone.Api/NzbDrone.Api.csproj b/NzbDrone.Api/NzbDrone.Api.csproj
index 5f5ef4221..057c8ad41 100644
--- a/NzbDrone.Api/NzbDrone.Api.csproj
+++ b/NzbDrone.Api/NzbDrone.Api.csproj
@@ -74,14 +74,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NLog.2.0.1.2\lib\net40\NLog.dll</HintPath>
     </Reference>
-    <Reference Include="SignalR, Version=0.5.1.10822, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\SignalR.Server.0.5.3\lib\net40\SignalR.dll</HintPath>
-    </Reference>
-    <Reference Include="SignalR.Hosting.Common, Version=0.5.1.10822, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\SignalR.Hosting.Common.0.5.3\lib\net40\SignalR.Hosting.Common.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Microsoft.CSharp" />
@@ -125,7 +117,6 @@
     <Compile Include="Resolvers\QualitiesToAllowedResolver.cs" />
     <Compile Include="Resolvers\QualityTypesToIntResolver.cs" />
     <Compile Include="Settings\SettingsModule.cs" />
-    <Compile Include="TinyIoCDependencyResolver.cs" />
     <Compile Include="TinyIoCNancyBootstrapper.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/NzbDrone.Api/TinyIoCDependencyResolver.cs b/NzbDrone.Api/TinyIoCDependencyResolver.cs
deleted file mode 100644
index e045a9b1d..000000000
--- a/NzbDrone.Api/TinyIoCDependencyResolver.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using SignalR;
-using TinyIoC;
-
-namespace NzbDrone.Api
-{
-    public class TinyIoCDependencyResolver : DefaultDependencyResolver
-    {
-        private readonly TinyIoCContainer _container;
-
-        public TinyIoCDependencyResolver(TinyIoCContainer container)
-        {
-            _container = container;
-        }
-
-        public override object GetService(Type serviceType)
-        {
-            if (_container.CanResolve(serviceType))
-            {
-                return _container.Resolve(serviceType);
-            }
-
-            return base.GetService(serviceType);
-        }
-
-        public override IEnumerable<object> GetServices(Type serviceType)
-        {
-            IEnumerable<object> services = new object[] { };
-            
-            if (_container.CanResolve(serviceType))
-            {
-                services = _container.ResolveAll(serviceType);
-            }
-
-            return services.Concat(base.GetServices(serviceType));
-        }
-    }
-}
\ No newline at end of file
diff --git a/NzbDrone.Api/packages.config b/NzbDrone.Api/packages.config
index f42130b1f..e36eebf8c 100644
--- a/NzbDrone.Api/packages.config
+++ b/NzbDrone.Api/packages.config
@@ -5,6 +5,4 @@
   <package id="Nancy" version="0.16.1" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="5.0.2" targetFramework="net40" />
   <package id="NLog" version="2.0.1.2" targetFramework="net40" />
-  <package id="SignalR.Hosting.Common" version="0.5.3" targetFramework="net40" />
-  <package id="SignalR.Server" version="0.5.3" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/NzbDrone.App.Test/ContainerFixture.cs b/NzbDrone.App.Test/ContainerFixture.cs
index 731f8ec30..55d64e82c 100644
--- a/NzbDrone.App.Test/ContainerFixture.cs
+++ b/NzbDrone.App.Test/ContainerFixture.cs
@@ -17,7 +17,6 @@ public void should_be_able_to_resolve_event_handlers()
             ContainerBuilder.Instance.Resolve<IEnumerable<IHandle>>().Should().NotBeEmpty();
         }
 
-
         [Test]
         public void should_be_able_to_resolve_indexers()
         {
diff --git a/NzbDrone.Common/Contract/ParseErrorReport.cs b/NzbDrone.Common/Contract/ParseErrorReport.cs
index 19b5ad6ef..fe78111e6 100644
--- a/NzbDrone.Common/Contract/ParseErrorReport.cs
+++ b/NzbDrone.Common/Contract/ParseErrorReport.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using Newtonsoft.Json;
 
 namespace NzbDrone.Common.Contract
diff --git a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
index 2d0e6ce4b..9c3c3db27 100644
--- a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -107,10 +107,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Prowlin.0.9.4456.26422\lib\net40\Prowlin.dll</HintPath>
     </Reference>
-    <Reference Include="SignalR, Version=0.5.1.10822, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\SignalR.Server.0.5.3\lib\net40\SignalR.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.ServiceModel" />
diff --git a/NzbDrone.Core.Test/packages.config b/NzbDrone.Core.Test/packages.config
index a99262acd..58fd5565c 100644
--- a/NzbDrone.Core.Test/packages.config
+++ b/NzbDrone.Core.Test/packages.config
@@ -11,6 +11,5 @@
   <package id="NLog" version="2.0.1.2" targetFramework="net40" />
   <package id="NUnit" version="2.6.2" targetFramework="net40" />
   <package id="Prowlin" version="0.9.4456.26422" targetFramework="net40" />
-  <package id="SignalR.Server" version="0.5.3" targetFramework="net40" />
   <package id="Unity" version="2.1.505.2" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj
index 418ffbc04..6a84aa78c 100644
--- a/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/NzbDrone.Core/NzbDrone.Core.csproj
@@ -157,9 +157,6 @@
     <Reference Include="RestSharp">
       <HintPath>..\packages\RestSharp.104.1\lib\net4\RestSharp.dll</HintPath>
     </Reference>
-    <Reference Include="SignalR">
-      <HintPath>..\packages\SignalR.Server.0.5.3\lib\net40\SignalR.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
diff --git a/NzbDrone.Core/packages.config b/NzbDrone.Core/packages.config
index 24d66698e..82d976ee4 100644
--- a/NzbDrone.Core/packages.config
+++ b/NzbDrone.Core/packages.config
@@ -8,7 +8,5 @@
   <package id="NLog" version="2.0.1.2" targetFramework="net40" />
   <package id="Prowlin" version="0.9.4456.26422" targetFramework="net40" />
   <package id="RestSharp" version="104.1" targetFramework="net40" />
-  <package id="SignalR.Hosting.Common" version="0.5.3" targetFramework="net40" />
-  <package id="SignalR.Server" version="0.5.3" targetFramework="net40" />
   <package id="twitterizer" version="2.4.0.26532" />
 </packages>
\ No newline at end of file
diff --git a/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj b/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj
index f5bb09190..f27aadabc 100644
--- a/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj
+++ b/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj
@@ -11,6 +11,8 @@
     <AssemblyName>NzbDrone.Libraries.Test</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -58,6 +60,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">