diff --git a/.editorconfig b/.editorconfig
index 106c1dacc..19328d784 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -40,6 +40,9 @@ csharp_style_var_for_built_in_types = true:suggestion
 csharp_style_var_when_type_is_apparent = true:suggestion
 csharp_style_var_elsewhere = true:suggestion
 
+# Using directive is unnecessary.
+dotnet_diagnostic.IDE0005.severity = error
+
 # Stylecop Rules
 dotnet_diagnostic.SA0001.severity = none
 dotnet_diagnostic.SA1005.severity = none
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index eb8c9f679..4390c8d5d 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -2,6 +2,7 @@
   <!-- Common to all Readarr Projects -->
   <PropertyGroup>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
 
@@ -51,7 +52,7 @@
 
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
-  
+
   <!-- Test projects need bindingRedirects -->
   <PropertyGroup Condition="'$(ReadarrOutputType)'=='Test'">
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -64,7 +65,7 @@
     <Product>Readarr</Product>
     <Company>readarr.com</Company>
     <Copyright>Copyright 2017-$([System.DateTime]::Now.ToString('yyyy')) readarr.com (GNU General Public v3)</Copyright>
-    
+
     <!-- Should be replaced by CI -->
     <AssemblyVersion>10.0.0.*</AssemblyVersion>
     <AssemblyConfiguration>$(Configuration)-dev</AssemblyConfiguration>
@@ -73,7 +74,7 @@
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    
+
     <Deterministic Condition="$(AssemblyVersion.EndsWith('*'))">False</Deterministic>
   </PropertyGroup>
 
diff --git a/src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs b/src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs
index d966e419c..56338080d 100644
--- a/src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs
+++ b/src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Abstractions;
diff --git a/src/NzbDrone.Common.Test/ExtensionTests/StringExtensionTests/IsValidIPAddressFixture.cs b/src/NzbDrone.Common.Test/ExtensionTests/StringExtensionTests/IsValidIPAddressFixture.cs
index 0e2ac3d63..8a049f068 100644
--- a/src/NzbDrone.Common.Test/ExtensionTests/StringExtensionTests/IsValidIPAddressFixture.cs
+++ b/src/NzbDrone.Common.Test/ExtensionTests/StringExtensionTests/IsValidIPAddressFixture.cs
@@ -1,4 +1,3 @@
-using System.Globalization;
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Common.Extensions;
diff --git a/src/NzbDrone.Common.Test/ExtensionTests/StringExtensionTests/ToSortNameFixture.cs b/src/NzbDrone.Common.Test/ExtensionTests/StringExtensionTests/ToSortNameFixture.cs
index 1009867e8..041868408 100644
--- a/src/NzbDrone.Common.Test/ExtensionTests/StringExtensionTests/ToSortNameFixture.cs
+++ b/src/NzbDrone.Common.Test/ExtensionTests/StringExtensionTests/ToSortNameFixture.cs
@@ -1,5 +1,4 @@
 using FluentAssertions;
-using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using NUnit.Framework;
 using NzbDrone.Common.Extensions;
 
