diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
index 0d261bdb8b..f23d859e8f 100644
--- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
+++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
@@ -339,6 +339,15 @@ namespace MediaBrowser.Common.Implementations
             }
         }
 
+        /// <summary>
+        /// Configures the auto run at startup.
+        /// </summary>
+        /// <param name="autorun">if set to <c>true</c> [autorun].</param>
+        public void ConfigureAutoRunAtStartup(bool autorun)
+        {
+            
+        }
+
         /// <summary>
         /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
diff --git a/MediaBrowser.Common/Kernel/IApplicationHost.cs b/MediaBrowser.Common/Kernel/IApplicationHost.cs
index 42ba2fbbb2..2d2d0a2177 100644
--- a/MediaBrowser.Common/Kernel/IApplicationHost.cs
+++ b/MediaBrowser.Common/Kernel/IApplicationHost.cs
@@ -16,6 +16,12 @@ namespace MediaBrowser.Common.Kernel
         /// </summary>
         void Restart();
 
+        /// <summary>
+        /// Configures the auto run at startup.
+        /// </summary>
+        /// <param name="autorun">if set to <c>true</c> [autorun].</param>
+        void ConfigureAutoRunAtStartup(bool autorun);
+
         /// <summary>
         /// Gets the application version.
         /// </summary>
diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs
index ea4f03330d..cb37b81458 100644
--- a/MediaBrowser.Controller/Library/IUserManager.cs
+++ b/MediaBrowser.Controller/Library/IUserManager.cs
@@ -74,12 +74,6 @@ namespace MediaBrowser.Controller.Library
         /// <exception cref="System.ArgumentNullException">user</exception>
         Task LogUserActivity(User user, ClientType clientType, string deviceName);
 
-        /// <summary>
-        /// Loads the users from the repository
-        /// </summary>
-        /// <returns>IEnumerable{User}.</returns>
-        IEnumerable<User> LoadUsers();
-
         /// <summary>
         /// Refreshes metadata for each user
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index 5ea955facb..b8b3fc82e2 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -296,7 +296,7 @@ namespace MediaBrowser.Server.Implementations.Library
         /// Loads the users from the repository
         /// </summary>
         /// <returns>IEnumerable{User}.</returns>
