3 files changed, 1 insertions, 25 deletions
diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs
index a5a9b46ec..50dca1e4c 100644
--- a/MediaBrowser.Common/Kernel/BaseKernel.cs
+++ b/MediaBrowser.Common/Kernel/BaseKernel.cs
@@ -172,12 +172,6 @@ namespace MediaBrowser.Common.Kernel
         public IEnumerable<IWebSocketListener> WebSocketListeners { get; private set; }
 
         /// <summary>
-        /// The _HTTP manager
-        /// </summary>
-        /// <value>The HTTP manager.</value>
-        public HttpManager HttpManager { get; private set; }
-
-        /// <summary>
         /// Gets or sets the TCP manager.
         /// </summary>
         /// <value>The TCP manager.</value>
@@ -323,9 +317,6 @@ namespace MediaBrowser.Common.Kernel
 
             Logger.Info("Version {0} initializing", ApplicationVersion);
 
-            DisposeHttpManager();
-            HttpManager = new HttpManager(this, Logger);
-
             await OnConfigurationLoaded().ConfigureAwait(false);
 
             FindParts();
@@ -422,7 +413,6 @@ namespace MediaBrowser.Common.Kernel
             if (dispose)
             {
                 DisposeTcpManager();
-                DisposeHttpManager();
             }
         }
 
@@ -439,18 +429,6 @@ namespace MediaBrowser.Common.Kernel
         }
 
         /// <summary>
-        /// Disposes the HTTP manager.
-        /// </summary>
-        private void DisposeHttpManager()
-        {
-            if (HttpManager != null)
-            {
-                HttpManager.Dispose();
-                HttpManager = null;
-            }
-        }
-
-        /// <summary>
         /// Gets the current application version
         /// </summary>
         /// <value>The application version.</value>
diff --git a/MediaBrowser.Common/Kernel/BasePeriodicWebSocketListener.cs b/MediaBrowser.Common/Kernel/BasePeriodicWebSocketListener.cs
index 0f20758d4..5374bb714 100644
--- a/MediaBrowser.Common/Kernel/BasePeriodicWebSocketListener.cs
+++ b/MediaBrowser.Common/Kernel/BasePeriodicWebSocketListener.cs
@@ -3,7 +3,6 @@ using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net.WebSockets;
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/MediaBrowser.Common/Kernel/TcpManager.cs b/MediaBrowser.Common/Kernel/TcpManager.cs
index c04b77599..6ea390904 100644
--- a/MediaBrowser.Common/Kernel/TcpManager.cs
+++ b/MediaBrowser.Common/Kernel/TcpManager.cs
@@ -8,7 +8,6 @@ using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Sockets;
-using System.Net.WebSockets;
 using System.Reflection;
 using System.Text;
 using System.Threading;
@@ -39,7 +38,7 @@ namespace MediaBrowser.Common.Kernel
         /// Gets or sets the json serializer.
         /// </summary>
         /// <value>The json serializer.</value>
-        private IJsonSerializer _jsonSerializer;
+        private readonly IJsonSerializer _jsonSerializer;
         
         /// <summary>
         /// This subscribes to HttpListener requests and finds the appropriate BaseHandler to process it