diff --git a/src/NzbDrone.Common/Cache/Cached.cs b/src/NzbDrone.Common/Cache/Cached.cs
index 8ab02f22b..a22c9ade3 100644
--- a/src/NzbDrone.Common/Cache/Cached.cs
+++ b/src/NzbDrone.Common/Cache/Cached.cs
@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using NzbDrone.Common.EnsureThat;
-using NzbDrone.Common.Extensions;
 
 namespace NzbDrone.Common.Cache
 {
diff --git a/src/NzbDrone.Common/Composition/AssemblyLoader.cs b/src/NzbDrone.Common/Composition/AssemblyLoader.cs
index 41394f41f..178d4ebbb 100644
--- a/src/NzbDrone.Common/Composition/AssemblyLoader.cs
+++ b/src/NzbDrone.Common/Composition/AssemblyLoader.cs
@@ -5,8 +5,6 @@ using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Runtime.Loader;
-using System.Text;
-using System.Threading.Tasks;
 using NzbDrone.Common.EnvironmentInfo;
 
 namespace NzbDrone.Common.Composition
diff --git a/src/NzbDrone.Common/Disk/IDiskProvider.cs b/src/NzbDrone.Common/Disk/IDiskProvider.cs
index d418abbcc..a689edf0a 100644
--- a/src/NzbDrone.Common/Disk/IDiskProvider.cs
+++ b/src/NzbDrone.Common/Disk/IDiskProvider.cs
@@ -2,8 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Abstractions;
-using System.Security.AccessControl;
-using System.Security.Principal;
 
 namespace NzbDrone.Common.Disk
 {
diff --git a/src/NzbDrone.Common/EnvironmentInfo/AppFolderFactory.cs b/src/NzbDrone.Common/EnvironmentInfo/AppFolderFactory.cs
index 9869fb343..06a268eaa 100644
--- a/src/NzbDrone.Common/EnvironmentInfo/AppFolderFactory.cs
+++ b/src/NzbDrone.Common/EnvironmentInfo/AppFolderFactory.cs
@@ -1,7 +1,5 @@
 using System;
 using System.IO;
-using System.Security.AccessControl;
-using System.Security.Principal;
 using NLog;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.Exceptions;
diff --git a/src/NzbDrone.Common/Http/Dispatchers/ICertificateValidationService.cs b/src/NzbDrone.Common/Http/Dispatchers/ICertificateValidationService.cs
index 187c1fd43..54f3e2a8d 100644
--- a/src/NzbDrone.Common/Http/Dispatchers/ICertificateValidationService.cs
+++ b/src/NzbDrone.Common/Http/Dispatchers/ICertificateValidationService.cs
@@ -1,4 +1,3 @@
-using System.Net.Http;
 using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
 
diff --git a/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs b/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs
index 0a8fe681b..3c4043e99 100644
--- a/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs
+++ b/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs
@@ -8,7 +8,6 @@ using System.Net.Sockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http.Proxy;
diff --git a/src/NzbDrone.Common/Http/HttpHeader.cs b/src/NzbDrone.Common/Http/HttpHeader.cs
index 63fad846d..f4f1e8a84 100644
--- a/src/NzbDrone.Common/Http/HttpHeader.cs
+++ b/src/NzbDrone.Common/Http/HttpHeader.cs
@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Globalization;
 using System.Linq;
-using System.Net;
 using System.Net.Http.Headers;
 using System.Text;
 using NzbDrone.Common.Extensions;
diff --git a/src/NzbDrone.Common/Http/UserAgentParser.cs b/src/NzbDrone.Common/Http/UserAgentParser.cs
index 2c382236a..0a31410f2 100644
--- a/src/NzbDrone.Common/Http/UserAgentParser.cs
+++ b/src/NzbDrone.Common/Http/UserAgentParser.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace NzbDrone.Common.Http
 {
     public static class UserAgentParser
diff --git a/src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs b/src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs
index 228155da6..90c92d668 100644
--- a/src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs
+++ b/src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Linq;
 using System.Net;
 using System.Text.RegularExpressions;
diff --git a/src/NzbDrone.Common/Instrumentation/GlobalExceptionHandlers.cs b/src/NzbDrone.Common/Instrumentation/GlobalExceptionHandlers.cs
index 50ede78a5..bd4d2c187 100644
--- a/src/NzbDrone.Common/Instrumentation/GlobalExceptionHandlers.cs
+++ b/src/NzbDrone.Common/Instrumentation/GlobalExceptionHandlers.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using NLog;
-using NzbDrone.Common.EnvironmentInfo;
 
 namespace NzbDrone.Common.Instrumentation
 {
diff --git a/src/NzbDrone.Common/Instrumentation/Sentry/SentryCleanser.cs b/src/NzbDrone.Common/Instrumentation/Sentry/SentryCleanser.cs
index a56e57376..85175b426 100644
--- a/src/NzbDrone.Common/Instrumentation/Sentry/SentryCleanser.cs
+++ b/src/NzbDrone.Common/Instrumentation/Sentry/SentryCleanser.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using Sentry;
-using Sentry.Protocol;
 
 namespace NzbDrone.Common.Instrumentation.Sentry
 {
diff --git a/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs b/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs
index 5a3bd9d55..cfc62ed2f 100644
--- a/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs
+++ b/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs
@@ -9,9 +9,7 @@ using NLog;
 using NLog.Common;
 using NLog.Targets;
 using NzbDrone.Common.EnvironmentInfo;
-using NzbDrone.Common.Extensions;
 using Sentry;
-using Sentry.Protocol;
 
 namespace NzbDrone.Common.Instrumentation.Sentry
 {
diff --git a/src/NzbDrone.Common/ServiceProvider.cs b/src/NzbDrone.Common/ServiceProvider.cs
index 364181697..c18914c79 100644
--- a/src/NzbDrone.Common/ServiceProvider.cs
+++ b/src/NzbDrone.Common/ServiceProvider.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.Linq;
 using System.ServiceProcess;
 using NLog;
diff --git a/src/NzbDrone.Core.Test/Datastore/LazyLoadingFixture.cs b/src/NzbDrone.Core.Test/Datastore/LazyLoadingFixture.cs
index e7a89a18e..11b725f4e 100644
--- a/src/NzbDrone.Core.Test/Datastore/LazyLoadingFixture.cs
+++ b/src/NzbDrone.Core.Test/Datastore/LazyLoadingFixture.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using Dapper;
 using FizzWare.NBuilder;
 using NUnit.Framework;
 using NzbDrone.Core.Books;
diff --git a/src/NzbDrone.Core.Test/Datastore/Migration/026_add_custom_formatsFixture.cs b/src/NzbDrone.Core.Test/Datastore/Migration/026_add_custom_formatsFixture.cs
index 134c6ffc3..4612778a4 100644
--- a/src/NzbDrone.Core.Test/Datastore/Migration/026_add_custom_formatsFixture.cs
+++ b/src/NzbDrone.Core.Test/Datastore/Migration/026_add_custom_formatsFixture.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using FluentAssertions;
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/RepackSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/RepackSpecificationFixture.cs
index 208e16aa2..35bb8ebf8 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/RepackSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/RepackSpecificationFixture.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using FizzWare.NBuilder;
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs
index 3909e5857..f79745283 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs
@@ -7,7 +7,6 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Core.Books;
 using NzbDrone.Core.CustomFormats;
-using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Parser.Model;
diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs
index 4307a9b99..3b0b19cd5 100644
--- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using FizzWare.NBuilder;
 using FluentAssertions;
diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/IndexerJackettAllCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/IndexerJackettAllCheckFixture.cs
index f3edd6413..6cbe0934e 100644
--- a/src/NzbDrone.Core.Test/HealthCheck/Checks/IndexerJackettAllCheckFixture.cs
+++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/IndexerJackettAllCheckFixture.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using Moq;
 using NUnit.Framework;
diff --git a/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedBookFilesFixture.cs b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedBookFilesFixture.cs
index 8844613ab..7b5944cd1 100644
--- a/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedBookFilesFixture.cs
+++ b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedBookFilesFixture.cs
@@ -1,8 +1,6 @@
-using System.Linq;
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
-using NzbDrone.Core.Books;
 using NzbDrone.Core.Housekeeping.Housekeepers;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Qualities;
diff --git a/src/NzbDrone.Core.Test/ImportListTests/ImportListServiceFixture.cs b/src/NzbDrone.Core.Test/ImportListTests/ImportListServiceFixture.cs
index b62c9ace6..5d2adb3e7 100644
--- a/src/NzbDrone.Core.Test/ImportListTests/ImportListServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/ImportListTests/ImportListServiceFixture.cs
@@ -1,11 +1,3 @@
-using System.Collections.Generic;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.ImportLists;
-using NzbDrone.Core.Lifecycle;
-using NzbDrone.Core.Test.Framework;
-
 namespace NzbDrone.Core.Test.ImportListTests
 {
     /*
diff --git a/src/NzbDrone.Core.Test/IndexerTests/TorznabTests/TorznabFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/TorznabTests/TorznabFixture.cs
index fcf07dd6a..48715ef21 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/TorznabTests/TorznabFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/TorznabTests/TorznabFixture.cs
@@ -1,10 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using FizzWare.NBuilder;
 using FluentAssertions;
-using FluentValidation.Results;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Http;
diff --git a/src/NzbDrone.Core.Test/MediaFiles/EbookTagServiceFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/EbookTagServiceFixture.cs
index 03c25dcf7..1efb0e1f3 100644
--- a/src/NzbDrone.Core.Test/MediaFiles/EbookTagServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/EbookTagServiceFixture.cs
@@ -1,11 +1,9 @@
-using System.Collections.Generic;
 using System.Linq;
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common;
 using VersOne.Epub.Schema;
 
 namespace NzbDrone.Core.Test.MediaFiles.AudioTagServiceFixture
diff --git a/src/NzbDrone.Core.Test/MediaFiles/TrackFileMovingServiceTests/MoveTrackFileFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/TrackFileMovingServiceTests/MoveTrackFileFixture.cs
index f01c83592..31186baba 100644
--- a/src/NzbDrone.Core.Test/MediaFiles/TrackFileMovingServiceTests/MoveTrackFileFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/TrackFileMovingServiceTests/MoveTrackFileFixture.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using FizzWare.NBuilder;
 using Moq;
 using NUnit.Framework;
diff --git a/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/IdentificationServiceFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/IdentificationServiceFixture.cs
index 7bacb6922..7151cf4de 100644
--- a/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/IdentificationServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/IdentificationServiceFixture.cs
@@ -19,8 +19,6 @@ using NzbDrone.Core.MediaFiles.BookImport.Identification;
 using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.MetadataSource;
 using NzbDrone.Core.MetadataSource.BookInfo;
-using NzbDrone.Core.MetadataSource.Goodreads;
-using NzbDrone.Core.Parser;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Profiles.Metadata;
 using NzbDrone.Core.Test.Framework;
diff --git a/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Specifications/UpgradeSpecificationFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Specifications/UpgradeSpecificationFixture.cs
index 1bd1dbbc0..56b29dc53 100644
--- a/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Specifications/UpgradeSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Specifications/UpgradeSpecificationFixture.cs
@@ -1,15 +1,5 @@
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
 using NUnit.Framework;
-using NzbDrone.Core.Books;
-using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Datastore;
-using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.MediaFiles.BookImport.Specifications;
-using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Profiles.Qualities;
-using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Test.Framework;
 
 namespace NzbDrone.Core.Test.MediaFiles.BookImport.Specifications
diff --git a/src/NzbDrone.Core.Test/Profiles/Metadata/MetadataProfileRepositoryFixture.cs b/src/NzbDrone.Core.Test/Profiles/Metadata/MetadataProfileRepositoryFixture.cs
index 0647b1c4e..0790bb8f3 100644
--- a/src/NzbDrone.Core.Test/Profiles/Metadata/MetadataProfileRepositoryFixture.cs
+++ b/src/NzbDrone.Core.Test/Profiles/Metadata/MetadataProfileRepositoryFixture.cs
@@ -1,7 +1,4 @@
-using System.Linq;
-using FluentAssertions;
 using NUnit.Framework;
-using NzbDrone.Core.Books;
 using NzbDrone.Core.Profiles.Metadata;
 using NzbDrone.Core.Test.Framework;
 
diff --git a/src/NzbDrone.Core.Test/Profiles/Metadata/MetadataProfileServiceFixture.cs b/src/NzbDrone.Core.Test/Profiles/Metadata/MetadataProfileServiceFixture.cs
index 7dcb714ec..f33ff14a0 100644
--- a/src/NzbDrone.Core.Test/Profiles/Metadata/MetadataProfileServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/Profiles/Metadata/MetadataProfileServiceFixture.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using FizzWare.NBuilder;
 using Moq;
diff --git a/src/NzbDrone.Core/Authentication/UserService.cs b/src/NzbDrone.Core/Authentication/UserService.cs
index 6db5c8d2c..73f70aa5b 100644
--- a/src/NzbDrone.Core/Authentication/UserService.cs
+++ b/src/NzbDrone.Core/Authentication/UserService.cs
@@ -1,11 +1,7 @@
-using System;
-using System.Linq;
-using System.Xml.Linq;
+using System;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
-using NzbDrone.Core.Lifecycle;
-using NzbDrone.Core.Messaging.Events;
 
 namespace NzbDrone.Core.Authentication
 {
diff --git a/src/NzbDrone.Core/Books/Calibre/CalibreImageValidator.cs b/src/NzbDrone.Core/Books/Calibre/CalibreImageValidator.cs
index 9db26e8df..32164b261 100644
--- a/src/NzbDrone.Core/Books/Calibre/CalibreImageValidator.cs
+++ b/src/NzbDrone.Core/Books/Calibre/CalibreImageValidator.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Linq;
 using System.Text;
 
diff --git a/src/NzbDrone.Core/Books/Events/AuthorDeletedEvent.cs b/src/NzbDrone.Core/Books/Events/AuthorDeletedEvent.cs
index f8781b27b..fd35da1b2 100644
--- a/src/NzbDrone.Core/Books/Events/AuthorDeletedEvent.cs
+++ b/src/NzbDrone.Core/Books/Events/AuthorDeletedEvent.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using NzbDrone.Common.Messaging;
 
 namespace NzbDrone.Core.Books.Events
diff --git a/src/NzbDrone.Core/Books/Repositories/EditionRepository.cs b/src/NzbDrone.Core/Books/Repositories/EditionRepository.cs
index bdd511d28..7509aad25 100644
--- a/src/NzbDrone.Core/Books/Repositories/EditionRepository.cs
+++ b/src/NzbDrone.Core/Books/Repositories/EditionRepository.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Common.EnsureThat;
diff --git a/src/NzbDrone.Core/Books/Services/BookService.cs b/src/NzbDrone.Core/Books/Services/BookService.cs
index 7dc3b2c14..3a0946aef 100644
--- a/src/NzbDrone.Core/Books/Services/BookService.cs
+++ b/src/NzbDrone.Core/Books/Services/BookService.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using NLog;
 using NzbDrone.Common.Extensions;
diff --git a/src/NzbDrone.Core/Books/Services/RefreshBookService.cs b/src/NzbDrone.Core/Books/Services/RefreshBookService.cs
index 2b44bc6bb..7b6e07c7b 100644
--- a/src/NzbDrone.Core/Books/Services/RefreshBookService.cs
+++ b/src/NzbDrone.Core/Books/Services/RefreshBookService.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using NLog;
-using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Instrumentation.Extensions;
 using NzbDrone.Core.Books.Commands;
 using NzbDrone.Core.Books.Events;
diff --git a/src/NzbDrone.Core/Books/Services/RefreshEntityServiceBase.cs b/src/NzbDrone.Core/Books/Services/RefreshEntityServiceBase.cs
index e11a7e52c..12fe12919 100644
--- a/src/NzbDrone.Core/Books/Services/RefreshEntityServiceBase.cs
+++ b/src/NzbDrone.Core/Books/Services/RefreshEntityServiceBase.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
-using NzbDrone.Common.Extensions;
 
 namespace NzbDrone.Core.Books
 {
diff --git a/src/NzbDrone.Core/CustomFormats/CustomFormatService.cs b/src/NzbDrone.Core/CustomFormats/CustomFormatService.cs
index 4ba022e44..5475ac5b8 100644
--- a/src/NzbDrone.Core/CustomFormats/CustomFormatService.cs
+++ b/src/NzbDrone.Core/CustomFormats/CustomFormatService.cs
@@ -1,8 +1,7 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Common.Cache;
 using NzbDrone.Core.CustomFormats.Events;
-using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Messaging.Events;
 
 namespace NzbDrone.Core.CustomFormats
diff --git a/src/NzbDrone.Core/CustomFormats/Specifications/ICustomFormatSpecification.cs b/src/NzbDrone.Core/CustomFormats/Specifications/ICustomFormatSpecification.cs
index 1ccdff791..d10d6dbc8 100644
--- a/src/NzbDrone.Core/CustomFormats/Specifications/ICustomFormatSpecification.cs
+++ b/src/NzbDrone.Core/CustomFormats/Specifications/ICustomFormatSpecification.cs
@@ -1,4 +1,3 @@
-using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.CustomFormats
diff --git a/src/NzbDrone.Core/Datastore/Migration/009_update_author_sort_name.cs b/src/NzbDrone.Core/Datastore/Migration/009_update_author_sort_name.cs
index fae9cb9d4..8045597fd 100644
--- a/src/NzbDrone.Core/Datastore/Migration/009_update_author_sort_name.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/009_update_author_sort_name.cs
@@ -1,5 +1,4 @@
 using System.Data;
-using System.Linq;
 using Dapper;
 using FluentMigrator;
 using NzbDrone.Common.Extensions;
diff --git a/src/NzbDrone.Core/Datastore/Migration/011_update_audio_qualities.cs b/src/NzbDrone.Core/Datastore/Migration/011_update_audio_qualities.cs
index 575e8dd43..34633c898 100644
--- a/src/NzbDrone.Core/Datastore/Migration/011_update_audio_qualities.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/011_update_audio_qualities.cs
@@ -5,7 +5,6 @@ using Dapper;
 using FluentMigrator;
 using NzbDrone.Core.Datastore.Converters;
 using NzbDrone.Core.Datastore.Migration.Framework;
-using NzbDrone.Core.Profiles.Qualities;
 
 namespace NzbDrone.Core.Datastore.Migration
 {
diff --git a/src/NzbDrone.Core/Datastore/Migration/013_update_author_sort_name_again.cs b/src/NzbDrone.Core/Datastore/Migration/013_update_author_sort_name_again.cs
index ee7ace701..ae6200655 100644
--- a/src/NzbDrone.Core/Datastore/Migration/013_update_author_sort_name_again.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/013_update_author_sort_name_again.cs
@@ -1,5 +1,4 @@
 using System.Data;
-using System.Linq;
 using Dapper;
 using FluentMigrator;
 using NzbDrone.Common.Extensions;
diff --git a/src/NzbDrone.Core/Datastore/Migration/024_add_update_history.cs b/src/NzbDrone.Core/Datastore/Migration/024_add_update_history.cs
index 479db333c..7050a7449 100644
--- a/src/NzbDrone.Core/Datastore/Migration/024_add_update_history.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/024_add_update_history.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
 using FluentMigrator;
 using NzbDrone.Core.Datastore.Migration.Framework;
 
diff --git a/src/NzbDrone.Core/Datastore/TableMapper.cs b/src/NzbDrone.Core/Datastore/TableMapper.cs
index 9f8bc52f8..24ab5869e 100644
--- a/src/NzbDrone.Core/Datastore/TableMapper.cs
+++ b/src/NzbDrone.Core/Datastore/TableMapper.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
-using Dapper;
 
 namespace NzbDrone.Core.Datastore
 {
diff --git a/src/NzbDrone.Core/Datastore/WhereBuilder.cs b/src/NzbDrone.Core/Datastore/WhereBuilder.cs
index 749515a2d..969364e4f 100644
--- a/src/NzbDrone.Core/Datastore/WhereBuilder.cs
+++ b/src/NzbDrone.Core/Datastore/WhereBuilder.cs
@@ -1,5 +1,4 @@
 using Dapper;
-using NzbDrone.Common.Extensions;
 
 namespace NzbDrone.Core.Datastore
 {
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/AcceptableSizeSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/AcceptableSizeSpecification.cs
index 801216ebc..5cc9e762c 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/AcceptableSizeSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/AcceptableSizeSpecification.cs
@@ -1,6 +1,4 @@
-using System.Linq;
 using NLog;
-using NzbDrone.Common.Extensions;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Qualities;
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs
index ff20f85b6..3aeb4cfd4 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs
@@ -5,7 +5,6 @@ using NzbDrone.Common.Extensions;
 using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Profiles.Releases;
 using NzbDrone.Core.Qualities;
 
 namespace NzbDrone.Core.DecisionEngine.Specifications
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/QueueSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/QueueSpecification.cs
index 31ba9d216..cadc79f67 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/QueueSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/QueueSpecification.cs
@@ -5,7 +5,6 @@ using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.Download.TrackedDownloads;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Profiles.Releases;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Queue;
 
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/ReleaseRestrictionsSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/ReleaseRestrictionsSpecification.cs
index a15e9c52d..3781b685d 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/ReleaseRestrictionsSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/ReleaseRestrictionsSpecification.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DeletedBookFileSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DeletedBookFileSpecification.cs
index 9d8267598..f0ac87d85 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DeletedBookFileSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DeletedBookFileSpecification.cs
@@ -1,7 +1,6 @@
 using System.Linq;
 using NLog;
 using NzbDrone.Common.Disk;
-using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Books;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.IndexerSearch.Definitions;
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs
index 0d40f00b9..11728a2a5 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs
@@ -7,7 +7,6 @@ using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.History;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Profiles.Releases;
 using NzbDrone.Core.Qualities;
 
 namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradableSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradableSpecification.cs
index c57833f1f..7d536e93c 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradableSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradableSpecification.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using NLog;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Configuration;
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeAllowedSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeAllowedSpecification.cs
index 6ab08b787..86685f4e4 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeAllowedSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeAllowedSpecification.cs
@@ -1,11 +1,8 @@
-using System.Collections.Generic;
 using System.Linq;
 using NLog;
-using NzbDrone.Common.Extensions;
 using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Qualities;
 
 namespace NzbDrone.Core.DecisionEngine.Specifications
 {
diff --git a/src/NzbDrone.Core/Download/Clients/Deluge/DelugeLabel.cs b/src/NzbDrone.Core/Download/Clients/Deluge/DelugeLabel.cs
index a5da831ab..3d95413c5 100644
--- a/src/NzbDrone.Core/Download/Clients/Deluge/DelugeLabel.cs
+++ b/src/NzbDrone.Core/Download/Clients/Deluge/DelugeLabel.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json;
 
 namespace NzbDrone.Core.Download.Clients.Deluge
diff --git a/src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStation2Task.cs b/src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStation2Task.cs
index 1240f2c87..ef52bb7e0 100644
--- a/src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStation2Task.cs
+++ b/src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStation2Task.cs
@@ -1,7 +1,3 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
-using NzbDrone.Common.Serializer;
-
 namespace NzbDrone.Core.Download.Clients.DownloadStation
 {
     public class DownloadStation2Task
diff --git a/src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DownloadStationTaskProxySelector.cs b/src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DownloadStationTaskProxySelector.cs
index 7a9531ccd..1eae7930e 100644
--- a/src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DownloadStationTaskProxySelector.cs
+++ b/src/NzbDrone.Core/Download/Clients/DownloadStation/Proxies/DownloadStationTaskProxySelector.cs
@@ -1,8 +1,7 @@
-using System;
+using System;
 using System.Collections.Generic;
 using NLog;
 using NzbDrone.Common.Cache;
-using NzbDrone.Common.Http;
 
 namespace NzbDrone.Core.Download.Clients.DownloadStation.Proxies
 {
diff --git a/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentProxySelector.cs b/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentProxySelector.cs
index cfada22fb..8ba16c810 100644
--- a/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentProxySelector.cs
+++ b/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentProxySelector.cs
@@ -4,8 +4,6 @@ using System.Collections.Generic;
 using NLog;
 using NzbDrone.Common.Cache;
 
-using NzbDrone.Common.Http;
-
 namespace NzbDrone.Core.Download.Clients.QBittorrent
 {
     public interface IQBittorrentProxy
diff --git a/src/NzbDrone.Core/Download/CompletedDownloadService.cs b/src/NzbDrone.Core/Download/CompletedDownloadService.cs
index 3ff389848..f65b6fd39 100644
--- a/src/NzbDrone.Core/Download/CompletedDownloadService.cs
+++ b/src/NzbDrone.Core/Download/CompletedDownloadService.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using NLog;
-using NLog.Fluent;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Instrumentation.Extensions;
diff --git a/src/NzbDrone.Core/Download/DownloadClientBase.cs b/src/NzbDrone.Core/Download/DownloadClientBase.cs
index 9531a1963..dfe997919 100644
--- a/src/NzbDrone.Core/Download/DownloadClientBase.cs
+++ b/src/NzbDrone.Core/Download/DownloadClientBase.cs
@@ -1,6 +1,5 @@
-using System;
+using System;
 using System.Collections.Generic;
-using System.Linq;
 using FluentValidation.Results;
 using NLog;
 using NzbDrone.Common.Disk;
diff --git a/src/NzbDrone.Core/Download/DownloadSeedConfigProvider.cs b/src/NzbDrone.Core/Download/DownloadSeedConfigProvider.cs
index a8a1168e5..94f6f440e 100644
--- a/src/NzbDrone.Core/Download/DownloadSeedConfigProvider.cs
+++ b/src/NzbDrone.Core/Download/DownloadSeedConfigProvider.cs
@@ -1,11 +1,9 @@
 using System;
-using System.Linq;
 using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Download.Clients;
 using NzbDrone.Core.Download.History;
-using NzbDrone.Core.History;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Parser.Model;
 
diff --git a/src/NzbDrone.Core/Download/Extensions/XmlExtensions.cs b/src/NzbDrone.Core/Download/Extensions/XmlExtensions.cs
index 1e9deec9f..bce66c8bc 100644
--- a/src/NzbDrone.Core/Download/Extensions/XmlExtensions.cs
+++ b/src/NzbDrone.Core/Download/Extensions/XmlExtensions.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using System.Xml.Linq;
 using System.Xml.XPath;
 
diff --git a/src/NzbDrone.Core/Download/History/DownloadHistoryService.cs b/src/NzbDrone.Core/Download/History/DownloadHistoryService.cs
index 515fc7cea..548724ea4 100644
--- a/src/NzbDrone.Core/Download/History/DownloadHistoryService.cs
+++ b/src/NzbDrone.Core/Download/History/DownloadHistoryService.cs
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Linq;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Serializer;
diff --git a/src/NzbDrone.Core/Download/NzbValidationService.cs b/src/NzbDrone.Core/Download/NzbValidationService.cs
index 571729ccd..e3cbff710 100644
--- a/src/NzbDrone.Core/Download/NzbValidationService.cs
+++ b/src/NzbDrone.Core/Download/NzbValidationService.cs
@@ -1,4 +1,3 @@
-using System;
 using System.IO;
 using System.Linq;
 using System.Xml;
diff --git a/src/NzbDrone.Core/Download/UsenetClientBase.cs b/src/NzbDrone.Core/Download/UsenetClientBase.cs
index 8e412b062..2bd9b2d23 100644
--- a/src/NzbDrone.Core/Download/UsenetClientBase.cs
+++ b/src/NzbDrone.Core/Download/UsenetClientBase.cs
@@ -1,7 +1,6 @@
 using System.Net;
 using NLog;
 using NzbDrone.Common.Disk;
-using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Exceptions;
diff --git a/src/NzbDrone.Core/Extras/ExtraService.cs b/src/NzbDrone.Core/Extras/ExtraService.cs
index 14da39e44..d9ca882d8 100644
--- a/src/NzbDrone.Core/Extras/ExtraService.cs
+++ b/src/NzbDrone.Core/Extras/ExtraService.cs
@@ -6,7 +6,6 @@ using NLog;
 using NzbDrone.Common.Disk;
 using NzbDrone.Core.Books;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Extras.Files;
 using NzbDrone.Core.MediaCover;
 using NzbDrone.Core.MediaFiles;
diff --git a/src/NzbDrone.Core/Extras/Metadata/ExistingMetadataImporter.cs b/src/NzbDrone.Core/Extras/Metadata/ExistingMetadataImporter.cs
index 497325b3b..a0fe839d9 100644
--- a/src/NzbDrone.Core/Extras/Metadata/ExistingMetadataImporter.cs
+++ b/src/NzbDrone.Core/Extras/Metadata/ExistingMetadataImporter.cs
@@ -2,7 +2,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using NLog;
-using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Books;
 using NzbDrone.Core.Extras.Files;
 using NzbDrone.Core.Extras.Metadata.Files;
diff --git a/src/NzbDrone.Core/Extras/Metadata/MetadataFactory.cs b/src/NzbDrone.Core/Extras/Metadata/MetadataFactory.cs
index fad65a348..dc07e4d4f 100644
--- a/src/NzbDrone.Core/Extras/Metadata/MetadataFactory.cs
+++ b/src/NzbDrone.Core/Extras/Metadata/MetadataFactory.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
-using NzbDrone.Common.Composition;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.ThingiProvider;
 
diff --git a/src/NzbDrone.Core/ImportLists/ImportListBase.cs b/src/NzbDrone.Core/ImportLists/ImportListBase.cs
index 6e8c917e6..776423a74 100644
--- a/src/NzbDrone.Core/ImportLists/ImportListBase.cs
+++ b/src/NzbDrone.Core/ImportLists/ImportListBase.cs
@@ -3,9 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using FluentValidation.Results;
 using NLog;
-using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.ThingiProvider;
diff --git a/src/NzbDrone.Core/ImportLists/ImportListFactory.cs b/src/NzbDrone.Core/ImportLists/ImportListFactory.cs
index 211ccb413..12ca6ce20 100644
--- a/src/NzbDrone.Core/ImportLists/ImportListFactory.cs
+++ b/src/NzbDrone.Core/ImportLists/ImportListFactory.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using FluentValidation.Results;
 using NLog;
-using NzbDrone.Common.Composition;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.ThingiProvider;
 
diff --git a/src/NzbDrone.Core/ImportLists/ImportListStatus.cs b/src/NzbDrone.Core/ImportLists/ImportListStatus.cs
index 90efc387b..60d6aa3a0 100644
--- a/src/NzbDrone.Core/ImportLists/ImportListStatus.cs
+++ b/src/NzbDrone.Core/ImportLists/ImportListStatus.cs
@@ -1,5 +1,4 @@
 using System;
-using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.ThingiProvider.Status;
 
 namespace NzbDrone.Core.ImportLists
diff --git a/src/NzbDrone.Core/IndexerSearch/Definitions/BookSearchCriteria.cs b/src/NzbDrone.Core/IndexerSearch/Definitions/BookSearchCriteria.cs
index c9570ed37..b74c28aa1 100644
--- a/src/NzbDrone.Core/IndexerSearch/Definitions/BookSearchCriteria.cs
+++ b/src/NzbDrone.Core/IndexerSearch/Definitions/BookSearchCriteria.cs
@@ -1,4 +1,3 @@
-using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Parser;
 
 namespace NzbDrone.Core.IndexerSearch.Definitions
diff --git a/src/NzbDrone.Core/Indexers/FileList/FileListParser.cs b/src/NzbDrone.Core/Indexers/FileList/FileListParser.cs
index 5b3425480..a3f98b231 100644
--- a/src/NzbDrone.Core/Indexers/FileList/FileListParser.cs
+++ b/src/NzbDrone.Core/Indexers/FileList/FileListParser.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Net;
 using Newtonsoft.Json;
diff --git a/src/NzbDrone.Core/Indexers/IndexerFactory.cs b/src/NzbDrone.Core/Indexers/IndexerFactory.cs
index 08b260609..4e72a36cd 100644
--- a/src/NzbDrone.Core/Indexers/IndexerFactory.cs
+++ b/src/NzbDrone.Core/Indexers/IndexerFactory.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using FluentValidation.Results;
 using NLog;
-using NzbDrone.Common.Composition;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.ThingiProvider;
 
diff --git a/src/NzbDrone.Core/Indexers/Newznab/NewznabCategoryFieldOptionsConverter.cs b/src/NzbDrone.Core/Indexers/Newznab/NewznabCategoryFieldOptionsConverter.cs
index 3082f02de..05062045e 100644
--- a/src/NzbDrone.Core/Indexers/Newznab/NewznabCategoryFieldOptionsConverter.cs
+++ b/src/NzbDrone.Core/Indexers/Newznab/NewznabCategoryFieldOptionsConverter.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Core.Annotations;
diff --git a/src/NzbDrone.Core/MediaFiles/AudioTag.cs b/src/NzbDrone.Core/MediaFiles/AudioTag.cs
index 986c225a8..2ac6ecc91 100644
--- a/src/NzbDrone.Core/MediaFiles/AudioTag.cs
+++ b/src/NzbDrone.Core/MediaFiles/AudioTag.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using NLog;
-using NLog.Fluent;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Instrumentation;
 using NzbDrone.Common.Instrumentation.Extensions;
diff --git a/src/NzbDrone.Core/MediaFiles/AudioTagService.cs b/src/NzbDrone.Core/MediaFiles/AudioTagService.cs
index 568822728..1141aa7a2 100644
--- a/src/NzbDrone.Core/MediaFiles/AudioTagService.cs
+++ b/src/NzbDrone.Core/MediaFiles/AudioTagService.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using NLog;
-using NLog.Fluent;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.Instrumentation.Extensions;
 using NzbDrone.Core.Books;
diff --git a/src/NzbDrone.Core/MediaFiles/BookFile.cs b/src/NzbDrone.Core/MediaFiles/BookFile.cs
index 039f6db13..40c7e8d91 100644
--- a/src/NzbDrone.Core/MediaFiles/BookFile.cs
+++ b/src/NzbDrone.Core/MediaFiles/BookFile.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Books;
 using NzbDrone.Core.Datastore;
diff --git a/src/NzbDrone.Core/MediaFiles/BookFileMovingService.cs b/src/NzbDrone.Core/MediaFiles/BookFileMovingService.cs
index 83e2fa027..b490a6520 100644
--- a/src/NzbDrone.Core/MediaFiles/BookFileMovingService.cs
+++ b/src/NzbDrone.Core/MediaFiles/BookFileMovingService.cs
@@ -1,10 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using NLog;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnsureThat;
-using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Books;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.MediaFiles.BookImport;
diff --git a/src/NzbDrone.Core/MediaFiles/BookImport/Identification/CandidateService.cs b/src/NzbDrone.Core/MediaFiles/BookImport/Identification/CandidateService.cs
index b88444dab..c18849860 100644
--- a/src/NzbDrone.Core/MediaFiles/BookImport/Identification/CandidateService.cs
+++ b/src/NzbDrone.Core/MediaFiles/BookImport/Identification/CandidateService.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
diff --git a/src/NzbDrone.Core/MediaFiles/BookImport/ImportDecisionMaker.cs b/src/NzbDrone.Core/MediaFiles/BookImport/ImportDecisionMaker.cs
index 2e5eaf6ea..195c9e5a2 100644
--- a/src/NzbDrone.Core/MediaFiles/BookImport/ImportDecisionMaker.cs
+++ b/src/NzbDrone.Core/MediaFiles/BookImport/ImportDecisionMaker.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.IO.Abstractions;
 using System.Linq;
 using NLog;
diff --git a/src/NzbDrone.Core/MediaFiles/BookImport/Manual/ManualImportService.cs b/src/NzbDrone.Core/MediaFiles/BookImport/Manual/ManualImportService.cs
index 07640ad2b..320709d1e 100644
--- a/src/NzbDrone.Core/MediaFiles/BookImport/Manual/ManualImportService.cs
+++ b/src/NzbDrone.Core/MediaFiles/BookImport/Manual/ManualImportService.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using System.IO;
 using System.IO.Abstractions;
 using System.Linq;
diff --git a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs
index 007fe91cb..21d267479 100644
--- a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs
+++ b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs
@@ -19,7 +19,6 @@ using NzbDrone.Core.MediaFiles.Commands;
 using NzbDrone.Core.MediaFiles.Events;
 using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Messaging.Events;
-using NzbDrone.Core.Parser;
 using NzbDrone.Core.RootFolders;
 
 namespace NzbDrone.Core.MediaFiles
diff --git a/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs b/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs
index c21c09734..6c968b1d7 100644
--- a/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs
+++ b/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Dapper;
 using NzbDrone.Common;
 using NzbDrone.Core.Books;
 using NzbDrone.Core.Datastore;
diff --git a/src/NzbDrone.Core/MediaFiles/MediaFileService.cs b/src/NzbDrone.Core/MediaFiles/MediaFileService.cs
index ec313330e..17465ae23 100644
--- a/src/NzbDrone.Core/MediaFiles/MediaFileService.cs
+++ b/src/NzbDrone.Core/MediaFiles/MediaFileService.cs
@@ -4,7 +4,6 @@ using System.IO.Abstractions;
 using System.Linq;
 using NLog;
 using NzbDrone.Common;
-using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Books.Events;
 using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Core.MediaFiles.Events;
diff --git a/src/NzbDrone.Core/MediaFiles/MediaInfoFormatter.cs b/src/NzbDrone.Core/MediaFiles/MediaInfoFormatter.cs
index be2d155bf..b9ba589aa 100644
--- a/src/NzbDrone.Core/MediaFiles/MediaInfoFormatter.cs
+++ b/src/NzbDrone.Core/MediaFiles/MediaInfoFormatter.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using NLog;
-using NLog.Fluent;
 using NzbDrone.Common.Instrumentation;
 using NzbDrone.Common.Instrumentation.Extensions;
 using NzbDrone.Core.Parser;
diff --git a/src/NzbDrone.Core/MediaFiles/MetadataTagService.cs b/src/NzbDrone.Core/MediaFiles/MetadataTagService.cs
index 9d90773d0..c3e300f3a 100644
--- a/src/NzbDrone.Core/MediaFiles/MetadataTagService.cs
+++ b/src/NzbDrone.Core/MediaFiles/MetadataTagService.cs
@@ -1,9 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Abstractions;
-using System.Linq;
 using NLog;
-using NzbDrone.Common.Instrumentation.Extensions;
 using NzbDrone.Core.Books;
 using NzbDrone.Core.MediaFiles.Commands;
 using NzbDrone.Core.Messaging.Commands;
diff --git a/src/NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs b/src/NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs
index 0c07c1dca..1ef70e669 100644
--- a/src/NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs
+++ b/src/NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs
@@ -1,11 +1,8 @@
-using System;
-using System.IO;
 using System.Linq;
 using NLog;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Books.Calibre;
-using NzbDrone.Core.Configuration;
 using NzbDrone.Core.MediaFiles.BookImport;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.RootFolders;
diff --git a/src/NzbDrone.Core/MetadataSource/BookInfo/BookInfoResource/AuthorResource.cs b/src/NzbDrone.Core/MetadataSource/BookInfo/BookInfoResource/AuthorResource.cs
index 2a9bd6a40..7707ac02c 100644
--- a/src/NzbDrone.Core/MetadataSource/BookInfo/BookInfoResource/AuthorResource.cs
+++ b/src/NzbDrone.Core/MetadataSource/BookInfo/BookInfoResource/AuthorResource.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 
 namespace NzbDrone.Core.MetadataSource.BookInfo
diff --git a/src/NzbDrone.Core/MetadataSource/Goodreads/Resources/ListResource.cs b/src/NzbDrone.Core/MetadataSource/Goodreads/Resources/ListResource.cs
index a3e3caa8b..dcd638fcb 100644
--- a/src/NzbDrone.Core/MetadataSource/Goodreads/Resources/ListResource.cs
+++ b/src/NzbDrone.Core/MetadataSource/Goodreads/Resources/ListResource.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Xml.Linq;
-using NzbDrone.Core.Books;
 
 namespace NzbDrone.Core.MetadataSource.Goodreads
 {
diff --git a/src/NzbDrone.Core/MetadataSource/Goodreads/Resources/ShowSeriesResource.cs b/src/NzbDrone.Core/MetadataSource/Goodreads/Resources/ShowSeriesResource.cs
index 3590ef2b5..98de8d300 100644
--- a/src/NzbDrone.Core/MetadataSource/Goodreads/Resources/ShowSeriesResource.cs
+++ b/src/NzbDrone.Core/MetadataSource/Goodreads/Resources/ShowSeriesResource.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using System.Xml.Linq;
 
 namespace NzbDrone.Core.MetadataSource.Goodreads
diff --git a/src/NzbDrone.Core/MetadataSource/Goodreads/Resources/UserShelfResource.cs b/src/NzbDrone.Core/MetadataSource/Goodreads/Resources/UserShelfResource.cs
index 1bdc19960..9cb79d9ec 100644
--- a/src/NzbDrone.Core/MetadataSource/Goodreads/Resources/UserShelfResource.cs
+++ b/src/NzbDrone.Core/MetadataSource/Goodreads/Resources/UserShelfResource.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.Xml.Linq;
 
 namespace NzbDrone.Core.MetadataSource.Goodreads
diff --git a/src/NzbDrone.Core/Notifications/BookDeleteMessage.cs b/src/NzbDrone.Core/Notifications/BookDeleteMessage.cs
index c46f02cab..b744b3947 100644
--- a/src/NzbDrone.Core/Notifications/BookDeleteMessage.cs
+++ b/src/NzbDrone.Core/Notifications/BookDeleteMessage.cs
@@ -1,5 +1,4 @@
 using NzbDrone.Core.Books;
-using NzbDrone.Core.MediaFiles;
 
 namespace NzbDrone.Core.Notifications
 {
diff --git a/src/NzbDrone.Core/Notifications/NotificationFactory.cs b/src/NzbDrone.Core/Notifications/NotificationFactory.cs
index 6fa6a600d..f19ee36e3 100644
--- a/src/NzbDrone.Core/Notifications/NotificationFactory.cs
+++ b/src/NzbDrone.Core/Notifications/NotificationFactory.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
-using NzbDrone.Common.Composition;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.ThingiProvider;
 
diff --git a/src/NzbDrone.Core/Notifications/Webhook/Webhook.cs b/src/NzbDrone.Core/Notifications/Webhook/Webhook.cs
index 04b5b8e34..920cac60e 100644
--- a/src/NzbDrone.Core/Notifications/Webhook/Webhook.cs
+++ b/src/NzbDrone.Core/Notifications/Webhook/Webhook.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using FluentValidation.Results;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Books;
diff --git a/src/NzbDrone.Core/Notifications/Webhook/WebhookBook.cs b/src/NzbDrone.Core/Notifications/Webhook/WebhookBook.cs
index cb514c5ed..c94c02a7d 100644
--- a/src/NzbDrone.Core/Notifications/Webhook/WebhookBook.cs
+++ b/src/NzbDrone.Core/Notifications/Webhook/WebhookBook.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Core.Books;
 
diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
index 6f443314a..d94a89c92 100644
--- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -12,7 +12,6 @@ using NzbDrone.Core.Books;
 using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Parser;
-using NzbDrone.Core.Profiles.Releases;
 using NzbDrone.Core.Qualities;
 
 namespace NzbDrone.Core.Organizer
diff --git a/src/NzbDrone.Core/Parser/QualityParser.cs b/src/NzbDrone.Core/Parser/QualityParser.cs
index 8d7ae35ab..36bb2a913 100644
--- a/src/NzbDrone.Core/Parser/QualityParser.cs
+++ b/src/NzbDrone.Core/Parser/QualityParser.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using NLog;
-using NzbDrone.Common.Disk;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Instrumentation;
 using NzbDrone.Core.MediaFiles;
diff --git a/src/NzbDrone.Core/ThingiProvider/ProviderFactory.cs b/src/NzbDrone.Core/ThingiProvider/ProviderFactory.cs
index fac049f45..08a026db3 100644
--- a/src/NzbDrone.Core/ThingiProvider/ProviderFactory.cs
+++ b/src/NzbDrone.Core/ThingiProvider/ProviderFactory.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using FluentValidation.Results;
 using Microsoft.Extensions.DependencyInjection;
 using NLog;
-using NzbDrone.Common.Composition;
 using NzbDrone.Core.Lifecycle;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.ThingiProvider.Events;
diff --git a/src/NzbDrone.Core/Update/History/UpdateHistoryRepository.cs b/src/NzbDrone.Core/Update/History/UpdateHistoryRepository.cs
index 40bd68963..fe5e259b5 100644
--- a/src/NzbDrone.Core/Update/History/UpdateHistoryRepository.cs
+++ b/src/NzbDrone.Core/Update/History/UpdateHistoryRepository.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Messaging.Events;
 
diff --git a/src/NzbDrone.Core/Update/RecentUpdateProvider.cs b/src/NzbDrone.Core/Update/RecentUpdateProvider.cs
index 68cda9aa6..a3264300d 100644
--- a/src/NzbDrone.Core/Update/RecentUpdateProvider.cs
+++ b/src/NzbDrone.Core/Update/RecentUpdateProvider.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Core.Configuration;
diff --git a/src/NzbDrone.Core/Update/UpdatePackage.cs b/src/NzbDrone.Core/Update/UpdatePackage.cs
index ca97ad5d0..63f966a4d 100644
--- a/src/NzbDrone.Core/Update/UpdatePackage.cs
+++ b/src/NzbDrone.Core/Update/UpdatePackage.cs
@@ -1,5 +1,4 @@
 using System;
-using NzbDrone.Common.EnvironmentInfo;
 
 namespace NzbDrone.Core.Update
 {
diff --git a/src/NzbDrone.Core/Update/UpdatePackageProvider.cs b/src/NzbDrone.Core/Update/UpdatePackageProvider.cs
index 604499bdb..c49e70dab 100644
--- a/src/NzbDrone.Core/Update/UpdatePackageProvider.cs
+++ b/src/NzbDrone.Core/Update/UpdatePackageProvider.cs
@@ -1,7 +1,6 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using FluentValidation.Validators;
 using NzbDrone.Common.Cloud;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Http;
diff --git a/src/NzbDrone.Host/AppLifetime.cs b/src/NzbDrone.Host/AppLifetime.cs
index 41ff0165f..45616e36b 100644
--- a/src/NzbDrone.Host/AppLifetime.cs
+++ b/src/NzbDrone.Host/AppLifetime.cs
@@ -1,4 +1,3 @@
-using System.Data.SQLite;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Hosting;
diff --git a/src/NzbDrone.Integration.Test/IntegrationTest.cs b/src/NzbDrone.Integration.Test/IntegrationTest.cs
index a4446fc58..4c92e7875 100644
--- a/src/NzbDrone.Integration.Test/IntegrationTest.cs
+++ b/src/NzbDrone.Integration.Test/IntegrationTest.cs
@@ -1,8 +1,5 @@
-using System.Collections.Generic;
 using System.Threading;
-using Microsoft.Extensions.Configuration;
 using NLog;
-using Npgsql;
 using NUnit.Framework;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Datastore;
diff --git a/src/NzbDrone.Integration.Test/IntegrationTestBase.cs b/src/NzbDrone.Integration.Test/IntegrationTestBase.cs
index 7f1ec642a..2ac032adb 100644
--- a/src/NzbDrone.Integration.Test/IntegrationTestBase.cs
+++ b/src/NzbDrone.Integration.Test/IntegrationTestBase.cs
@@ -18,7 +18,6 @@ using NzbDrone.Test.Common;
 using NzbDrone.Test.Common.Categories;
 using Readarr.Api.V1.Author;
 using Readarr.Api.V1.Blocklist;
-using Readarr.Api.V1.Books;
 using Readarr.Api.V1.Config;
 using Readarr.Api.V1.DownloadClient;
 using Readarr.Api.V1.History;
diff --git a/src/Readarr.Api.V1/Commands/CommandController.cs b/src/Readarr.Api.V1/Commands/CommandController.cs
index 406456c45..cbc11d6fc 100644
--- a/src/Readarr.Api.V1/Commands/CommandController.cs
+++ b/src/Readarr.Api.V1/Commands/CommandController.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Microsoft.AspNetCore.Mvc;
-using NzbDrone.Common;
 using NzbDrone.Common.Composition;
 using NzbDrone.Common.Serializer;
 using NzbDrone.Common.TPL;
diff --git a/src/Readarr.Api.V1/Indexers/ReleaseController.cs b/src/Readarr.Api.V1/Indexers/ReleaseController.cs
index 4e6b9a56d..f8e8cee67 100644
--- a/src/Readarr.Api.V1/Indexers/ReleaseController.cs
+++ b/src/Readarr.Api.V1/Indexers/ReleaseController.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using FluentValidation;
 using Microsoft.AspNetCore.Mvc;
 using NLog;
diff --git a/src/Readarr.Api.V1/Indexers/ReleasePushController.cs b/src/Readarr.Api.V1/Indexers/ReleasePushController.cs
index af01fd62c..1e3ceb9d7 100644
--- a/src/Readarr.Api.V1/Indexers/ReleasePushController.cs
+++ b/src/Readarr.Api.V1/Indexers/ReleasePushController.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using FluentValidation;
 using FluentValidation.Results;
 using Microsoft.AspNetCore.Mvc;
diff --git a/src/Readarr.Api.V1/Profiles/Release/ReleaseProfileController.cs b/src/Readarr.Api.V1/Profiles/Release/ReleaseProfileController.cs
index f53480787..29fdc734a 100644
--- a/src/Readarr.Api.V1/Profiles/Release/ReleaseProfileController.cs
+++ b/src/Readarr.Api.V1/Profiles/Release/ReleaseProfileController.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using FluentValidation;
 using Microsoft.AspNetCore.Mvc;
 using NzbDrone.Common.Extensions;
diff --git a/src/Readarr.Api.V1/Tags/TagController.cs b/src/Readarr.Api.V1/Tags/TagController.cs
index 5aba8de20..596b9494f 100644
--- a/src/Readarr.Api.V1/Tags/TagController.cs
+++ b/src/Readarr.Api.V1/Tags/TagController.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
 using NzbDrone.Core.Datastore.Events;
diff --git a/src/Readarr.Http/ApiInfoResource.cs b/src/Readarr.Http/ApiInfoResource.cs
index ec3bc7959..dec6933f6 100644
--- a/src/Readarr.Http/ApiInfoResource.cs
+++ b/src/Readarr.Http/ApiInfoResource.cs
@@ -1,8 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Readarr.Http
 {
diff --git a/src/Readarr.Http/ClientSchema/Field.cs b/src/Readarr.Http/ClientSchema/Field.cs
index d043e10f6..e3932a862 100644
--- a/src/Readarr.Http/ClientSchema/Field.cs
+++ b/src/Readarr.Http/ClientSchema/Field.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using NzbDrone.Core.Annotations;
 
 namespace Readarr.Http.ClientSchema
 {
diff --git a/src/Readarr.Http/Extensions/RequestExtensions.cs b/src/Readarr.Http/Extensions/RequestExtensions.cs
index 9798fc915..0b084d0f0 100644
--- a/src/Readarr.Http/Extensions/RequestExtensions.cs
+++ b/src/Readarr.Http/Extensions/RequestExtensions.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
 using Microsoft.AspNetCore.Http;
 using NzbDrone.Common.EnvironmentInfo;
-using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Exceptions;