diff --git a/Exceptron.Client/ExceptronClient.cs b/Exceptron.Client/ExceptronClient.cs
index 64dc8e880..b49af3bc4 100644
--- a/Exceptron.Client/ExceptronClient.cs
+++ b/Exceptron.Client/ExceptronClient.cs
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
-using System.IO;
using System.Reflection;
using System.Threading;
using System.Web;
diff --git a/Marr.Data/Converters/BooleanIntConverter.cs b/Marr.Data/Converters/BooleanIntConverter.cs
index 5979628e5..cbd86f7e0 100644
--- a/Marr.Data/Converters/BooleanIntConverter.cs
+++ b/Marr.Data/Converters/BooleanIntConverter.cs
@@ -14,9 +14,6 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using Marr.Data.Mapping;
namespace Marr.Data.Converters
diff --git a/Marr.Data/Converters/BooleanYNConverter.cs b/Marr.Data/Converters/BooleanYNConverter.cs
index 3f3acf0c1..9043f220f 100644
--- a/Marr.Data/Converters/BooleanYNConverter.cs
+++ b/Marr.Data/Converters/BooleanYNConverter.cs
@@ -14,9 +14,6 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using Marr.Data.Mapping;
namespace Marr.Data.Converters
diff --git a/Marr.Data/Converters/CastConverter.cs b/Marr.Data/Converters/CastConverter.cs
index 2c1913966..74f3ff8d7 100644
--- a/Marr.Data/Converters/CastConverter.cs
+++ b/Marr.Data/Converters/CastConverter.cs
@@ -14,9 +14,6 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace Marr.Data.Converters
{
diff --git a/Marr.Data/Converters/ConversionException.cs b/Marr.Data/Converters/ConversionException.cs
index 074b5604f..095d48f41 100644
--- a/Marr.Data/Converters/ConversionException.cs
+++ b/Marr.Data/Converters/ConversionException.cs
@@ -14,9 +14,6 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace Marr.Data.Converters
{
diff --git a/Marr.Data/Converters/EnumIntConverter.cs b/Marr.Data/Converters/EnumIntConverter.cs
index 41515737e..4fa4c8aa4 100644
--- a/Marr.Data/Converters/EnumIntConverter.cs
+++ b/Marr.Data/Converters/EnumIntConverter.cs
@@ -14,9 +14,6 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using Marr.Data.Mapping;
namespace Marr.Data.Converters
diff --git a/Marr.Data/Converters/EnumStringConverter.cs b/Marr.Data/Converters/EnumStringConverter.cs
index 964e5824c..cdece6397 100644
--- a/Marr.Data/Converters/EnumStringConverter.cs
+++ b/Marr.Data/Converters/EnumStringConverter.cs
@@ -14,9 +14,6 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using Marr.Data.Mapping;
namespace Marr.Data.Converters
diff --git a/Marr.Data/Converters/IConverter.cs b/Marr.Data/Converters/IConverter.cs
index 00b1fa47b..318f26957 100644
--- a/Marr.Data/Converters/IConverter.cs
+++ b/Marr.Data/Converters/IConverter.cs
@@ -14,9 +14,6 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using Marr.Data.Mapping;
namespace Marr.Data.Converters
diff --git a/Marr.Data/DataHelper.cs b/Marr.Data/DataHelper.cs
index d5120894b..7fb7e0dc8 100644
--- a/Marr.Data/DataHelper.cs
+++ b/Marr.Data/DataHelper.cs
@@ -15,8 +15,6 @@ License along with this library. If not, see . */
using System;
using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Data;
using System.Reflection;
using Marr.Data.Mapping;
diff --git a/Marr.Data/DataMappingException.cs b/Marr.Data/DataMappingException.cs
index 2ab5619be..f1e888b5d 100644
--- a/Marr.Data/DataMappingException.cs
+++ b/Marr.Data/DataMappingException.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace Marr.Data
{
diff --git a/Marr.Data/EntityGraph.cs b/Marr.Data/EntityGraph.cs
index 3604389e7..5f0b7683e 100644
--- a/Marr.Data/EntityGraph.cs
+++ b/Marr.Data/EntityGraph.cs
@@ -16,10 +16,8 @@ License along with this library. If not, see . */
using System;
using System.Collections;
using System.Collections.Generic;
-using System.Text;
using System.Data;
using System.Data.Common;
-using System.Linq;
using Marr.Data.Mapping;
using System.Reflection;
diff --git a/Marr.Data/EntityMerger.cs b/Marr.Data/EntityMerger.cs
index 717b2e46c..246421567 100644
--- a/Marr.Data/EntityMerger.cs
+++ b/Marr.Data/EntityMerger.cs
@@ -1,8 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Linq.Expressions;
namespace Marr.Data
{
diff --git a/Marr.Data/EntityReference.cs b/Marr.Data/EntityReference.cs
index 84a68b98b..2062fad3d 100644
--- a/Marr.Data/EntityReference.cs
+++ b/Marr.Data/EntityReference.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
using System.Collections;
namespace Marr.Data
diff --git a/Marr.Data/ExtensionMethods.cs b/Marr.Data/ExtensionMethods.cs
index b33093c33..85292083e 100644
--- a/Marr.Data/ExtensionMethods.cs
+++ b/Marr.Data/ExtensionMethods.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Data.Common;
+using System.Data.Common;
namespace Marr.Data
{
diff --git a/Marr.Data/GroupingKeyCollection.cs b/Marr.Data/GroupingKeyCollection.cs
index 8f81a7482..52348bf7f 100644
--- a/Marr.Data/GroupingKeyCollection.cs
+++ b/Marr.Data/GroupingKeyCollection.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Linq;
using System.Text;
using Marr.Data.Mapping;
using System.Data.Common;
diff --git a/Marr.Data/IDataMapper.cs b/Marr.Data/IDataMapper.cs
index 4f0f9014a..4a300476f 100644
--- a/Marr.Data/IDataMapper.cs
+++ b/Marr.Data/IDataMapper.cs
@@ -20,7 +20,6 @@ using System.Collections.Generic;
using Marr.Data.Parameters;
using System.Linq.Expressions;
using Marr.Data.QGen;
-using System.Reflection;
namespace Marr.Data
{
diff --git a/Marr.Data/MapRepository.cs b/Marr.Data/MapRepository.cs
index 0193f60c4..fbb6eca7a 100644
--- a/Marr.Data/MapRepository.cs
+++ b/Marr.Data/MapRepository.cs
@@ -15,9 +15,6 @@ License along with this library. If not, see . */
using System;
using System.Collections.Generic;
-using System.Text;
-using System.Reflection;
-using System.Data.Common;
using Marr.Data.Converters;
using Marr.Data.Parameters;
using Marr.Data.Mapping;
diff --git a/Marr.Data/Mapping/ColumnAttribute.cs b/Marr.Data/Mapping/ColumnAttribute.cs
index 9d63e5b7c..08c3fb607 100644
--- a/Marr.Data/Mapping/ColumnAttribute.cs
+++ b/Marr.Data/Mapping/ColumnAttribute.cs
@@ -14,11 +14,7 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
using System;
-using System.Collections.Generic;
-using System.Text;
using System.Data;
-using System.Data.OleDb;
-using System.Data.Common;
namespace Marr.Data.Mapping
{
diff --git a/Marr.Data/Mapping/ColumnInfo.cs b/Marr.Data/Mapping/ColumnInfo.cs
index de1a66da4..545f207bb 100644
--- a/Marr.Data/Mapping/ColumnInfo.cs
+++ b/Marr.Data/Mapping/ColumnInfo.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Marr.Data.Mapping
+namespace Marr.Data.Mapping
{
public class ColumnInfo : IColumnInfo
{
diff --git a/Marr.Data/Mapping/ColumnMapBuilder.cs b/Marr.Data/Mapping/ColumnMapBuilder.cs
index ad8b470ee..0c6bd2bed 100644
--- a/Marr.Data/Mapping/ColumnMapBuilder.cs
+++ b/Marr.Data/Mapping/ColumnMapBuilder.cs
@@ -1,7 +1,5 @@
using System;
-using System.Collections.Generic;
using System.Linq;
-using System.Text;
using System.Linq.Expressions;
using System.Data;
using Marr.Data.Mapping.Strategies;
diff --git a/Marr.Data/Mapping/ColumnMapCollection.cs b/Marr.Data/Mapping/ColumnMapCollection.cs
index 0a035fbae..6c58dedbb 100644
--- a/Marr.Data/Mapping/ColumnMapCollection.cs
+++ b/Marr.Data/Mapping/ColumnMapCollection.cs
@@ -13,14 +13,10 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
-using System;
using System.Collections.Generic;
-using System.Text;
using System.Data;
using System.Text.RegularExpressions;
using System.Data.Common;
-using System.Linq;
-using System.Linq.Expressions;
namespace Marr.Data.Mapping
{
diff --git a/Marr.Data/Mapping/EnumConversionType.cs b/Marr.Data/Mapping/EnumConversionType.cs
index b865e84e8..5cb0c0ea1 100644
--- a/Marr.Data/Mapping/EnumConversionType.cs
+++ b/Marr.Data/Mapping/EnumConversionType.cs
@@ -13,11 +13,6 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
namespace Marr.Data.Mapping
{
public enum EnumConversionType
diff --git a/Marr.Data/Mapping/FluentMappings.cs b/Marr.Data/Mapping/FluentMappings.cs
index 83002440a..526d0365a 100644
--- a/Marr.Data/Mapping/FluentMappings.cs
+++ b/Marr.Data/Mapping/FluentMappings.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Reflection;
using Marr.Data.Mapping.Strategies;
using System.Collections;
diff --git a/Marr.Data/Mapping/IColumnInfo.cs b/Marr.Data/Mapping/IColumnInfo.cs
index 4b54b1d5b..6cf28833b 100644
--- a/Marr.Data/Mapping/IColumnInfo.cs
+++ b/Marr.Data/Mapping/IColumnInfo.cs
@@ -13,12 +13,7 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
-using System;
-using System.Collections.Generic;
-using System.Text;
using System.Data;
-using System.Data.Common;
-using System.Data.OleDb;
namespace Marr.Data.Mapping
{
diff --git a/Marr.Data/Mapping/IRelationshipInfo.cs b/Marr.Data/Mapping/IRelationshipInfo.cs
index fc28fe0a6..004ed7837 100644
--- a/Marr.Data/Mapping/IRelationshipInfo.cs
+++ b/Marr.Data/Mapping/IRelationshipInfo.cs
@@ -14,8 +14,6 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
using System;
-using System.Collections.Generic;
-using System.Text;
namespace Marr.Data.Mapping
{
diff --git a/Marr.Data/Mapping/MapBuilder.cs b/Marr.Data/Mapping/MapBuilder.cs
index bb82cc9c3..bb3a0023f 100644
--- a/Marr.Data/Mapping/MapBuilder.cs
+++ b/Marr.Data/Mapping/MapBuilder.cs
@@ -1,7 +1,5 @@
using System;
-using System.Collections.Generic;
using System.Linq;
-using System.Text;
using Marr.Data.Mapping.Strategies;
using System.Reflection;
using System.Collections;
diff --git a/Marr.Data/Mapping/MappingHelper.cs b/Marr.Data/Mapping/MappingHelper.cs
index 5d25aaffe..f025528be 100644
--- a/Marr.Data/Mapping/MappingHelper.cs
+++ b/Marr.Data/Mapping/MappingHelper.cs
@@ -1,9 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Text;
using System.Data.Common;
-using Marr.Data.Converters;
namespace Marr.Data.Mapping
{
diff --git a/Marr.Data/Mapping/RelationshipAttribute.cs b/Marr.Data/Mapping/RelationshipAttribute.cs
index eaa2bb7c3..aed53e92e 100644
--- a/Marr.Data/Mapping/RelationshipAttribute.cs
+++ b/Marr.Data/Mapping/RelationshipAttribute.cs
@@ -14,8 +14,6 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
using System;
-using System.Collections.Generic;
-using System.Text;
namespace Marr.Data.Mapping
{
diff --git a/Marr.Data/Mapping/RelationshipBuilder.cs b/Marr.Data/Mapping/RelationshipBuilder.cs
index 9b71ce6a9..339ac030c 100644
--- a/Marr.Data/Mapping/RelationshipBuilder.cs
+++ b/Marr.Data/Mapping/RelationshipBuilder.cs
@@ -1,7 +1,5 @@
using System;
-using System.Collections.Generic;
using System.Linq;
-using System.Text;
using System.Linq.Expressions;
using Marr.Data.Mapping.Strategies;
diff --git a/Marr.Data/Mapping/RelationshipCollection.cs b/Marr.Data/Mapping/RelationshipCollection.cs
index a5b7bba88..71d112960 100644
--- a/Marr.Data/Mapping/RelationshipCollection.cs
+++ b/Marr.Data/Mapping/RelationshipCollection.cs
@@ -13,9 +13,7 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
-using System;
using System.Collections.Generic;
-using System.Text;
namespace Marr.Data.Mapping
{
diff --git a/Marr.Data/Mapping/RelationshipInfo.cs b/Marr.Data/Mapping/RelationshipInfo.cs
index aa4df3b14..401ad7183 100644
--- a/Marr.Data/Mapping/RelationshipInfo.cs
+++ b/Marr.Data/Mapping/RelationshipInfo.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace Marr.Data.Mapping
{
diff --git a/Marr.Data/Mapping/Strategies/AttributeMapStrategy.cs b/Marr.Data/Mapping/Strategies/AttributeMapStrategy.cs
index 7867412fc..e0308c6b2 100644
--- a/Marr.Data/Mapping/Strategies/AttributeMapStrategy.cs
+++ b/Marr.Data/Mapping/Strategies/AttributeMapStrategy.cs
@@ -14,12 +14,7 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Reflection;
-using Marr.Data.Converters;
-using Marr.Data.Parameters;
namespace Marr.Data.Mapping.Strategies
{
diff --git a/Marr.Data/Mapping/Strategies/ConventionMapStrategy.cs b/Marr.Data/Mapping/Strategies/ConventionMapStrategy.cs
index e140de16d..0015413cd 100644
--- a/Marr.Data/Mapping/Strategies/ConventionMapStrategy.cs
+++ b/Marr.Data/Mapping/Strategies/ConventionMapStrategy.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Reflection;
using System.Collections;
diff --git a/Marr.Data/Mapping/Strategies/IMapStrategy.cs b/Marr.Data/Mapping/Strategies/IMapStrategy.cs
index 39f3801ee..460b19055 100644
--- a/Marr.Data/Mapping/Strategies/IMapStrategy.cs
+++ b/Marr.Data/Mapping/Strategies/IMapStrategy.cs
@@ -14,9 +14,6 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace Marr.Data.Mapping.Strategies
{
diff --git a/Marr.Data/Mapping/Strategies/PropertyMapStrategy.cs b/Marr.Data/Mapping/Strategies/PropertyMapStrategy.cs
index 19af41dd9..71762580e 100644
--- a/Marr.Data/Mapping/Strategies/PropertyMapStrategy.cs
+++ b/Marr.Data/Mapping/Strategies/PropertyMapStrategy.cs
@@ -14,9 +14,6 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Reflection;
namespace Marr.Data.Mapping.Strategies
diff --git a/Marr.Data/Mapping/Strategies/ReflectionMapStrategyBase.cs b/Marr.Data/Mapping/Strategies/ReflectionMapStrategyBase.cs
index d52217e25..3e75cd716 100644
--- a/Marr.Data/Mapping/Strategies/ReflectionMapStrategyBase.cs
+++ b/Marr.Data/Mapping/Strategies/ReflectionMapStrategyBase.cs
@@ -14,9 +14,6 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Reflection;
namespace Marr.Data.Mapping.Strategies
diff --git a/Marr.Data/Mapping/TableAttribute.cs b/Marr.Data/Mapping/TableAttribute.cs
index 8042bea5c..595894f82 100644
--- a/Marr.Data/Mapping/TableAttribute.cs
+++ b/Marr.Data/Mapping/TableAttribute.cs
@@ -14,9 +14,6 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace Marr.Data.Mapping
{
diff --git a/Marr.Data/Mapping/TableBuilder.cs b/Marr.Data/Mapping/TableBuilder.cs
index a8f52995c..d4313e76b 100644
--- a/Marr.Data/Mapping/TableBuilder.cs
+++ b/Marr.Data/Mapping/TableBuilder.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace Marr.Data.Mapping
{
diff --git a/Marr.Data/Parameters/DbTypeBuilder.cs b/Marr.Data/Parameters/DbTypeBuilder.cs
index 8b57a1478..839b64c5b 100644
--- a/Marr.Data/Parameters/DbTypeBuilder.cs
+++ b/Marr.Data/Parameters/DbTypeBuilder.cs
@@ -14,11 +14,7 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Data;
-using Marr.Data.Mapping;
namespace Marr.Data.Parameters
{
diff --git a/Marr.Data/Parameters/IDbTypeBuilder.cs b/Marr.Data/Parameters/IDbTypeBuilder.cs
index 02bc5f283..1b04f2470 100644
--- a/Marr.Data/Parameters/IDbTypeBuilder.cs
+++ b/Marr.Data/Parameters/IDbTypeBuilder.cs
@@ -14,11 +14,7 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Data;
-using Marr.Data.Mapping;
namespace Marr.Data.Parameters
{
diff --git a/Marr.Data/Parameters/OleDbTypeBuilder.cs b/Marr.Data/Parameters/OleDbTypeBuilder.cs
index 44ba6ddf0..a1077531d 100644
--- a/Marr.Data/Parameters/OleDbTypeBuilder.cs
+++ b/Marr.Data/Parameters/OleDbTypeBuilder.cs
@@ -14,11 +14,7 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Data.OleDb;
-using Marr.Data.Mapping;
namespace Marr.Data.Parameters
{
diff --git a/Marr.Data/Parameters/SqlDbTypeBuilder.cs b/Marr.Data/Parameters/SqlDbTypeBuilder.cs
index df5197a3a..813cfcf39 100644
--- a/Marr.Data/Parameters/SqlDbTypeBuilder.cs
+++ b/Marr.Data/Parameters/SqlDbTypeBuilder.cs
@@ -14,12 +14,8 @@ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Data;
using System.Data.SqlClient;
-using Marr.Data.Mapping;
namespace Marr.Data.Parameters
{
diff --git a/Marr.Data/QGen/DeleteQuery.cs b/Marr.Data/QGen/DeleteQuery.cs
index 2f0826725..1c0662bb9 100644
--- a/Marr.Data/QGen/DeleteQuery.cs
+++ b/Marr.Data/QGen/DeleteQuery.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Marr.Data.Mapping;
-using System.Data.Common;
-
-namespace Marr.Data.QGen
+namespace Marr.Data.QGen
{
///
/// This class creates a SQL delete query.
diff --git a/Marr.Data/QGen/Dialects/Dialect.cs b/Marr.Data/QGen/Dialects/Dialect.cs
index 4d873e87a..195cabc1f 100644
--- a/Marr.Data/QGen/Dialects/Dialect.cs
+++ b/Marr.Data/QGen/Dialects/Dialect.cs
@@ -1,6 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Text;
namespace Marr.Data.QGen.Dialects
diff --git a/Marr.Data/QGen/Dialects/FirebirdDialect.cs b/Marr.Data/QGen/Dialects/FirebirdDialect.cs
index 3e1202151..49f42ab21 100644
--- a/Marr.Data/QGen/Dialects/FirebirdDialect.cs
+++ b/Marr.Data/QGen/Dialects/FirebirdDialect.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace Marr.Data.QGen.Dialects
{
diff --git a/Marr.Data/QGen/Dialects/OracleDialect.cs b/Marr.Data/QGen/Dialects/OracleDialect.cs
index 627197a01..23bc76751 100644
--- a/Marr.Data/QGen/Dialects/OracleDialect.cs
+++ b/Marr.Data/QGen/Dialects/OracleDialect.cs
@@ -1,5 +1,4 @@
using System;
-using System.Collections.Generic;
using System.Linq;
using System.Text;
diff --git a/Marr.Data/QGen/Dialects/SqlServerCeDialect.cs b/Marr.Data/QGen/Dialects/SqlServerCeDialect.cs
index e012020cf..355037f19 100644
--- a/Marr.Data/QGen/Dialects/SqlServerCeDialect.cs
+++ b/Marr.Data/QGen/Dialects/SqlServerCeDialect.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Marr.Data.QGen.Dialects
+namespace Marr.Data.QGen.Dialects
{
public class SqlServerCeDialect : Dialect
{
diff --git a/Marr.Data/QGen/Dialects/SqlServerDialect.cs b/Marr.Data/QGen/Dialects/SqlServerDialect.cs
index 5353bdfff..54bf61de4 100644
--- a/Marr.Data/QGen/Dialects/SqlServerDialect.cs
+++ b/Marr.Data/QGen/Dialects/SqlServerDialect.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Marr.Data.QGen.Dialects
+namespace Marr.Data.QGen.Dialects
{
public class SqlServerDialect : Dialect
{
diff --git a/Marr.Data/QGen/Dialects/SqliteDialect.cs b/Marr.Data/QGen/Dialects/SqliteDialect.cs
index 079563992..f7eddfa23 100644
--- a/Marr.Data/QGen/Dialects/SqliteDialect.cs
+++ b/Marr.Data/QGen/Dialects/SqliteDialect.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Marr.Data.QGen.Dialects
+namespace Marr.Data.QGen.Dialects
{
public class SqliteDialect : Dialect
{
diff --git a/Marr.Data/QGen/ExpressionVisitor.cs b/Marr.Data/QGen/ExpressionVisitor.cs
index 66aca57b1..0ada3ebe4 100644
--- a/Marr.Data/QGen/ExpressionVisitor.cs
+++ b/Marr.Data/QGen/ExpressionVisitor.cs
@@ -3,9 +3,6 @@
*/
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Linq.Expressions;
namespace Marr.Data.QGen
diff --git a/Marr.Data/QGen/IQuery.cs b/Marr.Data/QGen/IQuery.cs
index aacdf0f73..29df89567 100644
--- a/Marr.Data/QGen/IQuery.cs
+++ b/Marr.Data/QGen/IQuery.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Marr.Data.QGen
+namespace Marr.Data.QGen
{
internal interface IQuery
{
diff --git a/Marr.Data/QGen/IQueryBuilder.cs b/Marr.Data/QGen/IQueryBuilder.cs
index 618a9e6c9..4a896f336 100644
--- a/Marr.Data/QGen/IQueryBuilder.cs
+++ b/Marr.Data/QGen/IQueryBuilder.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Marr.Data.QGen
+namespace Marr.Data.QGen
{
public interface IQueryBuilder
{
diff --git a/Marr.Data/QGen/InsertQuery.cs b/Marr.Data/QGen/InsertQuery.cs
index cfa351ef0..28460bf97 100644
--- a/Marr.Data/QGen/InsertQuery.cs
+++ b/Marr.Data/QGen/InsertQuery.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Text;
using Marr.Data.Mapping;
using System.Data.Common;
using Marr.Data.QGen.Dialects;
diff --git a/Marr.Data/QGen/JoinBuilder.cs b/Marr.Data/QGen/JoinBuilder.cs
index c382c85a2..45ea28312 100644
--- a/Marr.Data/QGen/JoinBuilder.cs
+++ b/Marr.Data/QGen/JoinBuilder.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Data.Common;
using Marr.Data.QGen.Dialects;
using System.Linq.Expressions;
diff --git a/Marr.Data/QGen/PagingQueryDecorator.cs b/Marr.Data/QGen/PagingQueryDecorator.cs
index d9cf4a284..396bc0dba 100644
--- a/Marr.Data/QGen/PagingQueryDecorator.cs
+++ b/Marr.Data/QGen/PagingQueryDecorator.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
using System.Text;
-using Marr.Data.Mapping;
-using Marr.Data.QGen.Dialects;
namespace Marr.Data.QGen
{
diff --git a/Marr.Data/QGen/QueryBuilder.cs b/Marr.Data/QGen/QueryBuilder.cs
index a38bce3f7..35b2d109e 100644
--- a/Marr.Data/QGen/QueryBuilder.cs
+++ b/Marr.Data/QGen/QueryBuilder.cs
@@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Text;
-using Marr.Data.QGen;
using System.Linq.Expressions;
using System.Reflection;
using Marr.Data.Mapping;
diff --git a/Marr.Data/QGen/QueryFactory.cs b/Marr.Data/QGen/QueryFactory.cs
index 6bb130ea1..1e020e7be 100644
--- a/Marr.Data/QGen/QueryFactory.cs
+++ b/Marr.Data/QGen/QueryFactory.cs
@@ -1,8 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Data.Common;
using Marr.Data.QGen.Dialects;
namespace Marr.Data.QGen
diff --git a/Marr.Data/QGen/RowCountQueryDecorator.cs b/Marr.Data/QGen/RowCountQueryDecorator.cs
index f144dc3e7..d347a542c 100644
--- a/Marr.Data/QGen/RowCountQueryDecorator.cs
+++ b/Marr.Data/QGen/RowCountQueryDecorator.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Text;
namespace Marr.Data.QGen
{
diff --git a/Marr.Data/QGen/SelectQuery.cs b/Marr.Data/QGen/SelectQuery.cs
index 0e74b008d..492582e48 100644
--- a/Marr.Data/QGen/SelectQuery.cs
+++ b/Marr.Data/QGen/SelectQuery.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Marr.Data;
+using System.Text;
using Marr.Data.Mapping;
-using System.Data.Common;
using Marr.Data.QGen.Dialects;
namespace Marr.Data.QGen
diff --git a/Marr.Data/QGen/SortBuilder.cs b/Marr.Data/QGen/SortBuilder.cs
index 2577cc7e5..75e360cda 100644
--- a/Marr.Data/QGen/SortBuilder.cs
+++ b/Marr.Data/QGen/SortBuilder.cs
@@ -1,9 +1,7 @@
using System;
using System.Collections.Generic;
-using System.Linq;
using System.Text;
using System.Linq.Expressions;
-using System.Reflection;
using Marr.Data.QGen.Dialects;
namespace Marr.Data.QGen
diff --git a/Marr.Data/QGen/SortColumn.cs b/Marr.Data/QGen/SortColumn.cs
index 1a38c3c82..6d9236219 100644
--- a/Marr.Data/QGen/SortColumn.cs
+++ b/Marr.Data/QGen/SortColumn.cs
@@ -1,9 +1,5 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Linq.Expressions;
-using System.Reflection;
namespace Marr.Data.QGen
{
diff --git a/Marr.Data/QGen/SqlitePagingQueryDecorator.cs b/Marr.Data/QGen/SqlitePagingQueryDecorator.cs
index d9aedc1da..30de17195 100644
--- a/Marr.Data/QGen/SqlitePagingQueryDecorator.cs
+++ b/Marr.Data/QGen/SqlitePagingQueryDecorator.cs
@@ -2,8 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
-using Marr.Data.Mapping;
-using Marr.Data.QGen.Dialects;
namespace Marr.Data.QGen
{
diff --git a/Marr.Data/QGen/SqliteRowCountQueryDecorator.cs b/Marr.Data/QGen/SqliteRowCountQueryDecorator.cs
index 396ade6af..0766c3114 100644
--- a/Marr.Data/QGen/SqliteRowCountQueryDecorator.cs
+++ b/Marr.Data/QGen/SqliteRowCountQueryDecorator.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Text;
namespace Marr.Data.QGen
{
diff --git a/Marr.Data/QGen/Table.cs b/Marr.Data/QGen/Table.cs
index e778d6f8e..7d90a9178 100644
--- a/Marr.Data/QGen/Table.cs
+++ b/Marr.Data/QGen/Table.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using Marr.Data.Mapping;
namespace Marr.Data.QGen
diff --git a/Marr.Data/QGen/TableCollection.cs b/Marr.Data/QGen/TableCollection.cs
index 15275d344..41c8a8d07 100644
--- a/Marr.Data/QGen/TableCollection.cs
+++ b/Marr.Data/QGen/TableCollection.cs
@@ -1,9 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Text;
using System.Collections;
-using System.Reflection;
namespace Marr.Data.QGen
{
diff --git a/Marr.Data/QGen/UpdateQuery.cs b/Marr.Data/QGen/UpdateQuery.cs
index 79ca69784..42d5c7986 100644
--- a/Marr.Data/QGen/UpdateQuery.cs
+++ b/Marr.Data/QGen/UpdateQuery.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Text;
using System.Data.Common;
using Marr.Data.Mapping;
using Marr.Data.QGen.Dialects;
diff --git a/Marr.Data/QGen/UpdateQueryBuilder.cs b/Marr.Data/QGen/UpdateQueryBuilder.cs
index ddbec2719..ca9c3aaa7 100644
--- a/Marr.Data/QGen/UpdateQueryBuilder.cs
+++ b/Marr.Data/QGen/UpdateQueryBuilder.cs
@@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using Marr.Data.Mapping;
using System.Linq.Expressions;
diff --git a/Marr.Data/QGen/View.cs b/Marr.Data/QGen/View.cs
index 7b8c002d7..1d2386677 100644
--- a/Marr.Data/QGen/View.cs
+++ b/Marr.Data/QGen/View.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Linq;
-using System.Text;
using Marr.Data.Mapping;
namespace Marr.Data.QGen
diff --git a/Marr.Data/QGen/WhereBuilder.cs b/Marr.Data/QGen/WhereBuilder.cs
index 012fa187e..ad726b578 100644
--- a/Marr.Data/QGen/WhereBuilder.cs
+++ b/Marr.Data/QGen/WhereBuilder.cs
@@ -1,10 +1,6 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Text;
using System.Linq.Expressions;
-using Marr.Data;
-using Marr.Data.Mapping;
using System.Data.Common;
using Marr.Data.Parameters;
using System.Reflection;
diff --git a/Marr.Data/SqlModesEnum.cs b/Marr.Data/SqlModesEnum.cs
index 7ee400399..d9382bb93 100644
--- a/Marr.Data/SqlModesEnum.cs
+++ b/Marr.Data/SqlModesEnum.cs
@@ -13,10 +13,6 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see . */
-using System;
-using System.Collections.Generic;
-using System.Text;
-
namespace Marr.Data
{
public enum SqlModes
diff --git a/Marr.Data/UnitOfWork.cs b/Marr.Data/UnitOfWork.cs
index e91ae4df7..cdd829d69 100644
--- a/Marr.Data/UnitOfWork.cs
+++ b/Marr.Data/UnitOfWork.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace Marr.Data
{
diff --git a/Marr.Data/UnitOfWorkSharedContext.cs b/Marr.Data/UnitOfWorkSharedContext.cs
index 3e45778af..9d92f1b6e 100644
--- a/Marr.Data/UnitOfWorkSharedContext.cs
+++ b/Marr.Data/UnitOfWorkSharedContext.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace Marr.Data
{
diff --git a/NzbDrone.Api.Test/Properties/AssemblyInfo.cs b/NzbDrone.Api.Test/Properties/AssemblyInfo.cs
index 3ca19b7d7..18301f69e 100644
--- a/NzbDrone.Api.Test/Properties/AssemblyInfo.cs
+++ b/NzbDrone.Api.Test/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
diff --git a/NzbDrone.Api/Authentication/NzbDroneUser.cs b/NzbDrone.Api/Authentication/NzbDroneUser.cs
index 56d7883de..c8fce02fd 100644
--- a/NzbDrone.Api/Authentication/NzbDroneUser.cs
+++ b/NzbDrone.Api/Authentication/NzbDroneUser.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
using Nancy.Security;
namespace NzbDrone.Api.Authentication
diff --git a/NzbDrone.Api/Calendar/CalendarModule.cs b/NzbDrone.Api/Calendar/CalendarModule.cs
index 525c3c3e4..755c898aa 100644
--- a/NzbDrone.Api/Calendar/CalendarModule.cs
+++ b/NzbDrone.Api/Calendar/CalendarModule.cs
@@ -3,8 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using NzbDrone.Api.Episodes;
using NzbDrone.Api.Extensions;
-using NzbDrone.Api.Mapping;
-using NzbDrone.Common;
using NzbDrone.Core.Tv;
namespace NzbDrone.Api.Calendar
diff --git a/NzbDrone.Api/Client/ClientSettings.cs b/NzbDrone.Api/Client/ClientSettings.cs
index 753df22a6..7deff82d2 100644
--- a/NzbDrone.Api/Client/ClientSettings.cs
+++ b/NzbDrone.Api/Client/ClientSettings.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
+using System.IO;
using System.Text.RegularExpressions;
-using NzbDrone.Common;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Messaging;
using NzbDrone.Common.Serializer;
diff --git a/NzbDrone.Api/ClientSchema/FieldDefinitionAttribute.cs b/NzbDrone.Api/ClientSchema/FieldDefinitionAttribute.cs
index 72fdeb408..4e796bd8c 100644
--- a/NzbDrone.Api/ClientSchema/FieldDefinitionAttribute.cs
+++ b/NzbDrone.Api/ClientSchema/FieldDefinitionAttribute.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace NzbDrone.Api.ClientSchema
+namespace NzbDrone.Api.ClientSchema
{
}
\ No newline at end of file
diff --git a/NzbDrone.Api/ClientSchema/SchemaDeserializer.cs b/NzbDrone.Api/ClientSchema/SchemaDeserializer.cs
index 9985ffb49..eec9c3123 100644
--- a/NzbDrone.Api/ClientSchema/SchemaDeserializer.cs
+++ b/NzbDrone.Api/ClientSchema/SchemaDeserializer.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using NzbDrone.Common;
using NzbDrone.Common.Reflection;
using NzbDrone.Core.Annotations;
diff --git a/NzbDrone.Api/ClientSchema/SelectOption.cs b/NzbDrone.Api/ClientSchema/SelectOption.cs
index 9be74c865..fe42f46dd 100644
--- a/NzbDrone.Api/ClientSchema/SelectOption.cs
+++ b/NzbDrone.Api/ClientSchema/SelectOption.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace NzbDrone.Api.ClientSchema
+namespace NzbDrone.Api.ClientSchema
{
public class SelectOption
{
diff --git a/NzbDrone.Api/Commands/CommandModule.cs b/NzbDrone.Api/Commands/CommandModule.cs
index 2c64ed223..18733976d 100644
--- a/NzbDrone.Api/Commands/CommandModule.cs
+++ b/NzbDrone.Api/Commands/CommandModule.cs
@@ -1,5 +1,4 @@
using System;
-using System.Collections.Generic;
using System.Linq;
using NzbDrone.Api.Extensions;
using NzbDrone.Common.Composition;
diff --git a/NzbDrone.Api/ErrorManagement/ErrorHandler.cs b/NzbDrone.Api/ErrorManagement/ErrorHandler.cs
index 6976b6fb0..6ba25d741 100644
--- a/NzbDrone.Api/ErrorManagement/ErrorHandler.cs
+++ b/NzbDrone.Api/ErrorManagement/ErrorHandler.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using Nancy;
+using Nancy;
using Nancy.ErrorHandling;
using NzbDrone.Api.Extensions;
diff --git a/NzbDrone.Api/ErrorManagement/ErrorModel.cs b/NzbDrone.Api/ErrorManagement/ErrorModel.cs
index 6bc2296a6..b88600717 100644
--- a/NzbDrone.Api/ErrorManagement/ErrorModel.cs
+++ b/NzbDrone.Api/ErrorManagement/ErrorModel.cs
@@ -1,6 +1,4 @@
-using System.Linq;
-
-namespace NzbDrone.Api.ErrorManagement
+namespace NzbDrone.Api.ErrorManagement
{
public class ErrorModel
{
diff --git a/NzbDrone.Api/Exceptions/InvalidApiKeyException.cs b/NzbDrone.Api/Exceptions/InvalidApiKeyException.cs
index c5ec235d7..8c16e8133 100644
--- a/NzbDrone.Api/Exceptions/InvalidApiKeyException.cs
+++ b/NzbDrone.Api/Exceptions/InvalidApiKeyException.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace NzbDrone.Api.Exceptions
{
diff --git a/NzbDrone.Api/Extensions/NancyJsonSerializer.cs b/NzbDrone.Api/Extensions/NancyJsonSerializer.cs
index 703aaded0..00b3c3b2c 100644
--- a/NzbDrone.Api/Extensions/NancyJsonSerializer.cs
+++ b/NzbDrone.Api/Extensions/NancyJsonSerializer.cs
@@ -1,7 +1,6 @@
using System.Collections.Generic;
using System.IO;
using Nancy;
-using NzbDrone.Common;
using NzbDrone.Common.Serializer;
namespace NzbDrone.Api.Extensions
diff --git a/NzbDrone.Api/Frontend/StaticResourceProvider.cs b/NzbDrone.Api/Frontend/StaticResourceProvider.cs
index 79ed9c811..33e8a02f7 100644
--- a/NzbDrone.Api/Frontend/StaticResourceProvider.cs
+++ b/NzbDrone.Api/Frontend/StaticResourceProvider.cs
@@ -5,8 +5,6 @@ using NLog;
using Nancy;
using Nancy.Responses;
using NzbDrone.Common;
-using NzbDrone.Api.Extensions;
-using NzbDrone.Common.EnvironmentInfo;
namespace NzbDrone.Api.Frontend
{
diff --git a/NzbDrone.Api/Missing/MissingModule.cs b/NzbDrone.Api/Missing/MissingModule.cs
index caad7dcba..968da7aab 100644
--- a/NzbDrone.Api/Missing/MissingModule.cs
+++ b/NzbDrone.Api/Missing/MissingModule.cs
@@ -1,7 +1,6 @@
using System.Linq;
using NzbDrone.Api.Episodes;
using NzbDrone.Api.Extensions;
-using NzbDrone.Common;
using NzbDrone.Core.Datastore;
using NzbDrone.Core.Tv;
diff --git a/NzbDrone.Api/NancyBootstrapper.cs b/NzbDrone.Api/NancyBootstrapper.cs
index 186dac41f..9df476469 100644
--- a/NzbDrone.Api/NancyBootstrapper.cs
+++ b/NzbDrone.Api/NancyBootstrapper.cs
@@ -1,7 +1,4 @@
-using System;
-using NLog;
-using Nancy;
-using Nancy.Authentication.Basic;
+using NLog;
using Nancy.Bootstrapper;
using Nancy.Conventions;
using Nancy.Diagnostics;
@@ -9,10 +6,7 @@ using NzbDrone.Api.Authentication;
using NzbDrone.Api.ErrorManagement;
using NzbDrone.Api.Extensions;
using NzbDrone.Api.Frontend;
-using NzbDrone.Common;
-using NzbDrone.Common.Composition;
using NzbDrone.Common.Messaging;
-using NzbDrone.Common.Model;
using NzbDrone.Core.Instrumentation;
using NzbDrone.Core.Lifecycle;
using TinyIoC;
diff --git a/NzbDrone.Api/Notifications/NotificationSchemaModule.cs b/NzbDrone.Api/Notifications/NotificationSchemaModule.cs
index e838f62f8..d347e343c 100644
--- a/NzbDrone.Api/Notifications/NotificationSchemaModule.cs
+++ b/NzbDrone.Api/Notifications/NotificationSchemaModule.cs
@@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using NzbDrone.Api.ClientSchema;
-using NzbDrone.Common.Reflection;
-using NzbDrone.Core.Annotations;
using NzbDrone.Core.Notifications;
using Omu.ValueInjecter;
diff --git a/NzbDrone.Api/PagingResource.cs b/NzbDrone.Api/PagingResource.cs
index 7452c9bff..ab53c24cd 100644
--- a/NzbDrone.Api/PagingResource.cs
+++ b/NzbDrone.Api/PagingResource.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
using NzbDrone.Core.Datastore;
namespace NzbDrone.Api
diff --git a/NzbDrone.Api/Qualities/QualityProfileModule.cs b/NzbDrone.Api/Qualities/QualityProfileModule.cs
index e050e12a3..b21a8fb85 100644
--- a/NzbDrone.Api/Qualities/QualityProfileModule.cs
+++ b/NzbDrone.Api/Qualities/QualityProfileModule.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using NzbDrone.Core.Datastore;
using NzbDrone.Core.Qualities;
using NzbDrone.Api.Mapping;
diff --git a/NzbDrone.Api/Qualities/QualityProfileSchemaModule.cs b/NzbDrone.Api/Qualities/QualityProfileSchemaModule.cs
index b2b23bbe9..06d941a2a 100644
--- a/NzbDrone.Api/Qualities/QualityProfileSchemaModule.cs
+++ b/NzbDrone.Api/Qualities/QualityProfileSchemaModule.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using NzbDrone.Core.Datastore;
+using System.Collections.Generic;
using NzbDrone.Core.Qualities;
using NzbDrone.Api.Mapping;
using System.Linq;
diff --git a/NzbDrone.Api/REST/BadRequestException.cs b/NzbDrone.Api/REST/BadRequestException.cs
index ab99e144f..450f484e5 100644
--- a/NzbDrone.Api/REST/BadRequestException.cs
+++ b/NzbDrone.Api/REST/BadRequestException.cs
@@ -1,5 +1,4 @@
-using System;
-using Nancy;
+using Nancy;
using NzbDrone.Api.ErrorManagement;
namespace NzbDrone.Api.REST
diff --git a/NzbDrone.Api/REST/RestResource.cs b/NzbDrone.Api/REST/RestResource.cs
index 8aaf93fb8..acd08bfe6 100644
--- a/NzbDrone.Api/REST/RestResource.cs
+++ b/NzbDrone.Api/REST/RestResource.cs
@@ -1,6 +1,4 @@
-using System.ComponentModel;
-using FluentValidation;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
namespace NzbDrone.Api.REST
{
diff --git a/NzbDrone.Api/Seasons/SeasonModule.cs b/NzbDrone.Api/Seasons/SeasonModule.cs
index 4c11a2f06..773faf85f 100644
--- a/NzbDrone.Api/Seasons/SeasonModule.cs
+++ b/NzbDrone.Api/Seasons/SeasonModule.cs
@@ -1,8 +1,4 @@
using System.Collections.Generic;
-using System.Linq;
-using Nancy;
-using NzbDrone.Api.Extensions;
-using NzbDrone.Api.REST;
using NzbDrone.Core.Tv;
namespace NzbDrone.Api.Seasons
diff --git a/NzbDrone.Api/Seasons/SeasonResource.cs b/NzbDrone.Api/Seasons/SeasonResource.cs
index aeeb13354..46e14be9d 100644
--- a/NzbDrone.Api/Seasons/SeasonResource.cs
+++ b/NzbDrone.Api/Seasons/SeasonResource.cs
@@ -1,9 +1,5 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using NzbDrone.Api.REST;
-using NzbDrone.Core.Tv;
namespace NzbDrone.Api.Seasons
{
diff --git a/NzbDrone.Api/Series/SeriesConnection.cs b/NzbDrone.Api/Series/SeriesConnection.cs
index 7a31077ba..4de76e7e6 100644
--- a/NzbDrone.Api/Series/SeriesConnection.cs
+++ b/NzbDrone.Api/Series/SeriesConnection.cs
@@ -1,5 +1,4 @@
-using NLog;
-using NzbDrone.Api.SignalR;
+using NzbDrone.Api.SignalR;
namespace NzbDrone.Api.Series
{
diff --git a/NzbDrone.App.Test/Properties/AssemblyInfo.cs b/NzbDrone.App.Test/Properties/AssemblyInfo.cs
index 1087ee610..d332ff535 100644
--- a/NzbDrone.App.Test/Properties/AssemblyInfo.cs
+++ b/NzbDrone.App.Test/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
diff --git a/NzbDrone.Common.Test/ConfigFileProviderTest.cs b/NzbDrone.Common.Test/ConfigFileProviderTest.cs
index bd88a98b7..1cb162b43 100644
--- a/NzbDrone.Common.Test/ConfigFileProviderTest.cs
+++ b/NzbDrone.Common.Test/ConfigFileProviderTest.cs
@@ -2,7 +2,6 @@
using FluentAssertions;
using NUnit.Framework;
using NzbDrone.Common.EnvironmentInfo;
-using NzbDrone.Common.Model;
using NzbDrone.Core.Configuration;
using NzbDrone.Test.Common;
diff --git a/NzbDrone.Common.Test/EnsureTest/PathExtensionFixture.cs b/NzbDrone.Common.Test/EnsureTest/PathExtensionFixture.cs
index 7d75b62b9..82b134be4 100644
--- a/NzbDrone.Common.Test/EnsureTest/PathExtensionFixture.cs
+++ b/NzbDrone.Common.Test/EnsureTest/PathExtensionFixture.cs
@@ -1,7 +1,4 @@
-using System;
-using FluentAssertions;
-using Moq;
-using NUnit.Framework;
+using NUnit.Framework;
using NzbDrone.Common.EnsureThat;
using NzbDrone.Test.Common;
diff --git a/NzbDrone.Common.Test/PathExtensionFixture.cs b/NzbDrone.Common.Test/PathExtensionFixture.cs
index 65b20b24d..463a4d2cc 100644
--- a/NzbDrone.Common.Test/PathExtensionFixture.cs
+++ b/NzbDrone.Common.Test/PathExtensionFixture.cs
@@ -4,7 +4,6 @@ using Moq;
using NUnit.Framework;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Test.Common;
-using NzbDrone.Test.Common.Categories;
namespace NzbDrone.Common.Test
{
diff --git a/NzbDrone.Common.Test/ReflectionExtensions.cs b/NzbDrone.Common.Test/ReflectionExtensions.cs
index c5aee4d5e..17659e91a 100644
--- a/NzbDrone.Common.Test/ReflectionExtensions.cs
+++ b/NzbDrone.Common.Test/ReflectionExtensions.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace NzbDrone.Common.Test
+namespace NzbDrone.Common.Test
{
public static class ReflectionExtensions
{
diff --git a/NzbDrone.Common/Composition/ContainerBuilderBase.cs b/NzbDrone.Common/Composition/ContainerBuilderBase.cs
index 6c40737ac..86cf8c750 100644
--- a/NzbDrone.Common/Composition/ContainerBuilderBase.cs
+++ b/NzbDrone.Common/Composition/ContainerBuilderBase.cs
@@ -4,7 +4,6 @@ using System.Diagnostics;
using System.Linq;
using System.Reflection;
using NzbDrone.Common.Messaging;
-using NzbDrone.Common.Reflection;
using TinyIoC;
diff --git a/NzbDrone.Common/Contract/ReportBase.cs b/NzbDrone.Common/Contract/ReportBase.cs
index b581a2c53..559a3a847 100644
--- a/NzbDrone.Common/Contract/ReportBase.cs
+++ b/NzbDrone.Common/Contract/ReportBase.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Linq;
using Newtonsoft.Json;
namespace NzbDrone.Common.Contract
diff --git a/NzbDrone.Common/EnsureThat/EnsureStringExtensions.cs b/NzbDrone.Common/EnsureThat/EnsureStringExtensions.cs
index 308721d56..9b803617e 100644
--- a/NzbDrone.Common/EnsureThat/EnsureStringExtensions.cs
+++ b/NzbDrone.Common/EnsureThat/EnsureStringExtensions.cs
@@ -1,7 +1,5 @@
-using System;
using System.Diagnostics;
using System.IO;
-using System.Linq;
using System.Text.RegularExpressions;
using NzbDrone.Common.EnsureThat.Resources;
using NzbDrone.Common.EnvironmentInfo;
diff --git a/NzbDrone.Common/EnsureThat/Resources/ExceptionMessages.Designer.cs b/NzbDrone.Common/EnsureThat/Resources/ExceptionMessages.Designer.cs
index cc5dd2b7d..5b800bb9c 100644
--- a/NzbDrone.Common/EnsureThat/Resources/ExceptionMessages.Designer.cs
+++ b/NzbDrone.Common/EnsureThat/Resources/ExceptionMessages.Designer.cs
@@ -9,9 +9,6 @@
//------------------------------------------------------------------------------
namespace NzbDrone.Common.EnsureThat.Resources {
- using System;
-
-
///
/// A strongly-typed resource class, for looking up localized strings, etc.
///
diff --git a/NzbDrone.Common/Exceptions/NzbDroneException.cs b/NzbDrone.Common/Exceptions/NzbDroneException.cs
index 67b467a37..484b05bac 100644
--- a/NzbDrone.Common/Exceptions/NzbDroneException.cs
+++ b/NzbDrone.Common/Exceptions/NzbDroneException.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace NzbDrone.Common.Exceptions
{
diff --git a/NzbDrone.Common/Instrumentation/VersionLayoutRenderer.cs b/NzbDrone.Common/Instrumentation/VersionLayoutRenderer.cs
index 188be4d50..071b705d0 100644
--- a/NzbDrone.Common/Instrumentation/VersionLayoutRenderer.cs
+++ b/NzbDrone.Common/Instrumentation/VersionLayoutRenderer.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using System.Reflection;
+using System.Reflection;
using System.Text;
using NLog;
using NLog.Config;
diff --git a/NzbDrone.Common/RestProvider.cs b/NzbDrone.Common/RestProvider.cs
index 1bd43344a..9b1823257 100644
--- a/NzbDrone.Common/RestProvider.cs
+++ b/NzbDrone.Common/RestProvider.cs
@@ -1,9 +1,7 @@
using System;
using System.IO;
-using System.Linq;
using System.Net;
using System.Text;
-using NLog;
using Newtonsoft.Json;
using NzbDrone.Common.Contract;
using NzbDrone.Common.EnvironmentInfo;
diff --git a/NzbDrone.Common/StringExtensions.cs b/NzbDrone.Common/StringExtensions.cs
index 6fcbea57b..c4fe462fb 100644
--- a/NzbDrone.Common/StringExtensions.cs
+++ b/NzbDrone.Common/StringExtensions.cs
@@ -1,5 +1,4 @@
using System.Text.RegularExpressions;
-using System.Linq;
namespace NzbDrone.Common
{
diff --git a/NzbDrone.Common/TinyIoC.cs b/NzbDrone.Common/TinyIoC.cs
index d10956002..5069a05fb 100644
--- a/NzbDrone.Common/TinyIoC.cs
+++ b/NzbDrone.Common/TinyIoC.cs
@@ -71,7 +71,6 @@ namespace TinyIoC
{
using System;
using System.Collections.Generic;
- using System.Collections.ObjectModel;
using System.Linq;
using System.Reflection;
using NLog;
diff --git a/NzbDrone.Common/TryParseExtension.cs b/NzbDrone.Common/TryParseExtension.cs
index e970a78c5..008bf5b7c 100644
--- a/NzbDrone.Common/TryParseExtension.cs
+++ b/NzbDrone.Common/TryParseExtension.cs
@@ -1,5 +1,4 @@
using System;
-using System.Linq;
namespace NzbDrone.Common
{
diff --git a/NzbDrone.Core.Test/Configuration/ConfigCachingFixture.cs b/NzbDrone.Core.Test/Configuration/ConfigCachingFixture.cs
index a81808ada..087a854d7 100644
--- a/NzbDrone.Core.Test/Configuration/ConfigCachingFixture.cs
+++ b/NzbDrone.Core.Test/Configuration/ConfigCachingFixture.cs
@@ -1,5 +1,4 @@
using System.Collections.Generic;
-using System.Linq;
using FluentAssertions;
using Moq;
using NUnit.Framework;
diff --git a/NzbDrone.Core.Test/Configuration/ConfigServiceFixture.cs b/NzbDrone.Core.Test/Configuration/ConfigServiceFixture.cs
index d69e02ff9..b133ad6c6 100644
--- a/NzbDrone.Core.Test/Configuration/ConfigServiceFixture.cs
+++ b/NzbDrone.Core.Test/Configuration/ConfigServiceFixture.cs
@@ -4,7 +4,6 @@ using FluentAssertions;
using NUnit.Framework;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.Configuration
{
diff --git a/NzbDrone.Core.Test/Datastore/DatabaseRelationshipFixture.cs b/NzbDrone.Core.Test/Datastore/DatabaseRelationshipFixture.cs
index a24d791ee..75707c4e5 100644
--- a/NzbDrone.Core.Test/Datastore/DatabaseRelationshipFixture.cs
+++ b/NzbDrone.Core.Test/Datastore/DatabaseRelationshipFixture.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
+using System.Linq;
using FizzWare.NBuilder;
using FluentAssertions;
using NUnit.Framework;
diff --git a/NzbDrone.Core.Test/Datastore/MappingExtentionFixture.cs b/NzbDrone.Core.Test/Datastore/MappingExtentionFixture.cs
index fb8fe7b56..17110c38a 100644
--- a/NzbDrone.Core.Test/Datastore/MappingExtentionFixture.cs
+++ b/NzbDrone.Core.Test/Datastore/MappingExtentionFixture.cs
@@ -3,8 +3,6 @@ using System.Collections.Generic;
using FluentAssertions;
using Marr.Data;
using NUnit.Framework;
-using NzbDrone.Common;
-using NzbDrone.Common.Serializer;
using NzbDrone.Core.Datastore;
using NzbDrone.Core.Datastore.Converters;
using NzbDrone.Core.Tv;
diff --git a/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/PagingOffsetFixture.cs b/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/PagingOffsetFixture.cs
index 27982c244..134572a16 100644
--- a/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/PagingOffsetFixture.cs
+++ b/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/PagingOffsetFixture.cs
@@ -1,7 +1,4 @@
-using System;
-using System.ComponentModel;
-using System.Linq.Expressions;
-using FluentAssertions;
+using FluentAssertions;
using NUnit.Framework;
using NzbDrone.Core.Datastore;
using NzbDrone.Core.Tv;
diff --git a/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/ToSortDirectionFixture.cs b/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/ToSortDirectionFixture.cs
index 9485fb93c..f33805191 100644
--- a/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/ToSortDirectionFixture.cs
+++ b/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/ToSortDirectionFixture.cs
@@ -1,7 +1,4 @@
-using System;
-using System.ComponentModel;
-using System.Linq.Expressions;
-using FluentAssertions;
+using FluentAssertions;
using NUnit.Framework;
using NzbDrone.Core.Datastore;
using NzbDrone.Core.Tv;
diff --git a/NzbDrone.Core.Test/Datastore/ReflectionStrategyFixture/Benchmarks.cs b/NzbDrone.Core.Test/Datastore/ReflectionStrategyFixture/Benchmarks.cs
index b5f76c124..48a1a3639 100644
--- a/NzbDrone.Core.Test/Datastore/ReflectionStrategyFixture/Benchmarks.cs
+++ b/NzbDrone.Core.Test/Datastore/ReflectionStrategyFixture/Benchmarks.cs
@@ -1,7 +1,4 @@
-using Marr.Data.Reflection;
-using NUnit.Framework;
-using NzbDrone.Core.Datastore;
-using NzbDrone.Core.Tv;
+using NUnit.Framework;
namespace NzbDrone.Core.Test.Datastore.ReflectionStrategyFixture
{
diff --git a/NzbDrone.Core.Test/DecisionEngineTests/QualityAllowedByProfileSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/QualityAllowedByProfileSpecificationFixture.cs
index a53568678..76896d3df 100644
--- a/NzbDrone.Core.Test/DecisionEngineTests/QualityAllowedByProfileSpecificationFixture.cs
+++ b/NzbDrone.Core.Test/DecisionEngineTests/QualityAllowedByProfileSpecificationFixture.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using FizzWare.NBuilder;
using FluentAssertions;
using Marr.Data;
diff --git a/NzbDrone.Core.Test/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs
index 68cd2615d..21ab11a5b 100644
--- a/NzbDrone.Core.Test/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs
+++ b/NzbDrone.Core.Test/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs
@@ -1,12 +1,7 @@
-
-
-using System.Linq;
-using FluentAssertions;
+using FluentAssertions;
using NUnit.Framework;
-using NzbDrone.Core.DecisionEngine.Specifications;
using NzbDrone.Core.Qualities;
using NzbDrone.Core.Tv;
-using NzbDrone.Core.Model;
using NzbDrone.Core.DecisionEngine;
using NzbDrone.Core.Test.Framework;
diff --git a/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs b/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs
index f3019c3ad..8c5c5ecb7 100644
--- a/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs
+++ b/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs
@@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using FizzWare.NBuilder;
using FluentAssertions;
using Moq;
diff --git a/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/GetQualifiedReportsFixture.cs b/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/GetQualifiedReportsFixture.cs
index 8ef3ad236..69f67e504 100644
--- a/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/GetQualifiedReportsFixture.cs
+++ b/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/GetQualifiedReportsFixture.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 FluentAssertions;
using NUnit.Framework;
diff --git a/NzbDrone.Core.Test/Download/DownloadServiceFixture.cs b/NzbDrone.Core.Test/Download/DownloadServiceFixture.cs
index 8ca5ee37a..306a2b2c1 100644
--- a/NzbDrone.Core.Test/Download/DownloadServiceFixture.cs
+++ b/NzbDrone.Core.Test/Download/DownloadServiceFixture.cs
@@ -1,4 +1,3 @@
-using System;
using System.Linq;
using FizzWare.NBuilder;
using Moq;
diff --git a/NzbDrone.Core.Test/FluentTest.cs b/NzbDrone.Core.Test/FluentTest.cs
index 8537e19f3..c3d999194 100644
--- a/NzbDrone.Core.Test/FluentTest.cs
+++ b/NzbDrone.Core.Test/FluentTest.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.IO;
using System.Text;
using FluentAssertions;
using NUnit.Framework;
diff --git a/NzbDrone.Core.Test/Framework/DbTest.cs b/NzbDrone.Core.Test/Framework/DbTest.cs
index c6f1de077..f1531af60 100644
--- a/NzbDrone.Core.Test/Framework/DbTest.cs
+++ b/NzbDrone.Core.Test/Framework/DbTest.cs
@@ -6,7 +6,6 @@ using FluentMigrator.Runner;
using Marr.Data;
using Moq;
using NUnit.Framework;
-using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Messaging;
using NzbDrone.Core.Datastore;
using NzbDrone.Core.Datastore.Migration.Framework;
diff --git a/NzbDrone.Core.Test/Framework/TestDbHelper.cs b/NzbDrone.Core.Test/Framework/TestDbHelper.cs
index bcbc6e511..b71ef9f0f 100644
--- a/NzbDrone.Core.Test/Framework/TestDbHelper.cs
+++ b/NzbDrone.Core.Test/Framework/TestDbHelper.cs
@@ -1,16 +1,4 @@
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using Moq;
-using NzbDrone.Common;
-using NzbDrone.Core.Datastore;
-
-
-
-namespace NzbDrone.Core.Test.Framework
+namespace NzbDrone.Core.Test.Framework
{
internal static class TestDbHelper
{
diff --git a/NzbDrone.Core.Test/IndexerTests/IndexerServiceFixture.cs b/NzbDrone.Core.Test/IndexerTests/IndexerServiceFixture.cs
index 60ca60b21..3e6239823 100644
--- a/NzbDrone.Core.Test/IndexerTests/IndexerServiceFixture.cs
+++ b/NzbDrone.Core.Test/IndexerTests/IndexerServiceFixture.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Linq;
using FizzWare.NBuilder;
using FluentAssertions;
diff --git a/NzbDrone.Core.Test/MediaFileTests/DropFolderImportServiceFixture.cs b/NzbDrone.Core.Test/MediaFileTests/DropFolderImportServiceFixture.cs
index fa23461a4..643fd1047 100644
--- a/NzbDrone.Core.Test/MediaFileTests/DropFolderImportServiceFixture.cs
+++ b/NzbDrone.Core.Test/MediaFileTests/DropFolderImportServiceFixture.cs
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.IO;
-using System.Linq;
using FizzWare.NBuilder;
using Moq;
using NUnit.Framework;
diff --git a/NzbDrone.Core.Test/MediaFileTests/EpisodeImportTests/ImportDecisionMakerFixture.cs b/NzbDrone.Core.Test/MediaFileTests/EpisodeImportTests/ImportDecisionMakerFixture.cs
index 2f0f06320..ab71b6168 100644
--- a/NzbDrone.Core.Test/MediaFileTests/EpisodeImportTests/ImportDecisionMakerFixture.cs
+++ b/NzbDrone.Core.Test/MediaFileTests/EpisodeImportTests/ImportDecisionMakerFixture.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.IO;
using System.Linq;
using FluentAssertions;
using Moq;
diff --git a/NzbDrone.Core.Test/MediaFileTests/EpisodeImportTests/NotAlreadyImportedSpecificationFixture.cs b/NzbDrone.Core.Test/MediaFileTests/EpisodeImportTests/NotAlreadyImportedSpecificationFixture.cs
index ce7dde436..28dd6a87a 100644
--- a/NzbDrone.Core.Test/MediaFileTests/EpisodeImportTests/NotAlreadyImportedSpecificationFixture.cs
+++ b/NzbDrone.Core.Test/MediaFileTests/EpisodeImportTests/NotAlreadyImportedSpecificationFixture.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using FluentAssertions;
+using FluentAssertions;
using NUnit.Framework;
using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.MediaFiles.EpisodeImport.Specifications;
diff --git a/NzbDrone.Core.Test/MediaFileTests/EpisodeImportTests/NotExistingFileSpecificationFixture.cs b/NzbDrone.Core.Test/MediaFileTests/EpisodeImportTests/NotExistingFileSpecificationFixture.cs
index 15c5bf677..411ebbd09 100644
--- a/NzbDrone.Core.Test/MediaFileTests/EpisodeImportTests/NotExistingFileSpecificationFixture.cs
+++ b/NzbDrone.Core.Test/MediaFileTests/EpisodeImportTests/NotExistingFileSpecificationFixture.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Linq;
using FizzWare.NBuilder;
using FluentAssertions;
using Marr.Data;
diff --git a/NzbDrone.Core.Test/MediaFileTests/EpisodeImportTests/NotSampleSpecificationFixture.cs b/NzbDrone.Core.Test/MediaFileTests/EpisodeImportTests/NotSampleSpecificationFixture.cs
index f4b282eaa..dd4f5a6e4 100644
--- a/NzbDrone.Core.Test/MediaFileTests/EpisodeImportTests/NotSampleSpecificationFixture.cs
+++ b/NzbDrone.Core.Test/MediaFileTests/EpisodeImportTests/NotSampleSpecificationFixture.cs
@@ -1,13 +1,9 @@
using System;
-using System.Collections.Generic;
using System.Linq;
-using System.Text;
using FizzWare.NBuilder;
using FluentAssertions;
using Moq;
using NUnit.Framework;
-using NzbDrone.Common;
-using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.MediaFiles.EpisodeImport.Specifications;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Providers;
diff --git a/NzbDrone.Core.Test/MediaFileTests/EpisodeImportTests/UpgradeSpecificationFixture.cs b/NzbDrone.Core.Test/MediaFileTests/EpisodeImportTests/UpgradeSpecificationFixture.cs
index 8ebc05dde..9ac31aa1b 100644
--- a/NzbDrone.Core.Test/MediaFileTests/EpisodeImportTests/UpgradeSpecificationFixture.cs
+++ b/NzbDrone.Core.Test/MediaFileTests/EpisodeImportTests/UpgradeSpecificationFixture.cs
@@ -1,17 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Linq;
using FizzWare.NBuilder;
using FluentAssertions;
using Marr.Data;
-using Moq;
using NUnit.Framework;
-using NzbDrone.Common;
using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.MediaFiles.EpisodeImport.Specifications;
using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Providers;
using NzbDrone.Core.Qualities;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Tv;
diff --git a/NzbDrone.Core.Test/MediaFileTests/ImportApprovedEpisodesFixture.cs b/NzbDrone.Core.Test/MediaFileTests/ImportApprovedEpisodesFixture.cs
index dae700425..5dd17d3a6 100644
--- a/NzbDrone.Core.Test/MediaFileTests/ImportApprovedEpisodesFixture.cs
+++ b/NzbDrone.Core.Test/MediaFileTests/ImportApprovedEpisodesFixture.cs
@@ -1,18 +1,13 @@
-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;
using NzbDrone.Common.Messaging;
-using NzbDrone.Core.Configuration;
using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.MediaFiles.EpisodeImport;
using NzbDrone.Core.MediaFiles.Events;
-using NzbDrone.Core.Parser;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Qualities;
using NzbDrone.Core.Tv;
diff --git a/NzbDrone.Core.Test/MediaFileTests/MediaFileRepositoryFixture.cs b/NzbDrone.Core.Test/MediaFileTests/MediaFileRepositoryFixture.cs
index e727a4a6f..68e7522a3 100644
--- a/NzbDrone.Core.Test/MediaFileTests/MediaFileRepositoryFixture.cs
+++ b/NzbDrone.Core.Test/MediaFileTests/MediaFileRepositoryFixture.cs
@@ -1,4 +1,3 @@
-using System.Linq;
using FizzWare.NBuilder;
using FluentAssertions;
using NUnit.Framework;
diff --git a/NzbDrone.Core.Test/MediaFileTests/MediaFileServiceTest.cs b/NzbDrone.Core.Test/MediaFileTests/MediaFileServiceTest.cs
index 9ad774623..0d753a399 100644
--- a/NzbDrone.Core.Test/MediaFileTests/MediaFileServiceTest.cs
+++ b/NzbDrone.Core.Test/MediaFileTests/MediaFileServiceTest.cs
@@ -1,13 +1,7 @@
-using System.Linq;
-using FizzWare.NBuilder;
using FluentAssertions;
-using Marr.Data;
using NUnit.Framework;
-using NzbDrone.Core.Configuration;
using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.Organizer;
-using NzbDrone.Core.RootFolders;
-using NzbDrone.Core.Tv;
using NzbDrone.Core.Test.Framework;
namespace NzbDrone.Core.Test.MediaFileTests
diff --git a/NzbDrone.Core.Test/MediaFileTests/UpgradeMediaFileServiceFixture.cs b/NzbDrone.Core.Test/MediaFileTests/UpgradeMediaFileServiceFixture.cs
index 80dbeac3f..1b469c361 100644
--- a/NzbDrone.Core.Test/MediaFileTests/UpgradeMediaFileServiceFixture.cs
+++ b/NzbDrone.Core.Test/MediaFileTests/UpgradeMediaFileServiceFixture.cs
@@ -1,18 +1,12 @@
-using System.IO;
-using System.Linq;
+using System.Linq;
using FizzWare.NBuilder;
-using FluentAssertions;
using Marr.Data;
using Moq;
using NUnit.Framework;
-using NzbDrone.Common;
using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.Organizer;
using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Qualities;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Tv;
-using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.MediaFileTests
{
diff --git a/NzbDrone.Core.Test/NotificationTests/NotificationServiceFixture.cs b/NzbDrone.Core.Test/NotificationTests/NotificationServiceFixture.cs
index abb0c3165..c42b5c9d3 100644
--- a/NzbDrone.Core.Test/NotificationTests/NotificationServiceFixture.cs
+++ b/NzbDrone.Core.Test/NotificationTests/NotificationServiceFixture.cs
@@ -1,17 +1,13 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Linq;
using FluentAssertions;
-using Moq;
using NUnit.Framework;
using NzbDrone.Common.Composition;
-using NzbDrone.Core.Lifecycle;
using NzbDrone.Core.Notifications;
using NzbDrone.Core.Notifications.Email;
using NzbDrone.Core.Notifications.Growl;
using NzbDrone.Core.Notifications.Plex;
using NzbDrone.Core.Notifications.Prowl;
-using NzbDrone.Core.Notifications.Xbmc;
using NzbDrone.Core.Test.Framework;
namespace NzbDrone.Core.Test.NotificationTests
diff --git a/NzbDrone.Core.Test/NotificationTests/ProwlProviderTest.cs b/NzbDrone.Core.Test/NotificationTests/ProwlProviderTest.cs
index 397b4a56c..eefff220b 100644
--- a/NzbDrone.Core.Test/NotificationTests/ProwlProviderTest.cs
+++ b/NzbDrone.Core.Test/NotificationTests/ProwlProviderTest.cs
@@ -1,9 +1,7 @@
-using FluentAssertions;
-using NUnit.Framework;
+using NUnit.Framework;
using NzbDrone.Core.Notifications.Prowl;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;
-using Prowlin;
namespace NzbDrone.Core.Test.NotificationTests
{
diff --git a/NzbDrone.Core.Test/NotificationTests/Xbmc/GetJsonVersionFixture.cs b/NzbDrone.Core.Test/NotificationTests/Xbmc/GetJsonVersionFixture.cs
index 388c1cccc..19f7db315 100644
--- a/NzbDrone.Core.Test/NotificationTests/Xbmc/GetJsonVersionFixture.cs
+++ b/NzbDrone.Core.Test/NotificationTests/Xbmc/GetJsonVersionFixture.cs
@@ -1,17 +1,10 @@
-using System;
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
+using FluentAssertions;
using Moq;
using NUnit.Framework;
using NzbDrone.Common;
-using NzbDrone.Core.Configuration;
using NzbDrone.Core.Notifications.Xbmc;
-using NzbDrone.Core.Tv;
using NzbDrone.Core.Model.Xbmc;
-using NzbDrone.Core.Providers;
using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common.AutoMoq;
namespace NzbDrone.Core.Test.NotificationTests.Xbmc
{
diff --git a/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/ActivePlayersFixture.cs b/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/ActivePlayersFixture.cs
index ca412a3c1..22dd65139 100644
--- a/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/ActivePlayersFixture.cs
+++ b/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/ActivePlayersFixture.cs
@@ -1,9 +1,6 @@
using System;
-using System.Collections.Generic;
using System.Linq;
-using System.Text;
using FluentAssertions;
-using Moq;
using NUnit.Framework;
using NzbDrone.Common;
using NzbDrone.Core.Notifications.Xbmc;
diff --git a/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/CheckForErrorFixture.cs b/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/CheckForErrorFixture.cs
index db4aeeb1d..a7b70909b 100644
--- a/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/CheckForErrorFixture.cs
+++ b/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/CheckForErrorFixture.cs
@@ -1,11 +1,6 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using FluentAssertions;
-using Moq;
using NUnit.Framework;
-using NzbDrone.Common;
using NzbDrone.Core.Notifications.Xbmc;
using NzbDrone.Core.Test.Framework;
diff --git a/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/GetSeriesPathFixture.cs b/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/GetSeriesPathFixture.cs
index 32861e067..236a8a952 100644
--- a/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/GetSeriesPathFixture.cs
+++ b/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/GetSeriesPathFixture.cs
@@ -1,9 +1,5 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using FluentAssertions;
-using Moq;
using NUnit.Framework;
using NzbDrone.Common;
using NzbDrone.Core.Notifications.Xbmc;
diff --git a/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/UpdateFixture.cs b/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/UpdateFixture.cs
index 2ecb1d8a4..7f69613ea 100644
--- a/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/UpdateFixture.cs
+++ b/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/UpdateFixture.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using Moq;
+using FizzWare.NBuilder;
using NUnit.Framework;
using NzbDrone.Common;
using NzbDrone.Core.Notifications.Xbmc;
diff --git a/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/ActivePlayersFixture.cs b/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/ActivePlayersFixture.cs
index 250079575..43f045b79 100644
--- a/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/ActivePlayersFixture.cs
+++ b/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/ActivePlayersFixture.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Linq;
using FluentAssertions;
using Moq;
using NUnit.Framework;
diff --git a/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/CheckForErrorFixture.cs b/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/CheckForErrorFixture.cs
index 60a685727..b7f0810c7 100644
--- a/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/CheckForErrorFixture.cs
+++ b/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/CheckForErrorFixture.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using FluentAssertions;
using NUnit.Framework;
using NzbDrone.Core.Notifications.Xbmc;
diff --git a/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/GetSeriesPathFixture.cs b/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/GetSeriesPathFixture.cs
index c1b8ab41e..5a28902c9 100644
--- a/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/GetSeriesPathFixture.cs
+++ b/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/GetSeriesPathFixture.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using FluentAssertions;
+using FluentAssertions;
using Moq;
using NUnit.Framework;
using NzbDrone.Common;
diff --git a/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/UpdateFixture.cs b/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/UpdateFixture.cs
index 0e117e1c6..9e5b81f80 100644
--- a/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/UpdateFixture.cs
+++ b/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/UpdateFixture.cs
@@ -1,9 +1,5 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using FizzWare.NBuilder;
-using FluentAssertions;
using Moq;
using NUnit.Framework;
using NzbDrone.Common;
diff --git a/NzbDrone.Core.Test/OrganizerTests/BuildFilePathFixture.cs b/NzbDrone.Core.Test/OrganizerTests/BuildFilePathFixture.cs
index 9764eaa59..36860b135 100644
--- a/NzbDrone.Core.Test/OrganizerTests/BuildFilePathFixture.cs
+++ b/NzbDrone.Core.Test/OrganizerTests/BuildFilePathFixture.cs
@@ -1,13 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
using FizzWare.NBuilder;
using FluentAssertions;
using NUnit.Framework;
using NzbDrone.Core.Configuration;
-using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.Organizer;
-using NzbDrone.Core.Qualities;
using NzbDrone.Core.Tv;
using NzbDrone.Core.Test.Framework;
diff --git a/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs b/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs
index 1510bf844..a0ee12d92 100644
--- a/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs
+++ b/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs
@@ -1,10 +1,8 @@
using System;
-using System.Linq;
using FluentAssertions;
using NUnit.Framework;
-using NzbDrone.Core.Model;
using NzbDrone.Core.Qualities;
using NzbDrone.Core.Test.Framework;
diff --git a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/GetVideoFilesFixture.cs b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/GetVideoFilesFixture.cs
index 5f9d1478c..5a22f7ee5 100644
--- a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/GetVideoFilesFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/GetVideoFilesFixture.cs
@@ -5,8 +5,6 @@ using Moq;
using NUnit.Framework;
using NzbDrone.Common;
using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.Providers;
-
using NzbDrone.Core.Test.Framework;
namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
diff --git a/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/CleanupFixture.cs b/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/CleanupFixture.cs
index 38f560870..76823f8c7 100644
--- a/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/CleanupFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/CleanupFixture.cs
@@ -5,8 +5,6 @@ using NUnit.Framework;
using NzbDrone.Common;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.Providers;
-
using NzbDrone.Core.Test.Framework;
namespace NzbDrone.Core.Test.ProviderTests.RecycleBinProviderTests
diff --git a/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteDirectoryFixture.cs b/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteDirectoryFixture.cs
index 3de343d70..8d0ae4e7a 100644
--- a/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteDirectoryFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteDirectoryFixture.cs
@@ -1,22 +1,13 @@
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;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers;
-
using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common.AutoMoq;
namespace NzbDrone.Core.Test.ProviderTests.RecycleBinProviderTests
{
diff --git a/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteFileFixture.cs b/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteFileFixture.cs
index 03586171a..e1c3e6943 100644
--- a/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteFileFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteFileFixture.cs
@@ -1,22 +1,12 @@
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;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers;
-
using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common.AutoMoq;
namespace NzbDrone.Core.Test.ProviderTests.RecycleBinProviderTests
{
diff --git a/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/EmptyFixture.cs b/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/EmptyFixture.cs
index bc78125b2..a15ec60da 100644
--- a/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/EmptyFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/EmptyFixture.cs
@@ -1,22 +1,13 @@
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;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers;
-
using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common.AutoMoq;
namespace NzbDrone.Core.Test.ProviderTests.RecycleBinProviderTests
{
diff --git a/NzbDrone.Core.Test/Qualities/QualityFixture.cs b/NzbDrone.Core.Test/Qualities/QualityFixture.cs
index 827a4a643..a3fabfec0 100644
--- a/NzbDrone.Core.Test/Qualities/QualityFixture.cs
+++ b/NzbDrone.Core.Test/Qualities/QualityFixture.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using FluentAssertions;
+using FluentAssertions;
using NUnit.Framework;
using NzbDrone.Core.Qualities;
using NzbDrone.Core.Test.Framework;
diff --git a/NzbDrone.Core.Test/Qualities/QualitySizeRepositoryFixture.cs b/NzbDrone.Core.Test/Qualities/QualitySizeRepositoryFixture.cs
index b5a22641d..02454aa66 100644
--- a/NzbDrone.Core.Test/Qualities/QualitySizeRepositoryFixture.cs
+++ b/NzbDrone.Core.Test/Qualities/QualitySizeRepositoryFixture.cs
@@ -1,4 +1,3 @@
-using System;
using NUnit.Framework;
using NzbDrone.Core.Datastore;
using NzbDrone.Core.Lifecycle;
diff --git a/NzbDrone.Core.Test/RootFolderTests/RootFolderServiceFixture.cs b/NzbDrone.Core.Test/RootFolderTests/RootFolderServiceFixture.cs
index 8d8d812f5..ebfb71ed6 100644
--- a/NzbDrone.Core.Test/RootFolderTests/RootFolderServiceFixture.cs
+++ b/NzbDrone.Core.Test/RootFolderTests/RootFolderServiceFixture.cs
@@ -3,7 +3,6 @@
using System;
using System.Collections.Generic;
using System.IO;
-using System.Linq;
using FluentAssertions;
using Moq;
using NUnit.Framework;
diff --git a/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/HandleEpisodeFileDeletedFixture.cs b/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/HandleEpisodeFileDeletedFixture.cs
index d6c4e85fd..62c1d6a04 100644
--- a/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/HandleEpisodeFileDeletedFixture.cs
+++ b/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/HandleEpisodeFileDeletedFixture.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/TvTests/EpisodeRepositoryTests/EpisodesRepositoryReadFixture.cs b/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesRepositoryReadFixture.cs
index 41e691e34..1a7f06151 100644
--- a/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesRepositoryReadFixture.cs
+++ b/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesRepositoryReadFixture.cs
@@ -1,5 +1,4 @@
-using System;
-using FizzWare.NBuilder;
+using FizzWare.NBuilder;
using FluentAssertions;
using NUnit.Framework;
using NzbDrone.Core.MediaFiles;
diff --git a/NzbDrone.Core.Test/TvTests/QualityModelFixture.cs b/NzbDrone.Core.Test/TvTests/QualityModelFixture.cs
index edf88002a..322ef2e79 100644
--- a/NzbDrone.Core.Test/TvTests/QualityModelFixture.cs
+++ b/NzbDrone.Core.Test/TvTests/QualityModelFixture.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using FluentAssertions;
+using FluentAssertions;
using NUnit.Framework;
using NzbDrone.Core.Qualities;
using NzbDrone.Core.Tv;
diff --git a/NzbDrone.Core.Test/TvTests/SeasonProviderTest.cs b/NzbDrone.Core.Test/TvTests/SeasonProviderTest.cs
index a68b196a8..efb11c7bb 100644
--- a/NzbDrone.Core.Test/TvTests/SeasonProviderTest.cs
+++ b/NzbDrone.Core.Test/TvTests/SeasonProviderTest.cs
@@ -1,13 +1,9 @@
-
-
-using System;
-using System.Linq;
+using System.Linq;
using FizzWare.NBuilder;
using FluentAssertions;
using NUnit.Framework;
using NzbDrone.Core.Tv;
using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.TvTests
{
diff --git a/NzbDrone.Core.Test/TvTests/SeriesServiceFixture.cs b/NzbDrone.Core.Test/TvTests/SeriesServiceFixture.cs
index c5f1a6064..99ead2647 100644
Binary files a/NzbDrone.Core.Test/TvTests/SeriesServiceFixture.cs and b/NzbDrone.Core.Test/TvTests/SeriesServiceFixture.cs differ
diff --git a/NzbDrone.Core.Test/XbmcVersionTests.cs b/NzbDrone.Core.Test/XbmcVersionTests.cs
index 6623156c0..b4a118b0f 100644
--- a/NzbDrone.Core.Test/XbmcVersionTests.cs
+++ b/NzbDrone.Core.Test/XbmcVersionTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using FluentAssertions;
+using FluentAssertions;
using NUnit.Framework;
using NzbDrone.Core.Model.Xbmc;
diff --git a/NzbDrone.Core/Configuration/ConfigRepository.cs b/NzbDrone.Core/Configuration/ConfigRepository.cs
index 4f256030d..b0665445e 100644
--- a/NzbDrone.Core/Configuration/ConfigRepository.cs
+++ b/NzbDrone.Core/Configuration/ConfigRepository.cs
@@ -1,4 +1,3 @@
-using System.Data;
using System.Linq;
using NzbDrone.Common.Messaging;
using NzbDrone.Core.Datastore;
diff --git a/NzbDrone.Core/DataAugmentation/Scene/SceneMappingRepository.cs b/NzbDrone.Core/DataAugmentation/Scene/SceneMappingRepository.cs
index b5c7fcdd9..417b6cf11 100644
--- a/NzbDrone.Core/DataAugmentation/Scene/SceneMappingRepository.cs
+++ b/NzbDrone.Core/DataAugmentation/Scene/SceneMappingRepository.cs
@@ -1,4 +1,3 @@
-using System.Linq;
using NzbDrone.Common.Messaging;
using NzbDrone.Core.Datastore;
diff --git a/NzbDrone.Core/Datastore/BasicRepository.cs b/NzbDrone.Core/Datastore/BasicRepository.cs
index 6447e67d5..303a9eef9 100644
--- a/NzbDrone.Core/Datastore/BasicRepository.cs
+++ b/NzbDrone.Core/Datastore/BasicRepository.cs
@@ -4,7 +4,6 @@ using System.Linq;
using System.Linq.Expressions;
using Marr.Data;
using Marr.Data.QGen;
-using NzbDrone.Common.EnsureThat;
using NzbDrone.Common.Messaging;
using NzbDrone.Core.Datastore.Events;
using NzbDrone.Common;
diff --git a/NzbDrone.Core/Datastore/Events/ModelEvent.cs b/NzbDrone.Core/Datastore/Events/ModelEvent.cs
index c5ef20daa..30b9af580 100644
--- a/NzbDrone.Core/Datastore/Events/ModelEvent.cs
+++ b/NzbDrone.Core/Datastore/Events/ModelEvent.cs
@@ -1,5 +1,4 @@
-using System;
-using NzbDrone.Common.Messaging;
+using NzbDrone.Common.Messaging;
namespace NzbDrone.Core.Datastore.Events
{
diff --git a/NzbDrone.Core/Datastore/MappingExtensions.cs b/NzbDrone.Core/Datastore/MappingExtensions.cs
index a2c04a890..bbaf838f2 100644
--- a/NzbDrone.Core/Datastore/MappingExtensions.cs
+++ b/NzbDrone.Core/Datastore/MappingExtensions.cs
@@ -1,10 +1,8 @@
using System;
-using System.Collections.Generic;
using System.Reflection;
using Marr.Data;
using Marr.Data.Mapping;
using NzbDrone.Common.Reflection;
-using NzbDrone.Core.Tv;
namespace NzbDrone.Core.Datastore
{
diff --git a/NzbDrone.Core/DecisionEngine/IDecisionEngineSpecification.cs b/NzbDrone.Core/DecisionEngine/IDecisionEngineSpecification.cs
index 85cc0be05..11e10747b 100644
--- a/NzbDrone.Core/DecisionEngine/IDecisionEngineSpecification.cs
+++ b/NzbDrone.Core/DecisionEngine/IDecisionEngineSpecification.cs
@@ -1,5 +1,3 @@
-using NzbDrone.Core.Model;
-using NzbDrone.Core.Parser;
using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.DecisionEngine
diff --git a/NzbDrone.Core/DecisionEngine/Specifications/CustomStartDateSpecification.cs b/NzbDrone.Core/DecisionEngine/Specifications/CustomStartDateSpecification.cs
index 46ab16648..a1636f8e8 100644
--- a/NzbDrone.Core/DecisionEngine/Specifications/CustomStartDateSpecification.cs
+++ b/NzbDrone.Core/DecisionEngine/Specifications/CustomStartDateSpecification.cs
@@ -1,7 +1,5 @@
using System.Linq;
using NLog;
-using NzbDrone.Core.Model;
-using NzbDrone.Core.Parser;
using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.DecisionEngine.Specifications
diff --git a/NzbDrone.Core/DecisionEngine/Specifications/NotRestrictedReleaseSpecification.cs b/NzbDrone.Core/DecisionEngine/Specifications/NotRestrictedReleaseSpecification.cs
index aeeb65173..78dfe598c 100644
--- a/NzbDrone.Core/DecisionEngine/Specifications/NotRestrictedReleaseSpecification.cs
+++ b/NzbDrone.Core/DecisionEngine/Specifications/NotRestrictedReleaseSpecification.cs
@@ -1,9 +1,6 @@
using System;
-using System.Linq;
using NLog;
using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Model;
-using NzbDrone.Core.Parser;
using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.DecisionEngine.Specifications
diff --git a/NzbDrone.Core/DecisionEngine/Specifications/RetentionSpecification.cs b/NzbDrone.Core/DecisionEngine/Specifications/RetentionSpecification.cs
index 487e4aa2e..f219ddee0 100644
--- a/NzbDrone.Core/DecisionEngine/Specifications/RetentionSpecification.cs
+++ b/NzbDrone.Core/DecisionEngine/Specifications/RetentionSpecification.cs
@@ -1,7 +1,5 @@
using NLog;
using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Model;
-using NzbDrone.Core.Parser;
using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.DecisionEngine.Specifications
diff --git a/NzbDrone.Core/DecisionEngine/Specifications/Search/IDecisionEngineSearchSpecification.cs b/NzbDrone.Core/DecisionEngine/Specifications/Search/IDecisionEngineSearchSpecification.cs
index d1a235cea..6b4f94912 100644
--- a/NzbDrone.Core/DecisionEngine/Specifications/Search/IDecisionEngineSearchSpecification.cs
+++ b/NzbDrone.Core/DecisionEngine/Specifications/Search/IDecisionEngineSearchSpecification.cs
@@ -1,7 +1,4 @@
-using NzbDrone.Core.IndexerSearch;
using NzbDrone.Core.IndexerSearch.Definitions;
-using NzbDrone.Core.Model;
-using NzbDrone.Core.Parser;
using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.DecisionEngine.Specifications.Search
diff --git a/NzbDrone.Core/Download/Clients/Nzbget/NzbGetQueueItem.cs b/NzbDrone.Core/Download/Clients/Nzbget/NzbGetQueueItem.cs
index 9f60faa57..07aa44663 100644
--- a/NzbDrone.Core/Download/Clients/Nzbget/NzbGetQueueItem.cs
+++ b/NzbDrone.Core/Download/Clients/Nzbget/NzbGetQueueItem.cs
@@ -1,5 +1,4 @@
using System;
-using NzbDrone.Core.Model;
namespace NzbDrone.Core.Download.Clients.Nzbget
{
diff --git a/NzbDrone.Core/Download/Clients/Nzbget/VersionModel.cs b/NzbDrone.Core/Download/Clients/Nzbget/VersionModel.cs
index 6f234306e..9e7d90064 100644
--- a/NzbDrone.Core/Download/Clients/Nzbget/VersionModel.cs
+++ b/NzbDrone.Core/Download/Clients/Nzbget/VersionModel.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace NzbDrone.Core.Download.Clients.Nzbget
{
diff --git a/NzbDrone.Core/Download/Clients/Sabnzbd/SabAutoConfigureService.cs b/NzbDrone.Core/Download/Clients/Sabnzbd/SabAutoConfigureService.cs
index 994e4ae5c..6ff5a666a 100644
--- a/NzbDrone.Core/Download/Clients/Sabnzbd/SabAutoConfigureService.cs
+++ b/NzbDrone.Core/Download/Clients/Sabnzbd/SabAutoConfigureService.cs
@@ -6,7 +6,6 @@ using System.Net;
using System.Net.NetworkInformation;
using System.Text.RegularExpressions;
using NLog;
-using NzbDrone.Core.Model;
namespace NzbDrone.Core.Download.Clients.Sabnzbd
{
diff --git a/NzbDrone.Core/Download/Clients/Sabnzbd/SabJsonError.cs b/NzbDrone.Core/Download/Clients/Sabnzbd/SabJsonError.cs
index 2d2ce28f7..4a8b00045 100644
--- a/NzbDrone.Core/Download/Clients/Sabnzbd/SabJsonError.cs
+++ b/NzbDrone.Core/Download/Clients/Sabnzbd/SabJsonError.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Newtonsoft.Json;
-
-namespace NzbDrone.Core.Download.Clients.Sabnzbd
+namespace NzbDrone.Core.Download.Clients.Sabnzbd
{
public class SabJsonError
{
diff --git a/NzbDrone.Core/Download/Clients/Sabnzbd/SabQueue.cs b/NzbDrone.Core/Download/Clients/Sabnzbd/SabQueue.cs
index 6b91bb4cc..d19fa608c 100644
--- a/NzbDrone.Core/Download/Clients/Sabnzbd/SabQueue.cs
+++ b/NzbDrone.Core/Download/Clients/Sabnzbd/SabQueue.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
using Newtonsoft.Json;
namespace NzbDrone.Core.Download.Clients.Sabnzbd
diff --git a/NzbDrone.Core/Download/Clients/Sabnzbd/SabQueueItem.cs b/NzbDrone.Core/Download/Clients/Sabnzbd/SabQueueItem.cs
index f063c4b7b..b6fcdb0dd 100644
--- a/NzbDrone.Core/Download/Clients/Sabnzbd/SabQueueItem.cs
+++ b/NzbDrone.Core/Download/Clients/Sabnzbd/SabQueueItem.cs
@@ -1,7 +1,6 @@
using System;
using Newtonsoft.Json;
using NzbDrone.Core.Download.Clients.Sabnzbd.JsonConverters;
-using NzbDrone.Core.Model;
namespace NzbDrone.Core.Download.Clients.Sabnzbd
{
diff --git a/NzbDrone.Core/Download/Clients/Sabnzbd/SabVersionModel.cs b/NzbDrone.Core/Download/Clients/Sabnzbd/SabVersionModel.cs
index 19fdc7b69..9d8cad8fd 100644
--- a/NzbDrone.Core/Download/Clients/Sabnzbd/SabVersionModel.cs
+++ b/NzbDrone.Core/Download/Clients/Sabnzbd/SabVersionModel.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace NzbDrone.Core.Download.Clients.Sabnzbd
+namespace NzbDrone.Core.Download.Clients.Sabnzbd
{
public class SabVersionModel
{
diff --git a/NzbDrone.Core/Download/DownloadApprovedReports.cs b/NzbDrone.Core/Download/DownloadApprovedReports.cs
index 569dd31a2..e0a781e8a 100644
--- a/NzbDrone.Core/Download/DownloadApprovedReports.cs
+++ b/NzbDrone.Core/Download/DownloadApprovedReports.cs
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Text;
using NLog;
using NzbDrone.Core.DecisionEngine;
diff --git a/NzbDrone.Core/Download/DownloadClientProvider.cs b/NzbDrone.Core/Download/DownloadClientProvider.cs
index 9fc1c3479..12f9260b8 100644
--- a/NzbDrone.Core/Download/DownloadClientProvider.cs
+++ b/NzbDrone.Core/Download/DownloadClientProvider.cs
@@ -2,7 +2,6 @@
using NzbDrone.Core.Download.Clients;
using NzbDrone.Core.Download.Clients.Nzbget;
using NzbDrone.Core.Download.Clients.Sabnzbd;
-using NzbDrone.Core.Model;
namespace NzbDrone.Core.Download
{
diff --git a/NzbDrone.Core/Download/EpisodeGrabbedEvent.cs b/NzbDrone.Core/Download/EpisodeGrabbedEvent.cs
index 7f3247f33..cd6fc46cc 100644
--- a/NzbDrone.Core/Download/EpisodeGrabbedEvent.cs
+++ b/NzbDrone.Core/Download/EpisodeGrabbedEvent.cs
@@ -1,6 +1,4 @@
using NzbDrone.Common.Messaging;
-using NzbDrone.Core.Model;
-using NzbDrone.Core.Parser;
using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.Download
diff --git a/NzbDrone.Core/Download/IDownloadClient.cs b/NzbDrone.Core/Download/IDownloadClient.cs
index 8e2cdebae..0cef19aca 100644
--- a/NzbDrone.Core/Download/IDownloadClient.cs
+++ b/NzbDrone.Core/Download/IDownloadClient.cs
@@ -1,6 +1,4 @@
using System.Collections.Generic;
-using System.Linq;
-using NzbDrone.Core.Model;
using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.Download
diff --git a/NzbDrone.Core/Download/SeriesRenamedEvent.cs b/NzbDrone.Core/Download/SeriesRenamedEvent.cs
index 0de78d7d1..18c7d4b80 100644
--- a/NzbDrone.Core/Download/SeriesRenamedEvent.cs
+++ b/NzbDrone.Core/Download/SeriesRenamedEvent.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using NzbDrone.Common.Messaging;
+using NzbDrone.Common.Messaging;
using NzbDrone.Core.Tv;
namespace NzbDrone.Core.Download
diff --git a/NzbDrone.Core/History/HistoryRepository.cs b/NzbDrone.Core/History/HistoryRepository.cs
index 4a4675384..ca436d153 100644
--- a/NzbDrone.Core/History/HistoryRepository.cs
+++ b/NzbDrone.Core/History/HistoryRepository.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Data;
using System.Linq;
using Marr.Data.QGen;
using NzbDrone.Common.Messaging;
diff --git a/NzbDrone.Core/IndexerSearch/EpisodeSearchService.cs b/NzbDrone.Core/IndexerSearch/EpisodeSearchService.cs
index 3f215b0fa..e62a99836 100644
--- a/NzbDrone.Core/IndexerSearch/EpisodeSearchService.cs
+++ b/NzbDrone.Core/IndexerSearch/EpisodeSearchService.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using NzbDrone.Common.Messaging;
+using NzbDrone.Common.Messaging;
using NzbDrone.Core.Download;
namespace NzbDrone.Core.IndexerSearch
diff --git a/NzbDrone.Core/IndexerSearch/SearchAndDownloadService.cs b/NzbDrone.Core/IndexerSearch/SearchAndDownloadService.cs
index 193608a5e..d15c9c63c 100644
--- a/NzbDrone.Core/IndexerSearch/SearchAndDownloadService.cs
+++ b/NzbDrone.Core/IndexerSearch/SearchAndDownloadService.cs
@@ -1,6 +1,4 @@
using System;
-using NzbDrone.Core.DecisionEngine;
-using NzbDrone.Core.Download;
namespace NzbDrone.Core.IndexerSearch
{
diff --git a/NzbDrone.Core/IndexerSearch/SeasonSearchService.cs b/NzbDrone.Core/IndexerSearch/SeasonSearchService.cs
index 9fdbe05b1..7572b5b6d 100644
--- a/NzbDrone.Core/IndexerSearch/SeasonSearchService.cs
+++ b/NzbDrone.Core/IndexerSearch/SeasonSearchService.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using NzbDrone.Common.Messaging;
+using NzbDrone.Common.Messaging;
using NzbDrone.Core.Download;
namespace NzbDrone.Core.IndexerSearch
diff --git a/NzbDrone.Core/Indexers/IndexerWithSetting.cs b/NzbDrone.Core/Indexers/IndexerWithSetting.cs
index 602b99f84..78db54932 100644
--- a/NzbDrone.Core/Indexers/IndexerWithSetting.cs
+++ b/NzbDrone.Core/Indexers/IndexerWithSetting.cs
@@ -1,4 +1,3 @@
-using NzbDrone.Common;
using NzbDrone.Common.Serializer;
namespace NzbDrone.Core.Indexers
diff --git a/NzbDrone.Core/Indexers/Omgwtfnzbs/OmgwtfnzbsParser.cs b/NzbDrone.Core/Indexers/Omgwtfnzbs/OmgwtfnzbsParser.cs
index 788de718e..9f4bf3aa5 100644
--- a/NzbDrone.Core/Indexers/Omgwtfnzbs/OmgwtfnzbsParser.cs
+++ b/NzbDrone.Core/Indexers/Omgwtfnzbs/OmgwtfnzbsParser.cs
@@ -1,8 +1,6 @@
using System;
using System.ServiceModel.Syndication;
using System.Text.RegularExpressions;
-using NzbDrone.Core.Model;
-using NzbDrone.Core.Parser;
using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.Indexers.Omgwtfnzbs
diff --git a/NzbDrone.Core/Indexers/RssSyncService.cs b/NzbDrone.Core/Indexers/RssSyncService.cs
index aa5221105..baf414fac 100644
--- a/NzbDrone.Core/Indexers/RssSyncService.cs
+++ b/NzbDrone.Core/Indexers/RssSyncService.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
using NLog;
using NzbDrone.Common.Messaging;
using NzbDrone.Core.DecisionEngine;
diff --git a/NzbDrone.Core/Indexers/Wombles/WomblesParser.cs b/NzbDrone.Core/Indexers/Wombles/WomblesParser.cs
index 7e5635d21..1a980a9fb 100644
--- a/NzbDrone.Core/Indexers/Wombles/WomblesParser.cs
+++ b/NzbDrone.Core/Indexers/Wombles/WomblesParser.cs
@@ -1,6 +1,4 @@
using System.ServiceModel.Syndication;
-using NzbDrone.Core.Model;
-using NzbDrone.Core.Parser;
using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.Indexers.Wombles
diff --git a/NzbDrone.Core/Jobs/JobRepository.cs b/NzbDrone.Core/Jobs/JobRepository.cs
index 8bb721f7f..700b8674e 100644
--- a/NzbDrone.Core/Jobs/JobRepository.cs
+++ b/NzbDrone.Core/Jobs/JobRepository.cs
@@ -1,5 +1,4 @@
using System;
-using System.Collections.Generic;
using System.Linq;
using NzbDrone.Common.Messaging;
using NzbDrone.Core.Datastore;
diff --git a/NzbDrone.Core/Jobs/Scheduler.cs b/NzbDrone.Core/Jobs/Scheduler.cs
index f294c74a6..20ed73489 100644
--- a/NzbDrone.Core/Jobs/Scheduler.cs
+++ b/NzbDrone.Core/Jobs/Scheduler.cs
@@ -2,7 +2,6 @@
using System.Threading;
using System.Threading.Tasks;
using NLog;
-using NzbDrone.Common.Composition;
using NzbDrone.Common.Messaging;
using NzbDrone.Core.Lifecycle;
using Timer = System.Timers.Timer;
diff --git a/NzbDrone.Core/MediaFiles/DiskScanService.cs b/NzbDrone.Core/MediaFiles/DiskScanService.cs
index ceaae1165..2f21a9c26 100644
--- a/NzbDrone.Core/MediaFiles/DiskScanService.cs
+++ b/NzbDrone.Core/MediaFiles/DiskScanService.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.IO;
using System.Linq;
using NLog;
using NzbDrone.Common;
diff --git a/NzbDrone.Core/MediaFiles/EpisodeImport/IImportDecisionEngineSpecification.cs b/NzbDrone.Core/MediaFiles/EpisodeImport/IImportDecisionEngineSpecification.cs
index e045826b1..3759ea6d0 100644
--- a/NzbDrone.Core/MediaFiles/EpisodeImport/IImportDecisionEngineSpecification.cs
+++ b/NzbDrone.Core/MediaFiles/EpisodeImport/IImportDecisionEngineSpecification.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using NzbDrone.Core.DecisionEngine;
+using NzbDrone.Core.DecisionEngine;
using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.MediaFiles.EpisodeImport
diff --git a/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs b/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs
index ffb029344..e74a27ac5 100644
--- a/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs
+++ b/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
-using System.Text;
using NLog;
using NzbDrone.Common;
using NzbDrone.Common.Messaging;
diff --git a/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecision.cs b/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecision.cs
index d499a7823..ec990860b 100644
--- a/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecision.cs
+++ b/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecision.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Linq;
-using System.Text;
using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.MediaFiles.EpisodeImport
diff --git a/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs b/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs
index d2f1164bc..a157d8a6c 100644
--- a/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs
+++ b/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs
@@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
-using System.IO;
using System.Linq;
-using System.Text;
using NLog;
using NzbDrone.Common;
using NzbDrone.Core.DecisionEngine;
diff --git a/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotAlreadyImportedSpecification.cs b/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotAlreadyImportedSpecification.cs
index beb7232fc..8fe699877 100644
--- a/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotAlreadyImportedSpecification.cs
+++ b/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotAlreadyImportedSpecification.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using NLog;
+using NLog;
using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
diff --git a/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotExistingFileSpecification.cs b/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotExistingFileSpecification.cs
index d5a5e7eba..f917e51ee 100644
--- a/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotExistingFileSpecification.cs
+++ b/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotExistingFileSpecification.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.IO;
using System.Linq;
-using System.Text;
using NLog;
using NzbDrone.Core.Parser.Model;
diff --git a/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotSampleSpecification.cs b/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotSampleSpecification.cs
index c5ca01b08..aba58791a 100644
--- a/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotSampleSpecification.cs
+++ b/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotSampleSpecification.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using NLog;
-using NzbDrone.Common;
+using NLog;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Tv;
diff --git a/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/UpgradeSpecification.cs b/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/UpgradeSpecification.cs
index 1cfd4b1f8..58b5ac75d 100644
--- a/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/UpgradeSpecification.cs
+++ b/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/UpgradeSpecification.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Linq;
using NLog;
using NzbDrone.Core.Parser.Model;
diff --git a/NzbDrone.Core/MediaFiles/Events/EpisodeFileAddedEvent.cs b/NzbDrone.Core/MediaFiles/Events/EpisodeFileAddedEvent.cs
index ba7326093..83ea2a908 100644
--- a/NzbDrone.Core/MediaFiles/Events/EpisodeFileAddedEvent.cs
+++ b/NzbDrone.Core/MediaFiles/Events/EpisodeFileAddedEvent.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using NzbDrone.Common.Messaging;
+using NzbDrone.Common.Messaging;
namespace NzbDrone.Core.MediaFiles.Events
{
diff --git a/NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs b/NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs
index d6ee99bbb..4905705ca 100644
--- a/NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs
+++ b/NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Linq;
using NLog;
-using NzbDrone.Common;
using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.MediaFiles
diff --git a/NzbDrone.Core/Model/MisnamedEpisodeModel.cs b/NzbDrone.Core/Model/MisnamedEpisodeModel.cs
index 8697f6754..2c06b6d4f 100644
--- a/NzbDrone.Core/Model/MisnamedEpisodeModel.cs
+++ b/NzbDrone.Core/Model/MisnamedEpisodeModel.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace NzbDrone.Core.Model
+namespace NzbDrone.Core.Model
{
public class MisnamedEpisodeModel
{
diff --git a/NzbDrone.Core/Model/Xbmc/ActivePlayersDharmaResult.cs b/NzbDrone.Core/Model/Xbmc/ActivePlayersDharmaResult.cs
index df91f0083..a88e190d3 100644
--- a/NzbDrone.Core/Model/Xbmc/ActivePlayersDharmaResult.cs
+++ b/NzbDrone.Core/Model/Xbmc/ActivePlayersDharmaResult.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
namespace NzbDrone.Core.Model.Xbmc
{
diff --git a/NzbDrone.Core/Model/Xbmc/ActivePlayersEdenResult.cs b/NzbDrone.Core/Model/Xbmc/ActivePlayersEdenResult.cs
index d57022f1b..191a5e7f2 100644
--- a/NzbDrone.Core/Model/Xbmc/ActivePlayersEdenResult.cs
+++ b/NzbDrone.Core/Model/Xbmc/ActivePlayersEdenResult.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
namespace NzbDrone.Core.Model.Xbmc
{
diff --git a/NzbDrone.Core/Model/Xbmc/ErrorResult.cs b/NzbDrone.Core/Model/Xbmc/ErrorResult.cs
index 605157773..42f609e7c 100644
--- a/NzbDrone.Core/Model/Xbmc/ErrorResult.cs
+++ b/NzbDrone.Core/Model/Xbmc/ErrorResult.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
namespace NzbDrone.Core.Model.Xbmc
{
diff --git a/NzbDrone.Core/Model/Xbmc/TvShow.cs b/NzbDrone.Core/Model/Xbmc/TvShow.cs
index 2ec968d61..74d0cb3d6 100644
--- a/NzbDrone.Core/Model/Xbmc/TvShow.cs
+++ b/NzbDrone.Core/Model/Xbmc/TvShow.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace NzbDrone.Core.Model.Xbmc
+namespace NzbDrone.Core.Model.Xbmc
{
public class TvShow
{
diff --git a/NzbDrone.Core/Model/Xbmc/TvShowResponse.cs b/NzbDrone.Core/Model/Xbmc/TvShowResponse.cs
index 9d31ff166..4f6ae929a 100644
--- a/NzbDrone.Core/Model/Xbmc/TvShowResponse.cs
+++ b/NzbDrone.Core/Model/Xbmc/TvShowResponse.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace NzbDrone.Core.Model.Xbmc
+namespace NzbDrone.Core.Model.Xbmc
{
public class TvShowResponse
{
diff --git a/NzbDrone.Core/Model/Xbmc/TvShowResult.cs b/NzbDrone.Core/Model/Xbmc/TvShowResult.cs
index 9cdc306f2..e9af56d1e 100644
--- a/NzbDrone.Core/Model/Xbmc/TvShowResult.cs
+++ b/NzbDrone.Core/Model/Xbmc/TvShowResult.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
namespace NzbDrone.Core.Model.Xbmc
{
diff --git a/NzbDrone.Core/Model/Xbmc/VersionResult.cs b/NzbDrone.Core/Model/Xbmc/VersionResult.cs
index c707e3866..cc40e6004 100644
--- a/NzbDrone.Core/Model/Xbmc/VersionResult.cs
+++ b/NzbDrone.Core/Model/Xbmc/VersionResult.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
namespace NzbDrone.Core.Model.Xbmc
{
diff --git a/NzbDrone.Core/Model/Xbmc/XbmcJsonResult.cs b/NzbDrone.Core/Model/Xbmc/XbmcJsonResult.cs
index be4ed1d88..27cf8f749 100644
--- a/NzbDrone.Core/Model/Xbmc/XbmcJsonResult.cs
+++ b/NzbDrone.Core/Model/Xbmc/XbmcJsonResult.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace NzbDrone.Core.Model.Xbmc
+namespace NzbDrone.Core.Model.Xbmc
{
public class XbmcJsonResult
{
diff --git a/NzbDrone.Core/Model/Xbmc/XbmcVersion.cs b/NzbDrone.Core/Model/Xbmc/XbmcVersion.cs
index 5b777844d..2fc1e8e7f 100644
--- a/NzbDrone.Core/Model/Xbmc/XbmcVersion.cs
+++ b/NzbDrone.Core/Model/Xbmc/XbmcVersion.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace NzbDrone.Core.Model.Xbmc
{
diff --git a/NzbDrone.Core/Model/Xem/XemResult.cs b/NzbDrone.Core/Model/Xem/XemResult.cs
index 408aa6551..397700a11 100644
--- a/NzbDrone.Core/Model/Xem/XemResult.cs
+++ b/NzbDrone.Core/Model/Xem/XemResult.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace NzbDrone.Core.Model.Xem
+namespace NzbDrone.Core.Model.Xem
{
public class XemResult
{
diff --git a/NzbDrone.Core/Model/Xem/XemSceneTvdbMapping.cs b/NzbDrone.Core/Model/Xem/XemSceneTvdbMapping.cs
index 29e242e5b..317efa3e4 100644
--- a/NzbDrone.Core/Model/Xem/XemSceneTvdbMapping.cs
+++ b/NzbDrone.Core/Model/Xem/XemSceneTvdbMapping.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace NzbDrone.Core.Model.Xem
+namespace NzbDrone.Core.Model.Xem
{
public class XemSceneTvdbMapping
{
diff --git a/NzbDrone.Core/Model/Xem/XemValues.cs b/NzbDrone.Core/Model/Xem/XemValues.cs
index 781fbd5c4..6dc3d5e4a 100644
--- a/NzbDrone.Core/Model/Xem/XemValues.cs
+++ b/NzbDrone.Core/Model/Xem/XemValues.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace NzbDrone.Core.Model.Xem
+namespace NzbDrone.Core.Model.Xem
{
public class XemValues
{
diff --git a/NzbDrone.Core/Notifications/Growl/Growl.cs b/NzbDrone.Core/Notifications/Growl/Growl.cs
index 62609104e..fe4a49e6d 100644
--- a/NzbDrone.Core/Notifications/Growl/Growl.cs
+++ b/NzbDrone.Core/Notifications/Growl/Growl.cs
@@ -1,7 +1,4 @@
-using System;
-using NLog;
-using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Tv;
namespace NzbDrone.Core.Notifications.Growl
{
diff --git a/NzbDrone.Core/Notifications/Growl/GrowlSettings.cs b/NzbDrone.Core/Notifications/Growl/GrowlSettings.cs
index 7bce0fe36..0a90f6db9 100644
--- a/NzbDrone.Core/Notifications/Growl/GrowlSettings.cs
+++ b/NzbDrone.Core/Notifications/Growl/GrowlSettings.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using NzbDrone.Core.Annotations;
namespace NzbDrone.Core.Notifications.Growl
diff --git a/NzbDrone.Core/Notifications/INotifcationSettings.cs b/NzbDrone.Core/Notifications/INotifcationSettings.cs
index 50c9caa88..49e113de4 100644
--- a/NzbDrone.Core/Notifications/INotifcationSettings.cs
+++ b/NzbDrone.Core/Notifications/INotifcationSettings.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace NzbDrone.Core.Notifications
+namespace NzbDrone.Core.Notifications
{
public interface INotifcationSettings
{
diff --git a/NzbDrone.Core/Notifications/INotification.cs b/NzbDrone.Core/Notifications/INotification.cs
index 808d84135..cdfa29c49 100644
--- a/NzbDrone.Core/Notifications/INotification.cs
+++ b/NzbDrone.Core/Notifications/INotification.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Tv;
namespace NzbDrone.Core.Notifications
{
diff --git a/NzbDrone.Core/Notifications/Notification.cs b/NzbDrone.Core/Notifications/Notification.cs
index bbd5cde06..01c168e73 100644
--- a/NzbDrone.Core/Notifications/Notification.cs
+++ b/NzbDrone.Core/Notifications/Notification.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace NzbDrone.Core.Notifications
+namespace NzbDrone.Core.Notifications
{
public class Notification
{
diff --git a/NzbDrone.Core/Notifications/NotificationBase.cs b/NzbDrone.Core/Notifications/NotificationBase.cs
index d8412a02a..e00f486eb 100644
--- a/NzbDrone.Core/Notifications/NotificationBase.cs
+++ b/NzbDrone.Core/Notifications/NotificationBase.cs
@@ -1,6 +1,4 @@
-using System;
-using NLog;
-using NzbDrone.Common.Serializer;
+using NzbDrone.Common.Serializer;
using NzbDrone.Core.Tv;
namespace NzbDrone.Core.Notifications
diff --git a/NzbDrone.Core/Notifications/NotificationService.cs b/NzbDrone.Core/Notifications/NotificationService.cs
index c7b894f24..fecb528c8 100644
--- a/NzbDrone.Core/Notifications/NotificationService.cs
+++ b/NzbDrone.Core/Notifications/NotificationService.cs
@@ -2,8 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using NLog;
-using Newtonsoft.Json;
-using NzbDrone.Common;
using NzbDrone.Common.Composition;
using NzbDrone.Common.Messaging;
using NzbDrone.Common.Serializer;
diff --git a/NzbDrone.Core/Notifications/Plex/PlexClient.cs b/NzbDrone.Core/Notifications/Plex/PlexClient.cs
index 846f1dbf0..0ca86daa6 100644
--- a/NzbDrone.Core/Notifications/Plex/PlexClient.cs
+++ b/NzbDrone.Core/Notifications/Plex/PlexClient.cs
@@ -1,6 +1,4 @@
-using NLog;
-using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Tv;
namespace NzbDrone.Core.Notifications.Plex
{
diff --git a/NzbDrone.Core/Notifications/Plex/PlexClientSettings.cs b/NzbDrone.Core/Notifications/Plex/PlexClientSettings.cs
index 5eec32e4f..aeb4bb044 100644
--- a/NzbDrone.Core/Notifications/Plex/PlexClientSettings.cs
+++ b/NzbDrone.Core/Notifications/Plex/PlexClientSettings.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using NzbDrone.Core.Annotations;
namespace NzbDrone.Core.Notifications.Plex
diff --git a/NzbDrone.Core/Notifications/Plex/PlexServer.cs b/NzbDrone.Core/Notifications/Plex/PlexServer.cs
index 9b12099f5..6a4a2d893 100644
--- a/NzbDrone.Core/Notifications/Plex/PlexServer.cs
+++ b/NzbDrone.Core/Notifications/Plex/PlexServer.cs
@@ -1,6 +1,4 @@
-using NLog;
-using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Tv;
namespace NzbDrone.Core.Notifications.Plex
{
diff --git a/NzbDrone.Core/Notifications/Plex/PlexServerSettings.cs b/NzbDrone.Core/Notifications/Plex/PlexServerSettings.cs
index bd3b740d9..48d454ffd 100644
--- a/NzbDrone.Core/Notifications/Plex/PlexServerSettings.cs
+++ b/NzbDrone.Core/Notifications/Plex/PlexServerSettings.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using NzbDrone.Core.Annotations;
namespace NzbDrone.Core.Notifications.Plex
diff --git a/NzbDrone.Core/Notifications/Plex/PlexService.cs b/NzbDrone.Core/Notifications/Plex/PlexService.cs
index 59158b496..15e01420c 100644
--- a/NzbDrone.Core/Notifications/Plex/PlexService.cs
+++ b/NzbDrone.Core/Notifications/Plex/PlexService.cs
@@ -5,7 +5,6 @@ using System.Xml.Linq;
using NLog;
using NzbDrone.Common;
using NzbDrone.Common.Messaging;
-using NzbDrone.Core.Configuration;
namespace NzbDrone.Core.Notifications.Plex
{
diff --git a/NzbDrone.Core/Notifications/Prowl/InvalidApiKeyException.cs b/NzbDrone.Core/Notifications/Prowl/InvalidApiKeyException.cs
index 90d9ea789..d72cd1970 100644
--- a/NzbDrone.Core/Notifications/Prowl/InvalidApiKeyException.cs
+++ b/NzbDrone.Core/Notifications/Prowl/InvalidApiKeyException.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace NzbDrone.Core.Notifications.Prowl
{
diff --git a/NzbDrone.Core/Notifications/Prowl/ProwlPriority.cs b/NzbDrone.Core/Notifications/Prowl/ProwlPriority.cs
index 6a8187b76..858677964 100644
--- a/NzbDrone.Core/Notifications/Prowl/ProwlPriority.cs
+++ b/NzbDrone.Core/Notifications/Prowl/ProwlPriority.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace NzbDrone.Core.Notifications.Prowl
+namespace NzbDrone.Core.Notifications.Prowl
{
public enum ProwlPriority
{
diff --git a/NzbDrone.Core/Notifications/Prowl/ProwlSettings.cs b/NzbDrone.Core/Notifications/Prowl/ProwlSettings.cs
index 3ab4da458..faa1f876a 100644
--- a/NzbDrone.Core/Notifications/Prowl/ProwlSettings.cs
+++ b/NzbDrone.Core/Notifications/Prowl/ProwlSettings.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using NzbDrone.Core.Annotations;
namespace NzbDrone.Core.Notifications.Prowl
diff --git a/NzbDrone.Core/Notifications/Xbmc/HttpApiProvider.cs b/NzbDrone.Core/Notifications/Xbmc/HttpApiProvider.cs
index 9186b98da..7f3755f9c 100644
--- a/NzbDrone.Core/Notifications/Xbmc/HttpApiProvider.cs
+++ b/NzbDrone.Core/Notifications/Xbmc/HttpApiProvider.cs
@@ -2,11 +2,8 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
-using System.Text;
using System.Xml.Linq;
using NLog;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
using NzbDrone.Common;
using NzbDrone.Core.Model.Xbmc;
using NzbDrone.Core.Tv;
diff --git a/NzbDrone.Core/Notifications/Xbmc/IApiProvider.cs b/NzbDrone.Core/Notifications/Xbmc/IApiProvider.cs
index 78dbcae1a..a3ca85b71 100644
--- a/NzbDrone.Core/Notifications/Xbmc/IApiProvider.cs
+++ b/NzbDrone.Core/Notifications/Xbmc/IApiProvider.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
using NzbDrone.Core.Model.Xbmc;
using NzbDrone.Core.Tv;
diff --git a/NzbDrone.Core/Notifications/Xbmc/InvalidXbmcVersionException.cs b/NzbDrone.Core/Notifications/Xbmc/InvalidXbmcVersionException.cs
index d77acd189..0a0a46da0 100644
--- a/NzbDrone.Core/Notifications/Xbmc/InvalidXbmcVersionException.cs
+++ b/NzbDrone.Core/Notifications/Xbmc/InvalidXbmcVersionException.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
namespace NzbDrone.Core.Notifications.Xbmc
{
diff --git a/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs b/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs
index 061588bbd..2a74fa996 100644
--- a/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs
+++ b/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Text;
using NLog;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
diff --git a/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs b/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs
index 4ac54eb06..cc0f9bf3c 100644
--- a/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs
+++ b/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs
@@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
-using System.IO;
using System.Linq;
-using System.Xml.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using NLog;
diff --git a/NzbDrone.Core/Notifications/Xbmc/XbmcSettings.cs b/NzbDrone.Core/Notifications/Xbmc/XbmcSettings.cs
index bf69be494..ab0f1016f 100644
--- a/NzbDrone.Core/Notifications/Xbmc/XbmcSettings.cs
+++ b/NzbDrone.Core/Notifications/Xbmc/XbmcSettings.cs
@@ -1,8 +1,5 @@
using System;
-using System.Collections.Generic;
using System.ComponentModel;
-using System.Linq;
-using System.Text;
using Newtonsoft.Json;
using NzbDrone.Core.Annotations;
diff --git a/NzbDrone.Core/Parser/ParsingService.cs b/NzbDrone.Core/Parser/ParsingService.cs
index 4cd41a8f1..aad685e33 100644
--- a/NzbDrone.Core/Parser/ParsingService.cs
+++ b/NzbDrone.Core/Parser/ParsingService.cs
@@ -1,5 +1,4 @@
using System.Collections.Generic;
-using System.IO;
using System.Linq;
using NLog;
using NzbDrone.Core.Parser.Model;
diff --git a/NzbDrone.Core/Providers/XemCommunicationProvider.cs b/NzbDrone.Core/Providers/XemCommunicationProvider.cs
index 9d0645eff..ec64c6738 100644
--- a/NzbDrone.Core/Providers/XemCommunicationProvider.cs
+++ b/NzbDrone.Core/Providers/XemCommunicationProvider.cs
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Text;
using NLog;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
diff --git a/NzbDrone.Core/Qualities/QualitySize.cs b/NzbDrone.Core/Qualities/QualitySize.cs
index 5a8ccc23f..39f7f4e29 100644
--- a/NzbDrone.Core/Qualities/QualitySize.cs
+++ b/NzbDrone.Core/Qualities/QualitySize.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using NzbDrone.Core.Datastore;
+using NzbDrone.Core.Datastore;
namespace NzbDrone.Core.Qualities
diff --git a/NzbDrone.Core/Qualities/QualitySizeRepository.cs b/NzbDrone.Core/Qualities/QualitySizeRepository.cs
index f8ae8d929..ef4bb4138 100644
--- a/NzbDrone.Core/Qualities/QualitySizeRepository.cs
+++ b/NzbDrone.Core/Qualities/QualitySizeRepository.cs
@@ -1,5 +1,4 @@
using System;
-using System.Data;
using System.Linq;
using NzbDrone.Common.Messaging;
using NzbDrone.Core.Datastore;
diff --git a/NzbDrone.Core/SeriesStats/SeriesStatisticsService.cs b/NzbDrone.Core/SeriesStats/SeriesStatisticsService.cs
index 97b966808..e611e3fe0 100644
--- a/NzbDrone.Core/SeriesStats/SeriesStatisticsService.cs
+++ b/NzbDrone.Core/SeriesStats/SeriesStatisticsService.cs
@@ -1,5 +1,4 @@
using System.Collections.Generic;
-using System.Linq;
namespace NzbDrone.Core.SeriesStats
{
diff --git a/NzbDrone.Core/Tv/EpisodeRepository.cs b/NzbDrone.Core/Tv/EpisodeRepository.cs
index 2c2e8d2db..2b7934b9d 100644
--- a/NzbDrone.Core/Tv/EpisodeRepository.cs
+++ b/NzbDrone.Core/Tv/EpisodeRepository.cs
@@ -1,11 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using Marr.Data;
using Marr.Data.QGen;
using NzbDrone.Common.Messaging;
using NzbDrone.Core.Datastore;
-using NzbDrone.Core.Model;
namespace NzbDrone.Core.Tv
diff --git a/NzbDrone.Core/Tv/Events/SeriesDeletedEvent.cs b/NzbDrone.Core/Tv/Events/SeriesDeletedEvent.cs
index b9f752db2..e04d8f60e 100644
--- a/NzbDrone.Core/Tv/Events/SeriesDeletedEvent.cs
+++ b/NzbDrone.Core/Tv/Events/SeriesDeletedEvent.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using NzbDrone.Common.Messaging;
+using NzbDrone.Common.Messaging;
namespace NzbDrone.Core.Tv.Events
{
diff --git a/NzbDrone.Core/Tv/QualityModel.cs b/NzbDrone.Core/Tv/QualityModel.cs
index 0fd73afef..d5097c82d 100644
--- a/NzbDrone.Core/Tv/QualityModel.cs
+++ b/NzbDrone.Core/Tv/QualityModel.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using System;
+using System;
using NzbDrone.Core.Datastore;
using NzbDrone.Core.Qualities;
diff --git a/NzbDrone.Core/Tv/Season.cs b/NzbDrone.Core/Tv/Season.cs
index d5973a8fb..be36fcc86 100644
--- a/NzbDrone.Core/Tv/Season.cs
+++ b/NzbDrone.Core/Tv/Season.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using System;
+using System;
using System.Collections.Generic;
using NzbDrone.Core.Datastore;
diff --git a/NzbDrone.Core/Tv/SeriesService.cs b/NzbDrone.Core/Tv/SeriesService.cs
index 864c3eed4..0650d56fb 100644
--- a/NzbDrone.Core/Tv/SeriesService.cs
+++ b/NzbDrone.Core/Tv/SeriesService.cs
@@ -3,12 +3,10 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using NLog;
-using NzbDrone.Common;
using NzbDrone.Common.EnsureThat;
using NzbDrone.Common.Messaging;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.DataAugmentation.Scene;
-using NzbDrone.Core.Model;
using NzbDrone.Core.Organizer;
using NzbDrone.Core.Tv.Events;
diff --git a/NzbDrone.Core/Tv/SeriesStatusType.cs b/NzbDrone.Core/Tv/SeriesStatusType.cs
index 1b9381d21..acc9fbf81 100644
--- a/NzbDrone.Core/Tv/SeriesStatusType.cs
+++ b/NzbDrone.Core/Tv/SeriesStatusType.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace NzbDrone.Core.Tv
+namespace NzbDrone.Core.Tv
{
public enum SeriesStatusType
{
diff --git a/NzbDrone.Integration.Test/Client/ClientBase.cs b/NzbDrone.Integration.Test/Client/ClientBase.cs
index f99b5d5a9..182caab05 100644
--- a/NzbDrone.Integration.Test/Client/ClientBase.cs
+++ b/NzbDrone.Integration.Test/Client/ClientBase.cs
@@ -3,7 +3,6 @@ using System.Net;
using FluentAssertions;
using NLog;
using NzbDrone.Api.REST;
-using NzbDrone.Common;
using NzbDrone.Common.Serializer;
using RestSharp;
diff --git a/NzbDrone.Integration.Test/Properties/AssemblyInfo.cs b/NzbDrone.Integration.Test/Properties/AssemblyInfo.cs
index d0d4dd2e0..7580b9a29 100644
--- a/NzbDrone.Integration.Test/Properties/AssemblyInfo.cs
+++ b/NzbDrone.Integration.Test/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
diff --git a/NzbDrone.Integration.Test/QualityProfileIntegrationTest.cs b/NzbDrone.Integration.Test/QualityProfileIntegrationTest.cs
index d1c4cb796..2fff89a73 100644
--- a/NzbDrone.Integration.Test/QualityProfileIntegrationTest.cs
+++ b/NzbDrone.Integration.Test/QualityProfileIntegrationTest.cs
@@ -1,7 +1,4 @@
-using System.IO;
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Api.RootFolders;
+using NUnit.Framework;
namespace NzbDrone.Integration.Test
{
diff --git a/NzbDrone.Libraries.Test/Properties/AssemblyInfo.cs b/NzbDrone.Libraries.Test/Properties/AssemblyInfo.cs
index 55a06132e..e917b94f0 100644
--- a/NzbDrone.Libraries.Test/Properties/AssemblyInfo.cs
+++ b/NzbDrone.Libraries.Test/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
diff --git a/NzbDrone.Test.Common/AutoMoq/Unity/AutoMockingContainerExtension.cs b/NzbDrone.Test.Common/AutoMoq/Unity/AutoMockingContainerExtension.cs
index 9606c9a99..9c6170ce6 100644
--- a/NzbDrone.Test.Common/AutoMoq/Unity/AutoMockingContainerExtension.cs
+++ b/NzbDrone.Test.Common/AutoMoq/Unity/AutoMockingContainerExtension.cs
@@ -1,7 +1,4 @@
-
-
-using System.Linq;
-using System;
+using System;
using System.Collections.Generic;
using Microsoft.Practices.Unity;
using Microsoft.Practices.Unity.ObjectBuilder;
diff --git a/NzbDrone.Test.Common/MockerExtensions.cs b/NzbDrone.Test.Common/MockerExtensions.cs
index 91d50fecd..45f528e54 100644
--- a/NzbDrone.Test.Common/MockerExtensions.cs
+++ b/NzbDrone.Test.Common/MockerExtensions.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using NzbDrone.Test.Common.AutoMoq;
+using NzbDrone.Test.Common.AutoMoq;
namespace NzbDrone.Test.Common
{
diff --git a/NzbDrone.Test.Common/Properties/AssemblyInfo.cs b/NzbDrone.Test.Common/Properties/AssemblyInfo.cs
index 83d18e1be..232fc1a95 100644
--- a/NzbDrone.Test.Common/Properties/AssemblyInfo.cs
+++ b/NzbDrone.Test.Common/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
diff --git a/NzbDrone.Test.Common/ReflectionExtensions.cs b/NzbDrone.Test.Common/ReflectionExtensions.cs
index 4b32830e2..5fd01aead 100644
--- a/NzbDrone.Test.Common/ReflectionExtensions.cs
+++ b/NzbDrone.Test.Common/ReflectionExtensions.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace NzbDrone.Test.Common
+namespace NzbDrone.Test.Common
{
public static class ReflectionExtensions
{
diff --git a/NzbDrone.Test.Dummy/Properties/AssemblyInfo.cs b/NzbDrone.Test.Dummy/Properties/AssemblyInfo.cs
index fc658c5a9..79c12d157 100644
--- a/NzbDrone.Test.Dummy/Properties/AssemblyInfo.cs
+++ b/NzbDrone.Test.Dummy/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
diff --git a/NzbDrone.Update.Test/ProgramFixture.cs b/NzbDrone.Update.Test/ProgramFixture.cs
index 0e4080b0e..f7d976308 100644
--- a/NzbDrone.Update.Test/ProgramFixture.cs
+++ b/NzbDrone.Update.Test/ProgramFixture.cs
@@ -1,5 +1,4 @@
using System;
-using System.Linq;
using Moq;
using NUnit.Framework;
using NzbDrone.Common;
diff --git a/NzbDrone.Update.Test/Properties/AssemblyInfo.cs b/NzbDrone.Update.Test/Properties/AssemblyInfo.cs
index 14909adac..461dcbad9 100644
--- a/NzbDrone.Update.Test/Properties/AssemblyInfo.cs
+++ b/NzbDrone.Update.Test/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
diff --git a/NzbDrone.Update.Test/StartNzbDroneService.cs b/NzbDrone.Update.Test/StartNzbDroneService.cs
index 530819eff..26388b22b 100644
--- a/NzbDrone.Update.Test/StartNzbDroneService.cs
+++ b/NzbDrone.Update.Test/StartNzbDroneService.cs
@@ -1,7 +1,5 @@
using System;
using System.Diagnostics;
-using System.IO;
-using FluentAssertions;
using Moq;
using NUnit.Framework;
using NzbDrone.Common;
diff --git a/NzbDrone.Update/AppType.cs b/NzbDrone.Update/AppType.cs
index c7236a893..d83b457c1 100644
--- a/NzbDrone.Update/AppType.cs
+++ b/NzbDrone.Update/AppType.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace NzbDrone.Update
+namespace NzbDrone.Update
{
public enum AppType
{
diff --git a/NzbDrone.Update/UpdateContainerBuilder.cs b/NzbDrone.Update/UpdateContainerBuilder.cs
index a33956658..b60f6e0d9 100644
--- a/NzbDrone.Update/UpdateContainerBuilder.cs
+++ b/NzbDrone.Update/UpdateContainerBuilder.cs
@@ -1,5 +1,4 @@
-using NzbDrone.Common;
-using NzbDrone.Common.Composition;
+using NzbDrone.Common.Composition;
namespace NzbDrone.Update
{
diff --git a/NzbDrone.ncrunchsolution b/NzbDrone.ncrunchsolution
index c725a019c..444b34b1d 100644
--- a/NzbDrone.ncrunchsolution
+++ b/NzbDrone.ncrunchsolution
@@ -1,7 +1,8 @@
1
- True
+ False
true
+ true
UseDynamicAnalysis
Disabled
Disabled
diff --git a/NzbDrone/PriorityMonitor.cs b/NzbDrone/PriorityMonitor.cs
index 0d2f301c2..62718e984 100644
--- a/NzbDrone/PriorityMonitor.cs
+++ b/NzbDrone/PriorityMonitor.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using System;
+using System;
using System.Diagnostics;
using System.Threading;
using NLog;
diff --git a/NzbDrone/Router.cs b/NzbDrone/Router.cs
index f9c19f15a..ffede0c83 100644
--- a/NzbDrone/Router.cs
+++ b/NzbDrone/Router.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using NLog;
+using NLog;
using NzbDrone.Common;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.SysTray;
diff --git a/ServiceHelpers/ServiceInstall/Program.cs b/ServiceHelpers/ServiceInstall/Program.cs
index 816d1a231..02938247b 100644
--- a/ServiceHelpers/ServiceInstall/Program.cs
+++ b/ServiceHelpers/ServiceInstall/Program.cs
@@ -1,7 +1,4 @@
-using System.Linq;
-using System;
-
-namespace ServiceInstall
+namespace ServiceInstall
{
public static class Program
{
diff --git a/ServiceHelpers/ServiceInstall/ServiceHelper.cs b/ServiceHelpers/ServiceInstall/ServiceHelper.cs
index f43207427..e4b6b04a4 100644
--- a/ServiceHelpers/ServiceInstall/ServiceHelper.cs
+++ b/ServiceHelpers/ServiceInstall/ServiceHelper.cs
@@ -1,4 +1,3 @@
-using System.Linq;
using System;
using System.Diagnostics;
using System.IO;
diff --git a/ServiceHelpers/ServiceUninstall/Program.cs b/ServiceHelpers/ServiceUninstall/Program.cs
index 06f247102..c8bc4f181 100644
--- a/ServiceHelpers/ServiceUninstall/Program.cs
+++ b/ServiceHelpers/ServiceUninstall/Program.cs
@@ -1,6 +1,4 @@
-using System.Linq;
-
-namespace ServiceUninstall
+namespace ServiceUninstall
{
public static class Program
{
diff --git a/ServiceHelpers/ServiceUninstall/ServiceHelper.cs b/ServiceHelpers/ServiceUninstall/ServiceHelper.cs
index f8992f497..fe2457794 100644
--- a/ServiceHelpers/ServiceUninstall/ServiceHelper.cs
+++ b/ServiceHelpers/ServiceUninstall/ServiceHelper.cs
@@ -1,4 +1,3 @@
-using System.Linq;
using System;
using System.Diagnostics;
using System.IO;