diff --git a/NzbDrone.Host/Host/FirewallAdapter.cs b/NzbDrone.Host/AccessControl/FirewallAdapter.cs
similarity index 92%
rename from NzbDrone.Host/Host/FirewallAdapter.cs
rename to NzbDrone.Host/AccessControl/FirewallAdapter.cs
index 044ed12d3..96fb87679 100644
--- a/NzbDrone.Host/Host/FirewallAdapter.cs
+++ b/NzbDrone.Host/AccessControl/FirewallAdapter.cs
@@ -3,12 +3,11 @@ using NetFwTypeLib;
 using NLog;
 using NzbDrone.Core.Configuration;
 
-namespace NzbDrone.Host.Host
+namespace NzbDrone.Host.AccessControl
 {
     public interface IFirewallAdapter
     {
         void MakeAccessible();
-        bool IsNzbDronePortOpen();
     }
 
     public class FirewallAdapter : IFirewallAdapter
@@ -24,8 +23,6 @@ namespace NzbDrone.Host.Host
 
         public void MakeAccessible()
         {
-            int port = 0;
-
             if (IsFirewallEnabled())
             {
                 if (IsNzbDronePortOpen())
@@ -42,7 +39,7 @@ namespace NzbDrone.Host.Host
         }
 
 
-        public bool IsNzbDronePortOpen()
+        private bool IsNzbDronePortOpen()
         {
             try
             {
@@ -75,7 +72,7 @@ namespace NzbDrone.Host.Host
             try
             {
                 var type = Type.GetTypeFromProgID("HNetCfg.FWOpenPort", false);
-                var port = Activator.CreateInstance(type) as INetFwOpenPort;
+                var port = (INetFwOpenPort)Activator.CreateInstance(type);
 
                 port.Port = portNumber;
                 port.Name = "NzbDrone";
@@ -94,7 +91,7 @@ namespace NzbDrone.Host.Host
             }
         }
 
-        private int CloseFirewallPort()
+        private void CloseFirewallPort()
         {
             try
             {
@@ -116,14 +113,12 @@ namespace NzbDrone.Host.Host
                 if (portNumber != _configFileProvider.Port)
                 {
                     ports.Remove(portNumber, NET_FW_IP_PROTOCOL_.NET_FW_IP_PROTOCOL_TCP);
-                    return portNumber;
                 }
             }
             catch (Exception ex)
             {
                 _logger.WarnException("Failed to close port in firewall for NzbDrone", ex);
             }
-            return 0;
         }
 
         private bool IsFirewallEnabled()
diff --git a/NzbDrone.Host/Host/UrlAclAdapter.cs b/NzbDrone.Host/AccessControl/UrlAclAdapter.cs
similarity index 97%
rename from NzbDrone.Host/Host/UrlAclAdapter.cs
rename to NzbDrone.Host/AccessControl/UrlAclAdapter.cs
index ac9469690..03a0e6c8d 100644
--- a/NzbDrone.Host/Host/UrlAclAdapter.cs
+++ b/NzbDrone.Host/AccessControl/UrlAclAdapter.cs
@@ -4,7 +4,7 @@ using NzbDrone.Common;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Core.Configuration;
 
-namespace NzbDrone.Host.Host
+namespace NzbDrone.Host.AccessControl
 {
     public interface IUrlAclAdapter
     {
@@ -43,8 +43,6 @@ namespace NzbDrone.Host.Host
         {
             try
             {
-
-
                 var process = _processProvider.ShellExecute("netsh.exe", arguments);
                 process.WaitForExit(5000);
             }
diff --git a/NzbDrone.Host/ApplicationServer.cs b/NzbDrone.Host/ApplicationServer.cs
index f91720d68..089be7982 100644
--- a/NzbDrone.Host/ApplicationServer.cs
+++ b/NzbDrone.Host/ApplicationServer.cs
@@ -4,7 +4,7 @@ using NLog;
 using NzbDrone.Common;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Host.Host;
+using NzbDrone.Host.AccessControl;
 using NzbDrone.Host.Owin;
 
 namespace NzbDrone.Host
diff --git a/NzbDrone.Host/NzbDrone.Host.csproj b/NzbDrone.Host/NzbDrone.Host.csproj
index df614234b..025568f03 100644
--- a/NzbDrone.Host/NzbDrone.Host.csproj
+++ b/NzbDrone.Host/NzbDrone.Host.csproj
@@ -107,8 +107,8 @@
     <Compile Include="ApplicationServer.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Host\FirewallAdapter.cs" />
-    <Compile Include="Host\UrlAclAdapter.cs" />
+    <Compile Include="AccessControl\FirewallAdapter.cs" />
+    <Compile Include="AccessControl\UrlAclAdapter.cs" />
     <Compile Include="MainAppContainerBuilder.cs" />
     <Compile Include="ApplicationModes.cs" />
     <Compile Include="Bootstrap.cs" />
diff --git a/NzbDrone/NzbDrone.csproj b/NzbDrone/NzbDrone.csproj
index dd99af137..6bf15cf39 100644
--- a/NzbDrone/NzbDrone.csproj
+++ b/NzbDrone/NzbDrone.csproj
@@ -121,9 +121,6 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\NzbDroneIcon.bmp" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>
diff --git a/NzbDrone/Resources/NzbDroneIcon.bmp b/NzbDrone/Resources/NzbDroneIcon.bmp
deleted file mode 100644
index 55516c7aa..000000000
Binary files a/NzbDrone/Resources/NzbDroneIcon.bmp and /dev/null differ