diff --git a/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs b/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs
index f55da91a8..fdf2a3b73 100644
--- a/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs
+++ b/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs
@@ -97,7 +97,7 @@ namespace Emby.Server.Implementations.AppBase
         /// Initializes a new instance of the <see cref="BaseConfigurationManager" /> class.
         /// </summary>
         /// <param name="applicationPaths">The application paths.</param>
-        /// <param name="logManager">The log manager.</param>
+        /// <param name="loggerFactory">The logger factory.</param>
         /// <param name="xmlSerializer">The XML serializer.</param>
         protected BaseConfigurationManager(IApplicationPaths applicationPaths, ILoggerFactory loggerFactory, IXmlSerializer xmlSerializer, IFileSystem fileSystem)
         {
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 042e48e58..aa9b6e82a 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -693,7 +693,7 @@ namespace Emby.Server.Implementations
 
             return parts;
         }
-        /*/
+        /*
         private void SetBaseExceptionMessage()
         {
             var builder = GetBaseExceptionMessage(ApplicationPaths);
@@ -799,13 +799,9 @@ namespace Emby.Server.Implementations
             }
 
             JsonSerializer = CreateJsonSerializer();
-            /*
-            OnLoggerLoaded(true);
-            LoggerFactory.LoggerLoaded += (s, e) => OnLoggerLoaded(false);
 
-            LoggerFactory.LogSeverity = ConfigurationManager.CommonConfiguration.EnableDebugLevelLogging
-                ? LogSeverity.Debug
-                : LogSeverity.Info;*/
+            OnLoggerLoaded(true);
+            //LoggerFactory.LoggerLoaded += (s, e) => OnLoggerLoaded(false);
 
             DiscoverTypes();
 
@@ -815,7 +811,7 @@ namespace Emby.Server.Implementations
 
             FindParts();
         }
-        /*
+
         protected virtual void OnLoggerLoaded(bool isFirstLoad)
         {
             Logger.LogInformation("Application version: {0}", ApplicationVersion);
@@ -834,9 +830,9 @@ namespace Emby.Server.Implementations
                     pluginBuilder.AppendLine(string.Format("{0} {1}", plugin.Name, plugin.Version));
                 }
 
-                Logger.LogMultiline("Plugins:", LogSeverity.Info, pluginBuilder);
+                Logger.LogInformation("Plugins: {plugins}", pluginBuilder.ToString());
             }
-        }*/
+        }
 
         protected virtual IHttpClient CreateHttpClient()
         {
diff --git a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
index b5b0101cb..f84735bed 100644
--- a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
@@ -9,6 +9,7 @@ namespace MediaBrowser.Model.Configuration
     /// </summary>
     public class BaseApplicationConfiguration
     {
+        // TODO: @bond Remove?
         /// <summary>
         /// Gets or sets a value indicating whether [enable debug level logging].
         /// </summary>
@@ -21,6 +22,7 @@ namespace MediaBrowser.Model.Configuration
         /// <value><c>true</c> if [enable auto update]; otherwise, <c>false</c>.</value>
         public bool EnableAutoUpdate { get; set; }
 
+        // TODO: @bond Remove?
         /// <summary>
         /// The number of days we should retain log files
         /// </summary>
diff --git a/MediaBrowser.Server.Mono/Program.cs b/MediaBrowser.Server.Mono/Program.cs
index 32953e89d..9c6ee4dd2 100644
--- a/MediaBrowser.Server.Mono/Program.cs
+++ b/MediaBrowser.Server.Mono/Program.cs
@@ -137,13 +137,14 @@ namespace MediaBrowser.Server.Mono
                     return;
                 }
 
-                Console.WriteLine("appHost.Init");
+                //Console.WriteLine("appHost.Init");
 
                 appHost.Init();
 
                 appHost.ImageProcessor.ImageEncoder = ImageEncoderHelper.GetImageEncoder(_logger, fileSystem, options, () => appHost.HttpClient, appPaths, environmentInfo, appHost.LocalizationManager);
 
-                Console.WriteLine("Running startup tasks");
+                //Console.WriteLine("Running startup tasks");
+                _logger.LogInformation("Running startup tasks");
 
                 var task = appHost.RunStartupTasks();
                 Task.WaitAll(task);
@@ -291,10 +292,12 @@ namespace MediaBrowser.Server.Mono
         {
             var exception = (Exception)e.ExceptionObject;
 
-            // TODO
-            /*
-            new UnhandledExceptionWriter(_appPaths, _logger, _logManager, FileSystem, new ConsoleLogger()).Log(exception);
+            //new UnhandledExceptionWriter(_appPaths, _logger, _logManager, FileSystem, new ConsoleLogger()).Log(exception);
 
+            _logger.LogCritical(exception, "Unhandled Exception");
+
+            // TODO: @bond
+            /*
             if (!Debugger.IsAttached)
             {
                 var message = LogHelper.GetLogMessage(exception).ToString();
@@ -304,7 +307,8 @@ namespace MediaBrowser.Server.Mono
                 {
                     Environment.Exit(System.Runtime.InteropServices.Marshal.GetHRForException(exception));
                 }
-            }*/
+            }
+            */
         }
 
         public static void Shutdown()