diff --git a/NzbDrone.Api/ErrorManagement/NzbDroneErrorPipeline.cs b/NzbDrone.Api/ErrorManagement/NzbDroneErrorPipeline.cs
index 0deee3096..9db64b37d 100644
--- a/NzbDrone.Api/ErrorManagement/NzbDroneErrorPipeline.cs
+++ b/NzbDrone.Api/ErrorManagement/NzbDroneErrorPipeline.cs
@@ -1,10 +1,8 @@
 using System;
-using System.Net;
 using FluentValidation;
 using NLog;
 using Nancy;
 using NzbDrone.Api.Extensions;
-using NzbDrone.Common.Exceptions;
 using HttpStatusCode = Nancy.HttpStatusCode;
 
 namespace NzbDrone.Api.ErrorManagement
diff --git a/NzbDrone.Api/Logs/LogFileModule.cs b/NzbDrone.Api/Logs/LogFileModule.cs
index 02d260485..4fe48d21e 100644
--- a/NzbDrone.Api/Logs/LogFileModule.cs
+++ b/NzbDrone.Api/Logs/LogFileModule.cs
@@ -1,5 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using NzbDrone.Common;
diff --git a/NzbDrone.Api/Series/SeriesModule.cs b/NzbDrone.Api/Series/SeriesModule.cs
index 35fc88da1..77c7094f5 100644
--- a/NzbDrone.Api/Series/SeriesModule.cs
+++ b/NzbDrone.Api/Series/SeriesModule.cs
@@ -2,13 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using FluentValidation;
-using Nancy;
-using NzbDrone.Core.Datastore;
 using NzbDrone.Core.MediaCover;
 using NzbDrone.Core.SeriesStats;
 using NzbDrone.Core.Tv;
 using NzbDrone.Api.Validation;
-using NzbDrone.Api.Extensions;
 using NzbDrone.Api.Mapping;
 
 namespace NzbDrone.Api.Series
diff --git a/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj b/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj
index f953d6c07..dd04fc5bf 100644
--- a/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj
+++ b/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj
@@ -62,7 +62,6 @@
     <Compile Include="CacheTests\CachedManagerFixture.cs" />
     <Compile Include="CacheTests\CachedFixture.cs" />
     <Compile Include="ConfigFileProviderTest.cs" />
-    <Compile Include="DirectoryLookupServiceFixture.cs" />
     <Compile Include="EnsureTest\PathExtensionFixture.cs" />
     <Compile Include="EnvironmentTests\StartupArgumentsFixture.cs" />
     <Compile Include="EnvironmentTests\EnviromentProviderTest.cs" />
diff --git a/NzbDrone.Common.Test/WebClientTests.cs b/NzbDrone.Common.Test/WebClientTests.cs
index 7efd4d4c3..b68d66c56 100644
--- a/NzbDrone.Common.Test/WebClientTests.cs
+++ b/NzbDrone.Common.Test/WebClientTests.cs
@@ -1,6 +1,5 @@
 
 using System;
-using System.Net;
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Test.Common;
diff --git a/NzbDrone.Common/NzbDrone.Common.csproj b/NzbDrone.Common/NzbDrone.Common.csproj
index 51bc2324e..8b1b1259a 100644
--- a/NzbDrone.Common/NzbDrone.Common.csproj
+++ b/NzbDrone.Common/NzbDrone.Common.csproj
@@ -66,7 +66,6 @@
     <Compile Include="Composition\Container.cs" />
     <Compile Include="Composition\IContainer.cs" />
     <Compile Include="Composition\ContainerBuilderBase.cs" />
-    <Compile Include="DirectoryLookupService.cs" />
     <Compile Include="EnsureThat\Ensure.cs" />
     <Compile Include="EnsureThat\EnsureBoolExtensions.cs" />
     <Compile Include="EnsureThat\EnsureCollectionExtensions.cs" />
diff --git a/NzbDrone.Core.Test/MediaFileTests/RenameEpisodeFileServiceFixture.cs b/NzbDrone.Core.Test/MediaFileTests/RenameEpisodeFileServiceFixture.cs
index 989d1148c..4c76ee406 100644
--- a/NzbDrone.Core.Test/MediaFileTests/RenameEpisodeFileServiceFixture.cs
+++ b/NzbDrone.Core.Test/MediaFileTests/RenameEpisodeFileServiceFixture.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using FizzWare.NBuilder;
 using Moq;
 using NUnit.Framework;
diff --git a/NzbDrone.Core.Test/OrganizerTests/GetNewFilenameFixture.cs b/NzbDrone.Core.Test/OrganizerTests/GetNewFilenameFixture.cs
index 8877b5b19..585fb10aa 100644
--- a/NzbDrone.Core.Test/OrganizerTests/GetNewFilenameFixture.cs
+++ b/NzbDrone.Core.Test/OrganizerTests/GetNewFilenameFixture.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using FizzWare.NBuilder;
diff --git a/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/FindEpisodeFixture.cs b/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/FindEpisodeFixture.cs
index 3f813a3db..21fa4c91a 100644
--- a/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/FindEpisodeFixture.cs
+++ b/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/FindEpisodeFixture.cs
@@ -1,5 +1,4 @@
-using System;
-using FizzWare.NBuilder;
+using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Test.Framework;
diff --git a/NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs b/NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs
index 10291e2c6..30e142e23 100644
--- a/NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs
+++ b/NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using NzbDrone.Core.Annotations;
 