-        public IEnumerable<User> LoadUsers()
+        private IEnumerable<User> LoadUsers()
         {
             var users = Kernel.UserRepository.RetrieveAllUsers().ToList();
 
diff --git a/MediaBrowser.Server.Uninstall/App.config b/MediaBrowser.Server.Uninstall/App.config
deleted file mode 100644
index 8e15646352..0000000000
--- a/MediaBrowser.Server.Uninstall/App.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-    </startup>
-</configuration>
\ No newline at end of file
diff --git a/MediaBrowser.Server.Uninstall/Globals.cs b/MediaBrowser.Server.Uninstall/Globals.cs
deleted file mode 100644
index 098420ccb0..0000000000
--- a/MediaBrowser.Server.Uninstall/Globals.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-
-namespace MediaBrowser.Server.Uninstall
-{
-    /// <summary>
-    /// Class Globals
-    /// </summary>
-    public static class Globals
-    {
-        /// <summary>
-        /// The product name
-        /// </summary>
-        public static string ProductName = "Media Browser Server";
-
-        /// <summary>
-        /// The suite name
-        /// </summary>
-        public static string SuiteName = "Media Browser 3";
-
-        /// <summary>
-        /// The publisher name
-        /// </summary>
-        public static string PublisherName = "Media Browser Team";
-    }
-}
diff --git a/MediaBrowser.Server.Uninstall/MediaBrowser.Server.Uninstall.csproj b/MediaBrowser.Server.Uninstall/MediaBrowser.Server.Uninstall.csproj
deleted file mode 100644
index 23afb746f4..0000000000
--- a/MediaBrowser.Server.Uninstall/MediaBrowser.Server.Uninstall.csproj
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{5443422F-9548-417A-90DD-2FC91F2B5999}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MediaBrowser.Server.Uninstall</RootNamespace>
-    <AssemblyName>MediaBrowser.Server.Uninstall</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <NoWin32Manifest>true</NoWin32Manifest>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs">
-      <Link>Properties\SharedVersion.cs</Link>
-    </Compile>
-    <Compile Include="Globals.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.ClickOnce\MediaBrowser.ClickOnce.csproj">
-      <Project>{cc96bf3e-0bda-4809-bc4b-bb6d418f4a84}</Project>
-      <Name>MediaBrowser.ClickOnce</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/MediaBrowser.Server.Uninstall/Program.cs b/MediaBrowser.Server.Uninstall/Program.cs
deleted file mode 100644
index 4374e970cd..0000000000
--- a/MediaBrowser.Server.Uninstall/Program.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using MediaBrowser.ClickOnce;
-using System;
-using System.IO;
-
-namespace MediaBrowser.Server.Uninstall
-{
-    /// <summary>
-    /// Class Program
-    /// </summary>
-    class Program
-    {
-        /// <summary>
-        /// Defines the entry point of the application.
-        /// </summary>
-        /// <param name="args">The args.</param>
-        static void Main(string[] args)
-        {
-            new ClickOnceHelper(Globals.PublisherName, Globals.ProductName, Globals.SuiteName).Uninstall();
-
-            // Delete all files from publisher folder and folder itself on uninstall
-            
-            var publisherFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), Globals.PublisherName);
-            
-            if (Directory.Exists(publisherFolder))
-            {
-                Directory.Delete(publisherFolder, true);
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Uninstall/Properties/AssemblyInfo.cs b/MediaBrowser.Server.Uninstall/Properties/AssemblyInfo.cs
deleted file mode 100644
index 14e0dd778f..0000000000
--- a/MediaBrowser.Server.Uninstall/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("MediaBrowser.Server.Uninstall")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("MediaBrowser.Server.Uninstall")]
-[assembly: AssemblyCopyright("Copyright ©  2013")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("468efe03-708c-4b38-b663-54f80b2edf83")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
\ No newline at end of file
diff --git a/MediaBrowser.ServerApplication/App.xaml.cs b/MediaBrowser.ServerApplication/App.xaml.cs
index 81ea869b83..e9baa96e7f 100644
--- a/MediaBrowser.ServerApplication/App.xaml.cs
+++ b/MediaBrowser.ServerApplication/App.xaml.cs
@@ -3,11 +3,9 @@ using MediaBrowser.Common.Kernel;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Logging;
-using MediaBrowser.Server.Uninstall;
 using Microsoft.Win32;
 using System;
 using System.Diagnostics;
-using System.Linq;
 using System.Net.Cache;
 using System.Threading;
 using System.Threading.Tasks;
@@ -78,33 +76,6 @@ namespace MediaBrowser.ServerApplication
             InitializeComponent();
         }
 
-        /// <summary>
-        /// Gets the name of the product.
-        /// </summary>
-        /// <value>The name of the product.</value>
-        protected string ProductName
-        {
-            get { return Globals.ProductName; }
-        }
-
-        /// <summary>
-        /// Gets the name of the publisher.
-        /// </summary>
-        /// <value>The name of the publisher.</value>
-        protected string PublisherName
-        {
-            get { return Globals.PublisherName; }
-        }
-
-        /// <summary>
-        /// Gets the name of the suite.
-        /// </summary>
-        /// <value>The name of the suite.</value>
-        protected string SuiteName
-        {
-            get { return Globals.SuiteName; }
-        }
-
         /// <summary>
         /// Gets the name of the uninstaller file.
         /// </summary>
@@ -212,7 +183,7 @@ namespace MediaBrowser.ServerApplication
             {
                 Kernel.ConfigurationUpdated += Kernel_ConfigurationUpdated;
 
-                ConfigureClickOnceStartup();
+                ConfigureAutoRun();
             });
         }
 
@@ -225,25 +196,16 @@ namespace MediaBrowser.ServerApplication
         {
             if (!LastRunAtStartupValue.HasValue || LastRunAtStartupValue.Value != Kernel.Configuration.RunAtStartup)
             {
-                ConfigureClickOnceStartup();
+                ConfigureAutoRun();
             }
         }
 
         /// <summary>
         /// Configures the click once startup.
         /// </summary>
-        private void ConfigureClickOnceStartup()
+        private void ConfigureAutoRun()
         {
-            try
-            {
-                ClickOnceHelper.ConfigureClickOnceStartupIfInstalled(PublisherName, ProductName, SuiteName, Kernel.Configuration.RunAtStartup, UninstallerFileName);
-
-                LastRunAtStartupValue = Kernel.Configuration.RunAtStartup;
-            }
-            catch (Exception ex)
-            {
-                Logger.ErrorException("Error configuring ClickOnce", ex);
-            }
+            CompositionRoot.ConfigureAutoRunAtStartup(Kernel.Configuration.RunAtStartup);
         }
 
         /// <summary>
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index 51ee731f07..30f9565025 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -286,10 +286,6 @@
       <Project>{2e781478-814d-4a48-9d80-bff206441a65}</Project>
       <Name>MediaBrowser.Server.Implementations</Name>
     </ProjectReference>
