diff --git a/Emby.Notifications/CoreNotificationTypes.cs b/Emby.Notifications/CoreNotificationTypes.cs
index 8cc14fa01..0f9fc08d9 100644
--- a/Emby.Notifications/CoreNotificationTypes.cs
+++ b/Emby.Notifications/CoreNotificationTypes.cs
@@ -11,101 +11,81 @@ namespace Emby.Notifications
     public class CoreNotificationTypes : INotificationTypeFactory
     {
         private readonly ILocalizationManager _localization;
-        private readonly IServerApplicationHost _appHost;
 
-        public CoreNotificationTypes(ILocalizationManager localization, IServerApplicationHost appHost)
+        public CoreNotificationTypes(ILocalizationManager localization)
         {
             _localization = localization;
-            _appHost = appHost;
         }
 
         public IEnumerable<NotificationTypeInfo> GetNotificationTypes()
         {
-            var knownTypes = new List<NotificationTypeInfo>
+            var knownTypes = new NotificationTypeInfo[]
             {
                 new NotificationTypeInfo
                 {
                      Type = NotificationType.ApplicationUpdateInstalled.ToString()
                 },
-
                 new NotificationTypeInfo
                 {
                      Type = NotificationType.InstallationFailed.ToString()
                 },
-
                 new NotificationTypeInfo
                 {
                      Type = NotificationType.PluginInstalled.ToString()
                 },
-
                 new NotificationTypeInfo
                 {
                      Type = NotificationType.PluginError.ToString()
                 },
-
                 new NotificationTypeInfo
                 {
                      Type = NotificationType.PluginUninstalled.ToString()
                 },
-
                 new NotificationTypeInfo
                 {
                      Type = NotificationType.PluginUpdateInstalled.ToString()
                 },
-
                 new NotificationTypeInfo
                 {
                      Type = NotificationType.ServerRestartRequired.ToString()
                 },
-
                 new NotificationTypeInfo
                 {
                      Type = NotificationType.TaskFailed.ToString()
                 },
-
                 new NotificationTypeInfo
                 {
                      Type = NotificationType.NewLibraryContent.ToString()
                 },
-
                 new NotificationTypeInfo
                 {
                      Type = NotificationType.AudioPlayback.ToString()
                 },
-
                 new NotificationTypeInfo
                 {
                      Type = NotificationType.VideoPlayback.ToString()
                 },
-
                 new NotificationTypeInfo
                 {
                      Type = NotificationType.AudioPlaybackStopped.ToString()
                 },
-
                 new NotificationTypeInfo
                 {
                      Type = NotificationType.VideoPlaybackStopped.ToString()
                 },
-
                 new NotificationTypeInfo
                 {
                      Type = NotificationType.CameraImageUploaded.ToString()
                 },
-
                 new NotificationTypeInfo
                 {
                      Type = NotificationType.UserLockedOut.ToString()
-                }
-            };
-
-            if (!_appHost.CanSelfUpdate)
-            {
-                knownTypes.Add(new NotificationTypeInfo
+                },
+                new NotificationTypeInfo
                 {
                     Type = NotificationType.ApplicationUpdateAvailable.ToString()
-                });
-            }
+                }
+            };
 
             foreach (var type in knownTypes)
             {
diff --git a/Emby.Notifications/Notifications.cs b/Emby.Notifications/Notifications.cs
index d3290479f..449331f9c 100644
--- a/Emby.Notifications/Notifications.cs
+++ b/Emby.Notifications/Notifications.cs
@@ -65,7 +65,7 @@ namespace Emby.Notifications
             _localization = localization;
             _activityManager = activityManager;
 
-            _coreNotificationTypes = new CoreNotificationTypes(localization, appHost).GetNotificationTypes().Select(i => i.Type).ToArray();
+            _coreNotificationTypes = new CoreNotificationTypes(localization).GetNotificationTypes().Select(i => i.Type).ToArray();
         }
 
         public Task RunAsync()