diff --git a/NzbDrone.Core/Instrumentation/SetLoggingLevel.cs b/NzbDrone.Core/Instrumentation/SetLoggingLevel.cs
index bc3f0e3d7..251ef6f38 100644
--- a/NzbDrone.Core/Instrumentation/SetLoggingLevel.cs
+++ b/NzbDrone.Core/Instrumentation/SetLoggingLevel.cs
@@ -1,13 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Xml.Linq;
 using NLog;
 using NLog.Config;
-using NzbDrone.Common;
-using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Messaging;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Configuration.Events;
diff --git a/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs b/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs
index b585a58c5..1566acbe0 100644
--- a/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs
+++ b/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using NLog;
 using NzbDrone.Common;
 using NzbDrone.Core.DecisionEngine;
-using NzbDrone.Core.MediaFiles.EpisodeImport.Specifications;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Tv;
diff --git a/NzbDrone.Core/MediaFiles/Events/EpisodeDownloadedEvent.cs b/NzbDrone.Core/MediaFiles/Events/EpisodeDownloadedEvent.cs
index eb2ecee77..b7b80e4fd 100644
--- a/NzbDrone.Core/MediaFiles/Events/EpisodeDownloadedEvent.cs
+++ b/NzbDrone.Core/MediaFiles/Events/EpisodeDownloadedEvent.cs
@@ -1,6 +1,5 @@
 using NzbDrone.Common.Messaging;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Core.MediaFiles.Events
 {
diff --git a/NzbDrone.Core/MediaFiles/MediaFileService.cs b/NzbDrone.Core/MediaFiles/MediaFileService.cs
index 487afd3b8..09dc47986 100644
--- a/NzbDrone.Core/MediaFiles/MediaFileService.cs
+++ b/NzbDrone.Core/MediaFiles/MediaFileService.cs
@@ -1,9 +1,7 @@
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using NLog;
 using NzbDrone.Common.Messaging;
-using NzbDrone.Core.Configuration;
 using NzbDrone.Core.MediaFiles.Events;
 using NzbDrone.Core.Tv.Events;
 
diff --git a/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs b/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs
index 3f44b96ff..b72f03b4f 100644
--- a/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs
+++ b/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs
@@ -4,7 +4,6 @@ using NLog;
 using NzbDrone.Common;
 using NzbDrone.Common.Messaging;
 using NzbDrone.Core.MediaFiles.Commands;
-using NzbDrone.Core.Parser;
 using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Core.MediaFiles
diff --git a/NzbDrone.Core/MediaFiles/RenameEpisodeFileService.cs b/NzbDrone.Core/MediaFiles/RenameEpisodeFileService.cs
index ea5be0e68..514d34402 100644
--- a/NzbDrone.Core/MediaFiles/RenameEpisodeFileService.cs
+++ b/NzbDrone.Core/MediaFiles/RenameEpisodeFileService.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using NLog;
 using NzbDrone.Common.Messaging;
 using NzbDrone.Core.MediaFiles.Commands;
diff --git a/NzbDrone.Core/Notifications/NotificationService.cs b/NzbDrone.Core/Notifications/NotificationService.cs
index d66d00752..d48398898 100644
--- a/NzbDrone.Core/Notifications/NotificationService.cs
+++ b/NzbDrone.Core/Notifications/NotificationService.cs
@@ -7,7 +7,6 @@ using NzbDrone.Common.Messaging;
 using NzbDrone.Common.Serializer;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.MediaFiles.Events;
-using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Tv;
 using Omu.ValueInjecter;
 
diff --git a/NzbDrone.Core/Notifications/Pushover/Pushover.cs b/NzbDrone.Core/Notifications/Pushover/Pushover.cs
index 51abfed35..c4ab7153a 100644
--- a/NzbDrone.Core/Notifications/Pushover/Pushover.cs
+++ b/NzbDrone.Core/Notifications/Pushover/Pushover.cs
@@ -1,6 +1,4 @@
-using NzbDrone.Core.Notifications.Prowl;
-using NzbDrone.Core.Tv;
-using Prowlin;
+using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Core.Notifications.Pushover
 {
diff --git a/NzbDrone.Core/Notifications/Pushover/PushoverService.cs b/NzbDrone.Core/Notifications/Pushover/PushoverService.cs
index c0d944348..2d8a7ed63 100644
--- a/NzbDrone.Core/Notifications/Pushover/PushoverService.cs
+++ b/NzbDrone.Core/Notifications/Pushover/PushoverService.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Net;
+using System.Net;
 using NLog;
 using NzbDrone.Common.Messaging;
 using RestSharp;
diff --git a/NzbDrone.Core/Update/InstallUpdateService.cs b/NzbDrone.Core/Update/InstallUpdateService.cs
index 9261cd4dd..d79d663b9 100644
--- a/NzbDrone.Core/Update/InstallUpdateService.cs
+++ b/NzbDrone.Core/Update/InstallUpdateService.cs
@@ -3,10 +3,8 @@ using System.Diagnostics;
 using System.IO;
 using NLog;
 using NzbDrone.Common;
-using NzbDrone.Common.Cache;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Messaging;
-using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Update.Commands;
 
 namespace NzbDrone.Core.Update
diff --git a/NzbDrone.Test.Common/StringExtensions.cs b/NzbDrone.Test.Common/StringExtensions.cs
index 7a7a420de..7ec3f4698 100644
--- a/NzbDrone.Test.Common/StringExtensions.cs
+++ b/NzbDrone.Test.Common/StringExtensions.cs
@@ -1,5 +1,4 @@
 using System.IO;
-using Newtonsoft.Json.Serialization;
 using NzbDrone.Common.EnvironmentInfo;
 
 namespace NzbDrone.Test.Common