diff --git a/src/Brutal.Dev.StrongNameSigner.Console/LogLevel.cs b/src/Brutal.Dev.StrongNameSigner.Console/LogLevel.cs
index bdc5a63..fa966d6 100644
--- a/src/Brutal.Dev.StrongNameSigner.Console/LogLevel.cs
+++ b/src/Brutal.Dev.StrongNameSigner.Console/LogLevel.cs
@@ -1,6 +1,4 @@
-using System.ComponentModel;
-
-namespace Brutal.Dev.StrongNameSigner.Console
+namespace Brutal.Dev.StrongNameSigner.Console
 {
   internal enum LogLevel
   {
diff --git a/src/Brutal.Dev.StrongNameSigner.Console/Options.cs b/src/Brutal.Dev.StrongNameSigner.Console/Options.cs
index 3407ef9..a54e35a 100644
--- a/src/Brutal.Dev.StrongNameSigner.Console/Options.cs
+++ b/src/Brutal.Dev.StrongNameSigner.Console/Options.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
 using PowerArgs;
 
 namespace Brutal.Dev.StrongNameSigner.Console
diff --git a/src/Brutal.Dev.StrongNameSigner.Docs/Documentation.shfbproj b/src/Brutal.Dev.StrongNameSigner.Docs/Documentation.shfbproj
index f72f25a..47bcd90 100644
--- a/src/Brutal.Dev.StrongNameSigner.Docs/Documentation.shfbproj
+++ b/src/Brutal.Dev.StrongNameSigner.Docs/Documentation.shfbproj
@@ -75,4 +75,4 @@
   </PropertyGroup>
   <!-- Import the SHFB build targets -->
   <Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Brutal.Dev.StrongNameSigner.TestAssembly.A/A.cs b/src/Brutal.Dev.StrongNameSigner.TestAssembly.A/A.cs
index e5b12e2..e8f1d74 100644
--- a/src/Brutal.Dev.StrongNameSigner.TestAssembly.A/A.cs
+++ b/src/Brutal.Dev.StrongNameSigner.TestAssembly.A/A.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Brutal.Dev.StrongNameSigner.TestAssembly.A
+namespace Brutal.Dev.StrongNameSigner.TestAssembly.A
 {
   public class A
   {
diff --git a/src/Brutal.Dev.StrongNameSigner.TestAssembly.A/Properties/AssemblyInfo.cs b/src/Brutal.Dev.StrongNameSigner.TestAssembly.A/Properties/AssemblyInfo.cs
index 699ad20..f5ed35c 100644
--- a/src/Brutal.Dev.StrongNameSigner.TestAssembly.A/Properties/AssemblyInfo.cs
+++ b/src/Brutal.Dev.StrongNameSigner.TestAssembly.A/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/src/Brutal.Dev.StrongNameSigner.TestAssembly.B/B.cs b/src/Brutal.Dev.StrongNameSigner.TestAssembly.B/B.cs
index 1d168d9..b699322 100644
--- a/src/Brutal.Dev.StrongNameSigner.TestAssembly.B/B.cs
+++ b/src/Brutal.Dev.StrongNameSigner.TestAssembly.B/B.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Brutal.Dev.StrongNameSigner.TestAssembly.B
+namespace Brutal.Dev.StrongNameSigner.TestAssembly.B
 {
   public class B
   {
diff --git a/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET20/Form1.cs b/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET20/Form1.cs
index 79bbc05..462138c 100644
--- a/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET20/Form1.cs
+++ b/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET20/Form1.cs
@@ -1,11 +1,6 @@
-using Brutal.Dev.StrongNameSigner.TestAssembly.Properties;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
+using System;
 using System.Windows.Forms;
+using Brutal.Dev.StrongNameSigner.TestAssembly.Properties;
 
 namespace Brutal.Dev.StrongNameSigner.TestAssembly
 {
diff --git a/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET20/Program.cs b/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET20/Program.cs
index 7dca78e..4779537 100644
--- a/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET20/Program.cs
+++ b/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET20/Program.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Configuration;
 using System.Windows.Forms;
 
diff --git a/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET20/Properties/AssemblyInfo.cs b/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET20/Properties/AssemblyInfo.cs
index fcda672..6e23157 100644
--- a/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET20/Properties/AssemblyInfo.cs
+++ b/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET20/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/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET40/Form1.cs b/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET40/Form1.cs
index 79bbc05..462138c 100644
--- a/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET40/Form1.cs
+++ b/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET40/Form1.cs
@@ -1,11 +1,6 @@
-using Brutal.Dev.StrongNameSigner.TestAssembly.Properties;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
+using System;
 using System.Windows.Forms;
+using Brutal.Dev.StrongNameSigner.TestAssembly.Properties;
 
 namespace Brutal.Dev.StrongNameSigner.TestAssembly
 {
diff --git a/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET40/Program.cs b/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET40/Program.cs
index 811c683..53c5e3f 100644
--- a/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET40/Program.cs
+++ b/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET40/Program.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Configuration;
 using System.Windows.Forms;
 
diff --git a/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET40/Properties/AssemblyInfo.cs b/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET40/Properties/AssemblyInfo.cs
index fcda672..6e23157 100644
--- a/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET40/Properties/AssemblyInfo.cs
+++ b/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET40/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/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET45/Form1.cs b/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET45/Form1.cs
index d97460e..f283edc 100644
--- a/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET45/Form1.cs
+++ b/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET45/Form1.cs
@@ -1,13 +1,6 @@
-using Brutal.Dev.StrongNameSigner.TestAssembly.NET45.Properties;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System;
 using System.Windows.Forms;
+using Brutal.Dev.StrongNameSigner.TestAssembly.NET45.Properties;
 
 namespace Brutal.Dev.StrongNameSigner.TestAssembly.NET45
 {
diff --git a/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET45/Program.cs b/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET45/Program.cs
index 92addd0..2b575c0 100644
--- a/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET45/Program.cs
+++ b/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET45/Program.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Configuration;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Brutal.Dev.StrongNameSigner.TestAssembly.NET45
diff --git a/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET45/Properties/AssemblyInfo.cs b/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET45/Properties/AssemblyInfo.cs
index 7e56da1..2d173d8 100644
--- a/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET45/Properties/AssemblyInfo.cs
+++ b/src/Brutal.Dev.StrongNameSigner.TestAssembly.NET45/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/src/Brutal.Dev.StrongNameSigner.Tests/Brutal.Dev.StrongNameSigner.Tests.csproj b/src/Brutal.Dev.StrongNameSigner.Tests/Brutal.Dev.StrongNameSigner.Tests.csproj
index 4efe2bc..78ef40d 100644
--- a/src/Brutal.Dev.StrongNameSigner.Tests/Brutal.Dev.StrongNameSigner.Tests.csproj
+++ b/src/Brutal.Dev.StrongNameSigner.Tests/Brutal.Dev.StrongNameSigner.Tests.csproj
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\Shouldly.4.0.3\build\Shouldly.props" Condition="Exists('..\..\packages\Shouldly.4.0.3\build\Shouldly.props')" />
+  <Import Project="..\..\packages\NUnit.3.13.1\build\NUnit.props" Condition="Exists('..\..\packages\NUnit.3.13.1\build\NUnit.props')" />
   <Import Project="..\..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props')" />
-  <Import Project="..\..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\..\packages\NUnit.3.12.0\build\NUnit.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -50,11 +51,9 @@
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Microsoft.Build.Utilities.v4.0" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.3.12.0\lib\net40\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Shouldly, Version=3.0.2.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Shouldly.3.0.2\lib\net40\Shouldly.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.13.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NUnit.3.13.1\lib\net40\nunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -198,9 +197,10 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit.3.12.0\build\NUnit.props'))" />
     <Error Condition="!Exists('..\..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props'))" />
     <Error Condition="!Exists('..\..\packages\Shouldly.4.0.0\build\Shouldly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Shouldly.4.0.0\build\Shouldly.targets'))" />
+    <Error Condition="!Exists('..\..\packages\NUnit.3.13.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit.3.13.1\build\NUnit.props'))" />
+    <Error Condition="!Exists('..\..\packages\Shouldly.4.0.3\build\Shouldly.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Shouldly.4.0.3\build\Shouldly.props'))" />
   </Target>
   <Import Project="..\..\packages\Shouldly.4.0.0\build\Shouldly.targets" Condition="Exists('..\..\packages\Shouldly.4.0.0\build\Shouldly.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Brutal.Dev.StrongNameSigner.Tests/Properties/AssemblyInfo.cs b/src/Brutal.Dev.StrongNameSigner.Tests/Properties/AssemblyInfo.cs
index c3455e8..6cea959 100644
--- a/src/Brutal.Dev.StrongNameSigner.Tests/Properties/AssemblyInfo.cs
+++ b/src/Brutal.Dev.StrongNameSigner.Tests/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/src/Brutal.Dev.StrongNameSigner.Tests/packages.config b/src/Brutal.Dev.StrongNameSigner.Tests/packages.config
index 0b819d9..6430ef1 100644
--- a/src/Brutal.Dev.StrongNameSigner.Tests/packages.config
+++ b/src/Brutal.Dev.StrongNameSigner.Tests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.12.0" targetFramework="net40" />
+  <package id="NUnit" version="3.13.1" targetFramework="net40" />
   <package id="NUnit3TestAdapter" version="3.17.0" targetFramework="net40" />
-  <package id="Shouldly" version="3.0.2" targetFramework="net40" />
+  <package id="Shouldly" version="4.0.3" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/src/Brutal.Dev.StrongNameSigner.UI/AssemblyPair.cs b/src/Brutal.Dev.StrongNameSigner.UI/AssemblyPair.cs
index a7eff31..39bf607 100644
--- a/src/Brutal.Dev.StrongNameSigner.UI/AssemblyPair.cs
+++ b/src/Brutal.Dev.StrongNameSigner.UI/AssemblyPair.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Brutal.Dev.StrongNameSigner.UI
+namespace Brutal.Dev.StrongNameSigner.UI
 {
   internal class AssemblyPair
   {
diff --git a/src/Brutal.Dev.StrongNameSigner.UI/OutputForm.cs b/src/Brutal.Dev.StrongNameSigner.UI/OutputForm.cs
index 2ce8f99..d386dbc 100644
--- a/src/Brutal.Dev.StrongNameSigner.UI/OutputForm.cs
+++ b/src/Brutal.Dev.StrongNameSigner.UI/OutputForm.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
+using System.Windows.Forms;
 
 namespace Brutal.Dev.StrongNameSigner.UI
 {
diff --git a/src/Brutal.Dev.StrongNameSigner.UI/Program.cs b/src/Brutal.Dev.StrongNameSigner.UI/Program.cs
index e5768c6..20a49f6 100644
--- a/src/Brutal.Dev.StrongNameSigner.UI/Program.cs
+++ b/src/Brutal.Dev.StrongNameSigner.UI/Program.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Windows.Forms;
 
 namespace Brutal.Dev.StrongNameSigner.UI
diff --git a/src/Brutal.Dev.StrongNameSigner/AssemblyInfo.cs b/src/Brutal.Dev.StrongNameSigner/AssemblyInfo.cs
index 2f68acd..8b7cf74 100644
--- a/src/Brutal.Dev.StrongNameSigner/AssemblyInfo.cs
+++ b/src/Brutal.Dev.StrongNameSigner/AssemblyInfo.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text;
 
 namespace Brutal.Dev.StrongNameSigner
 {
diff --git a/src/Brutal.Dev.StrongNameSigner/Brutal.Dev.StrongNameSigner.csproj b/src/Brutal.Dev.StrongNameSigner/Brutal.Dev.StrongNameSigner.csproj
index 9f0574e..00657f6 100644
--- a/src/Brutal.Dev.StrongNameSigner/Brutal.Dev.StrongNameSigner.csproj
+++ b/src/Brutal.Dev.StrongNameSigner/Brutal.Dev.StrongNameSigner.csproj
@@ -36,7 +36,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Release\Brutal.Dev.StrongNameSigner.XML</DocumentationFile>
   </PropertyGroup>
diff --git a/src/Brutal.Dev.StrongNameSigner/OutputFileManager.cs b/src/Brutal.Dev.StrongNameSigner/OutputFileManager.cs
index 9a9b222..3947a91 100644
--- a/src/Brutal.Dev.StrongNameSigner/OutputFileManager.cs
+++ b/src/Brutal.Dev.StrongNameSigner/OutputFileManager.cs
@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
-using System.Text;
 
 namespace Brutal.Dev.StrongNameSigner
 {