-    <ProjectReference Include="..\MediaBrowser.Server.Uninstall\MediaBrowser.Server.Uninstall.csproj">
-      <Project>{5443422f-9548-417a-90dd-2fc91f2b5999}</Project>
-      <Name>MediaBrowser.Server.Uninstall</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Images\icon.ico" />
diff --git a/MediaBrowser.sln b/MediaBrowser.sln
index 0b68f6c77a..377c081b56 100644
--- a/MediaBrowser.sln
+++ b/MediaBrowser.sln
@@ -24,8 +24,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.ApiInteraction
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.ApiInteraction.Portable", "MediaBrowser.ApiInteraction.Portable\MediaBrowser.ApiInteraction.Portable.csproj", "{52E0C440-85C0-4A99-ACFE-07C87B2600BE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Server.Uninstall", "MediaBrowser.Server.Uninstall\MediaBrowser.Server.Uninstall.csproj", "{5443422F-9548-417A-90DD-2FC91F2B5999}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget (2)", ".nuget (2)", "{E60FB157-87E2-4A41-8B04-27EA49B63B4D}"
 	ProjectSection(SolutionItems) = preProject
 		.nuget\NuGet.Config = .nuget\NuGet.Config
@@ -189,21 +187,6 @@ Global
 		{52E0C440-85C0-4A99-ACFE-07C87B2600BE}.Release|Win32.ActiveCfg = Release|Any CPU
 		{52E0C440-85C0-4A99-ACFE-07C87B2600BE}.Release|x64.ActiveCfg = Release|Any CPU
 		{52E0C440-85C0-4A99-ACFE-07C87B2600BE}.Release|x86.ActiveCfg = Release|Any CPU
-		{5443422F-9548-417A-90DD-2FC91F2B5999}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5443422F-9548-417A-90DD-2FC91F2B5999}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5443422F-9548-417A-90DD-2FC91F2B5999}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5443422F-9548-417A-90DD-2FC91F2B5999}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5443422F-9548-417A-90DD-2FC91F2B5999}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{5443422F-9548-417A-90DD-2FC91F2B5999}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5443422F-9548-417A-90DD-2FC91F2B5999}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5443422F-9548-417A-90DD-2FC91F2B5999}.Debug|x86.Build.0 = Debug|Any CPU
-		{5443422F-9548-417A-90DD-2FC91F2B5999}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5443422F-9548-417A-90DD-2FC91F2B5999}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5443422F-9548-417A-90DD-2FC91F2B5999}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{5443422F-9548-417A-90DD-2FC91F2B5999}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{5443422F-9548-417A-90DD-2FC91F2B5999}.Release|Win32.ActiveCfg = Release|Any CPU
-		{5443422F-9548-417A-90DD-2FC91F2B5999}.Release|x64.ActiveCfg = Release|Any CPU
-		{5443422F-9548-417A-90DD-2FC91F2B5999}.Release|x86.ActiveCfg = Release|Any CPU
 		{07B509C0-0C28-4F3F-8963-5263281F7E3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{07B509C0-0C28-4F3F-8963-5263281F7E3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{07B509C0-0C28-4F3F-8963-5263281F7E3D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
diff --git a/Nuget/MediaBrowser.ApiClient.nuspec b/Nuget/MediaBrowser.ApiClient.nuspec
index 9796782801..49ac2d7e51 100644
--- a/Nuget/MediaBrowser.ApiClient.nuspec
+++ b/Nuget/MediaBrowser.ApiClient.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.ApiClient</id>
-        <version>3.0.0.13-beta</version>
+        <version>3.0.0.14-beta</version>
         <title>MediaBrowser.ApiClient</title>
         <authors>Media Browser Team</authors>
         <owners>scottisafool,Luke</owners>
diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec
index 628c419686..47a723d8e4 100644
--- a/Nuget/MediaBrowser.Common.Internal.nuspec
+++ b/Nuget/MediaBrowser.Common.Internal.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common.Internal</id>
-        <version>3.0.13</version>
+        <version>3.0.14</version>
         <title />
         <authors>Luke</authors>
         <owners>Media Browser Team</owners>
@@ -10,7 +10,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Contains common components shared by Media Browser Theatre and Media Browser Server. Not intended for plugin developer consumption.</description>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.13" />
+            <dependency id="MediaBrowser.Common" version="3.0.14" />
             <dependency id="NLog" version="2.0.0.2000" />
             <dependency id="ServiceStack" version="3.9.37" />
             <dependency id="ServiceStack.Api.Swagger" version="3.9.35" />
diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec
index 49497cb0d0..7670dbcd91 100644
--- a/Nuget/MediaBrowser.Common.nuspec
+++ b/Nuget/MediaBrowser.Common.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common</id>
-        <version>3.0.13</version>
+        <version>3.0.14</version>
         <title>MediaBrowser.Common</title>
         <authors>Media Browser Team</authors>
         <owners />
diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec
index fae20958b8..03aa5476d8 100644
--- a/Nuget/MediaBrowser.Server.Core.nuspec
+++ b/Nuget/MediaBrowser.Server.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Server.Core</id>
-        <version>3.0.13</version>
+        <version>3.0.14</version>
         <title>Media Browser.Server.Core</title>
         <authors>Media Browser Team</authors>
         <owners />
@@ -10,7 +10,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Contains core components required to build plugins for Media Browser Server.</description>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.13" />
+            <dependency id="MediaBrowser.Common" version="3.0.14" />
         </dependencies>
     </metadata>
     <files>