@@ -127,7 +127,7 @@ namespace Emby.Notifications
         async void _appHost_HasUpdateAvailableChanged(object sender, EventArgs e)
         {
             // This notification is for users who can't auto-update (aka running as service)
-            if (!_appHost.HasUpdateAvailable || _appHost.CanSelfUpdate)
+            if (!_appHost.HasUpdateAvailable)
             {
                 return;
             }
diff --git a/Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs b/Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs
index f26cc4f62..65cdccfa5 100644
--- a/Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs
+++ b/Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs
@@ -72,12 +72,6 @@ namespace Emby.Server.Implementations.AppBase
         /// <value>The plugin configurations path.</value>
         public string PluginConfigurationsPath => Path.Combine(PluginsPath, "configurations");
 
-        /// <summary>
-        /// Gets the path to where temporary update files will be stored
-        /// </summary>
-        /// <value>The plugin configurations path.</value>
-        public string TempUpdatePath => Path.Combine(ProgramDataPath, "updates");
-
         /// <summary>
         /// Gets the path to the log directory
         /// </summary>
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index ae020826d..fa8cc5c7e 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -123,12 +123,6 @@ namespace Emby.Server.Implementations
         /// <value><c>true</c> if this instance can self restart; otherwise, <c>false</c>.</value>
         public abstract bool CanSelfRestart { get; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance can self update.
-        /// </summary>
-        /// <value><c>true</c> if this instance can self update; otherwise, <c>false</c>.</value>
-        public virtual bool CanSelfUpdate => false;
-
         public virtual bool CanLaunchWebBrowser
         {
             get
@@ -1458,7 +1452,6 @@ namespace Emby.Server.Implementations
                 OperatingSystem = EnvironmentInfo.OperatingSystem.ToString(),
                 OperatingSystemDisplayName = EnvironmentInfo.OperatingSystemName,
                 CanSelfRestart = CanSelfRestart,
-                CanSelfUpdate = CanSelfUpdate,
                 CanLaunchWebBrowser = CanLaunchWebBrowser,
                 WanAddress = wanAddress,
                 HasUpdateAvailable = HasUpdateAvailable,
@@ -1757,21 +1750,6 @@ namespace Emby.Server.Implementations
             Plugins = list.ToArray();
         }
 
-        /// <summary>
-        /// Updates the application.
-        /// </summary>
-        /// <param name="package">The package that contains the update</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <param name="progress">The progress.</param>
-        public async Task UpdateApplication(PackageVersionInfo package, CancellationToken cancellationToken, IProgress<double> progress)
-        {
-            await InstallationManager.InstallPackage(package, false, progress, cancellationToken).ConfigureAwait(false);
-
-            HasUpdateAvailable = false;
-
-            OnApplicationUpdated(package);
-        }
-
         /// <summary>
         /// This returns localhost in the case of no external dns, and the hostname if the
         /// dns is prefixed with a valid Uri prefix.
diff --git a/MediaBrowser.Common/Configuration/IApplicationPaths.cs b/MediaBrowser.Common/Configuration/IApplicationPaths.cs
index 27092c0e1..cb4e8bf5f 100644
--- a/MediaBrowser.Common/Configuration/IApplicationPaths.cs
+++ b/MediaBrowser.Common/Configuration/IApplicationPaths.cs
@@ -41,12 +41,6 @@ namespace MediaBrowser.Common.Configuration
         /// <value>The plugin configurations path.</value>
         string PluginConfigurationsPath { get; }
 
-        /// <summary>
-        /// Gets the path to where temporary update files will be stored
-        /// </summary>
-        /// <value>The plugin configurations path.</value>
-        string TempUpdatePath { get; }
-
         /// <summary>
         /// Gets the path to the log directory
         /// </summary>
diff --git a/MediaBrowser.Common/IApplicationHost.cs b/MediaBrowser.Common/IApplicationHost.cs
index 6891152ee..3a4098612 100644
--- a/MediaBrowser.Common/IApplicationHost.cs
+++ b/MediaBrowser.Common/IApplicationHost.cs
@@ -72,12 +72,6 @@ namespace MediaBrowser.Common
         /// <value>The application user agent.</value>
         string ApplicationUserAgent { get; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance can self update.
-        /// </summary>
-        /// <value><c>true</c> if this instance can self update; otherwise, <c>false</c>.</value>
-        bool CanSelfUpdate { get; }
-
         /// <summary>
         /// Gets the exports.
         /// </summary>
@@ -86,12 +80,6 @@ namespace MediaBrowser.Common
         /// <returns>IEnumerable{``0}.</returns>
         IEnumerable<T> GetExports<T>(bool manageLifetime = true);
 
-        /// <summary>
-        /// Updates the application.
-        /// </summary>
-        /// <returns>Task.</returns>
-        Task UpdateApplication(PackageVersionInfo package, CancellationToken cancellationToken, IProgress<double> progress);
-
         /// <summary>
         /// Resolves this instance.
         /// </summary>
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index d9ed68b27..581a1069c 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -60,12 +60,6 @@ namespace MediaBrowser.Model.System
         /// <value><c>true</c> if this instance can self restart; otherwise, <c>false</c>.</value>
         public bool CanSelfRestart { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance can self update.
-        /// </summary>
-        /// <value><c>true</c> if this instance can self update; otherwise, <c>false</c>.</value>
-        public bool CanSelfUpdate { get; set; }
-
         public bool CanLaunchWebBrowser { get; set; }
 
         /// <summary>