3 files changed, 7 insertions, 33 deletions
diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs
deleted file mode 100644
index 37a1648c1..000000000
--- a/MediaBrowser.Controller/Kernel.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using MediaBrowser.Controller.MediaInfo;
-
-namespace MediaBrowser.Controller
-{
-    /// <summary>
-    /// Class Kernel
-    /// </summary>
-    public class Kernel 
-    {
-        /// <summary>
-        /// Gets the instance.
-        /// </summary>
-        /// <value>The instance.</value>
-        public static Kernel Instance { get; private set; }
-
-        /// <summary>
-        /// Gets the FFMPEG controller.
-        /// </summary>
-        /// <value>The FFMPEG controller.</value>
-        public FFMpegManager FFMpegManager { get; set; }
-
-        /// <summary>
-        /// Creates a kernel based on a Data path, which is akin to our current programdata path
-        /// </summary>
-        public Kernel()
-        {
-            Instance = this;
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index df108b590..705a0ea68 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -188,7 +188,6 @@
     <Compile Include="Library\TVUtils.cs" />
     <Compile Include="Library\ItemResolveArgs.cs" />
     <Compile Include="IO\FileData.cs" />
-    <Compile Include="Kernel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Providers\BaseMetadataProvider.cs" />
     <Compile Include="Session\ISessionController.cs" />
diff --git a/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs b/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs
index 445eb9fa5..380a96387 100644
--- a/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs
+++ b/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs
@@ -1,5 +1,4 @@
-using System.Globalization;
-using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Common.MediaInfo;
 using MediaBrowser.Controller.Entities;
@@ -8,6 +7,7 @@ using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -27,6 +27,8 @@ namespace MediaBrowser.Controller.MediaInfo
 
         private readonly IFileSystem _fileSystem;
 
+        public static FFMpegManager Instance { get; private set; }
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="FFMpegManager" /> class.
         /// </summary>
@@ -42,6 +44,9 @@ namespace MediaBrowser.Controller.MediaInfo
             _logger = logger;
             _itemRepo = itemRepo;
             _fileSystem = fileSystem;
+
+            // TODO: Remove this static instance
+            Instance = this;
         }
 
         /// <summary>