diff --git a/src/Lidarr.Api.V1/FileSystem/FileSystemModule.cs b/src/Lidarr.Api.V1/FileSystem/FileSystemModule.cs
index 58f899324..14466f5a8 100644
--- a/src/Lidarr.Api.V1/FileSystem/FileSystemModule.cs
+++ b/src/Lidarr.Api.V1/FileSystem/FileSystemModule.cs
@@ -2,7 +2,6 @@ using System.Linq;
 using Lidarr.Http.Extensions;
 using Nancy;
 using NzbDrone.Common.Disk;
-using NzbDrone.Common.Extensions;
 using NzbDrone.Core.MediaFiles;
 
 namespace Lidarr.Api.V1.FileSystem
diff --git a/src/Lidarr.Api.V1/Queue/QueueActionModule.cs b/src/Lidarr.Api.V1/Queue/QueueActionModule.cs
index fe2f29b18..15d071cde 100644
--- a/src/Lidarr.Api.V1/Queue/QueueActionModule.cs
+++ b/src/Lidarr.Api.V1/Queue/QueueActionModule.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using Lidarr.Http;
 using Lidarr.Http.Extensions;
 using Lidarr.Http.REST;
diff --git a/src/Lidarr.Api.V1/TrackFiles/TrackFileResource.cs b/src/Lidarr.Api.V1/TrackFiles/TrackFileResource.cs
index a445e3c84..5470cb99c 100644
--- a/src/Lidarr.Api.V1/TrackFiles/TrackFileResource.cs
+++ b/src/Lidarr.Api.V1/TrackFiles/TrackFileResource.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using Lidarr.Http.REST;
-using NzbDrone.Common.Extensions;
 using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Parser.Model;
diff --git a/src/Lidarr.Http/Extensions/Pipelines/CacheHeaderPipeline.cs b/src/Lidarr.Http/Extensions/Pipelines/CacheHeaderPipeline.cs
index 96068e149..2a75cbcd1 100644
--- a/src/Lidarr.Http/Extensions/Pipelines/CacheHeaderPipeline.cs
+++ b/src/Lidarr.Http/Extensions/Pipelines/CacheHeaderPipeline.cs
@@ -1,4 +1,3 @@
-using System;
 using Lidarr.Http.Frontend;
 using Nancy;
 using Nancy.Bootstrapper;
diff --git a/src/Lidarr.Http/Extensions/Pipelines/IfModifiedPipeline.cs b/src/Lidarr.Http/Extensions/Pipelines/IfModifiedPipeline.cs
index 98a26c128..60fa94bcb 100644
--- a/src/Lidarr.Http/Extensions/Pipelines/IfModifiedPipeline.cs
+++ b/src/Lidarr.Http/Extensions/Pipelines/IfModifiedPipeline.cs
@@ -1,4 +1,3 @@
-using System;
 using Lidarr.Http.Frontend;
 using Nancy;
 using Nancy.Bootstrapper;
diff --git a/src/Lidarr.Http/Extensions/Pipelines/LidarrVersionPipeline.cs b/src/Lidarr.Http/Extensions/Pipelines/LidarrVersionPipeline.cs
index 4a647325a..0d801921e 100644
--- a/src/Lidarr.Http/Extensions/Pipelines/LidarrVersionPipeline.cs
+++ b/src/Lidarr.Http/Extensions/Pipelines/LidarrVersionPipeline.cs
@@ -1,4 +1,3 @@
-using System;
 using Nancy;
 using Nancy.Bootstrapper;
 using NzbDrone.Common.EnvironmentInfo;
diff --git a/src/Lidarr.Http/Extensions/Pipelines/UrlBasePipeline.cs b/src/Lidarr.Http/Extensions/Pipelines/UrlBasePipeline.cs
index 71ed358af..1b512e2eb 100644
--- a/src/Lidarr.Http/Extensions/Pipelines/UrlBasePipeline.cs
+++ b/src/Lidarr.Http/Extensions/Pipelines/UrlBasePipeline.cs
@@ -1,4 +1,3 @@
-using System;
 using Nancy;
 using Nancy.Bootstrapper;
 using Nancy.Responses;
diff --git a/src/NzbDrone.Core.Test/Datastore/Converters/CommandConverterFixture.cs b/src/NzbDrone.Core.Test/Datastore/Converters/CommandConverterFixture.cs
index e358b642c..6c82e5280 100644
--- a/src/NzbDrone.Core.Test/Datastore/Converters/CommandConverterFixture.cs
+++ b/src/NzbDrone.Core.Test/Datastore/Converters/CommandConverterFixture.cs
@@ -1,7 +1,5 @@
-using System.Data;
 using System.Data.SQLite;
 using FluentAssertions;
-using Moq;
 using NUnit.Framework;
 using NzbDrone.Core.Datastore.Converters;
 using NzbDrone.Core.Messaging.Commands;
diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadClientFixtureBase.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadClientFixtureBase.cs
index 02d657396..17f8b1787 100644
--- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadClientFixtureBase.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadClientFixtureBase.cs
@@ -7,7 +7,6 @@ using NzbDrone.Common.Disk;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Download;
-using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Music;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.Parser.Model;
diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoNotNetCoreCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoNotNetCoreCheckFixture.cs
index 7f40e3504..991040b35 100644
--- a/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoNotNetCoreCheckFixture.cs
+++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoNotNetCoreCheckFixture.cs
@@ -3,7 +3,6 @@ using NUnit.Framework;
 using NzbDrone.Common.Processes;
 using NzbDrone.Core.HealthCheck.Checks;
 using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common;
 
 namespace NzbDrone.Core.Test.HealthCheck.Checks
 {
diff --git a/src/NzbDrone.Core.Test/IndexerTests/RedactedTests/RedactedFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/RedactedTests/RedactedFixture.cs
index fd77d17c1..d17eb3e61 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/RedactedTests/RedactedFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/RedactedTests/RedactedFixture.cs
@@ -1,8 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using FluentAssertions;
-using FluentValidation.Results;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Http;
diff --git a/src/NzbDrone.Core.Test/Instrumentation/DatabaseTargetFixture.cs b/src/NzbDrone.Core.Test/Instrumentation/DatabaseTargetFixture.cs
index f08b3e6b2..11be12b0d 100644
--- a/src/NzbDrone.Core.Test/Instrumentation/DatabaseTargetFixture.cs
+++ b/src/NzbDrone.Core.Test/Instrumentation/DatabaseTargetFixture.cs
@@ -9,7 +9,6 @@ using NzbDrone.Core.Instrumentation;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
-using NzbDrone.Test.Common.Categories;
 
 namespace NzbDrone.Core.Test.Instrumentation
 {
diff --git a/src/NzbDrone.Core.Test/MediaFiles/DiskScanServiceTests/ScanFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/DiskScanServiceTests/ScanFixture.cs
index 23b6076ae..4c6a891dd 100644
--- a/src/NzbDrone.Core.Test/MediaFiles/DiskScanServiceTests/ScanFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/DiskScanServiceTests/ScanFixture.cs
@@ -9,7 +9,6 @@ using FluentAssertions;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Disk;
-using NzbDrone.Common.Extensions;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.MediaFiles.TrackImport;
diff --git a/src/NzbDrone.Core.Test/RootFolderTests/RootFolderServiceFixture.cs b/src/NzbDrone.Core.Test/RootFolderTests/RootFolderServiceFixture.cs
index 375bd4a6c..c56f6ff0b 100644
--- a/src/NzbDrone.Core.Test/RootFolderTests/RootFolderServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/RootFolderTests/RootFolderServiceFixture.cs
@@ -1,13 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Disk;
-using NzbDrone.Core.Music;
 using NzbDrone.Core.RootFolders;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
diff --git a/src/NzbDrone.Core/Blacklisting/BlacklistRepository.cs b/src/NzbDrone.Core/Blacklisting/BlacklistRepository.cs
index 63cb0eaf2..e540ba15e 100644
--- a/src/NzbDrone.Core/Blacklisting/BlacklistRepository.cs
+++ b/src/NzbDrone.Core/Blacklisting/BlacklistRepository.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Dapper;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Music;
diff --git a/src/NzbDrone.Core/History/HistoryRepository.cs b/src/NzbDrone.Core/History/HistoryRepository.cs
index ba615b1a2..98142b9b1 100644
--- a/src/NzbDrone.Core/History/HistoryRepository.cs
+++ b/src/NzbDrone.Core/History/HistoryRepository.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Dapper;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Music;
diff --git a/src/NzbDrone.Core/MediaFiles/AudioTagService.cs b/src/NzbDrone.Core/MediaFiles/AudioTagService.cs
index 67d517251..043531fcf 100644
--- a/src/NzbDrone.Core/MediaFiles/AudioTagService.cs
+++ b/src/NzbDrone.Core/MediaFiles/AudioTagService.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using NLog;
 using NLog.Fluent;
 using NzbDrone.Common.Disk;
-using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Instrumentation.Extensions;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.MediaCover;
diff --git a/src/NzbDrone.Core/Messaging/Commands/UnknownCommandExecutor.cs b/src/NzbDrone.Core/Messaging/Commands/UnknownCommandExecutor.cs
index 08fb2725d..94ffa98e0 100644
--- a/src/NzbDrone.Core/Messaging/Commands/UnknownCommandExecutor.cs
+++ b/src/NzbDrone.Core/Messaging/Commands/UnknownCommandExecutor.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using NLog;
+using NLog;
 
 namespace NzbDrone.Core.Messaging.Commands
 {
diff --git a/src/NzbDrone.Core/MetadataSource/ISearchForNewEntity.cs b/src/NzbDrone.Core/MetadataSource/ISearchForNewEntity.cs
index b11be909d..7767ae714 100644
--- a/src/NzbDrone.Core/MetadataSource/ISearchForNewEntity.cs
+++ b/src/NzbDrone.Core/MetadataSource/ISearchForNewEntity.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace NzbDrone.Core.MetadataSource
 {
diff --git a/src/NzbDrone.Core/Music/Repositories/AlbumRepository.cs b/src/NzbDrone.Core/Music/Repositories/AlbumRepository.cs
index e4d4b6449..a2419c382 100644
--- a/src/NzbDrone.Core/Music/Repositories/AlbumRepository.cs
+++ b/src/NzbDrone.Core/Music/Repositories/AlbumRepository.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Dapper;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.MediaFiles;
diff --git a/src/NzbDrone.Core/Music/Repositories/ArtistRepository.cs b/src/NzbDrone.Core/Music/Repositories/ArtistRepository.cs
index 0c7c121da..7ee30a8f6 100644
--- a/src/NzbDrone.Core/Music/Repositories/ArtistRepository.cs
+++ b/src/NzbDrone.Core/Music/Repositories/ArtistRepository.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using Dapper;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Messaging.Events;
diff --git a/src/NzbDrone.Core/Music/Repositories/ReleaseRepository.cs b/src/NzbDrone.Core/Music/Repositories/ReleaseRepository.cs
index f59d678bf..034480eba 100644
--- a/src/NzbDrone.Core/Music/Repositories/ReleaseRepository.cs
+++ b/src/NzbDrone.Core/Music/Repositories/ReleaseRepository.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using Dapper;
 using NzbDrone.Common.EnsureThat;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Messaging.Events;