diff --git a/src/NzbDrone.Core/Configuration/ConfigService.cs b/src/NzbDrone.Core/Configuration/ConfigService.cs
index 9541c3d6a..1d83118a2 100644
--- a/src/NzbDrone.Core/Configuration/ConfigService.cs
+++ b/src/NzbDrone.Core/Configuration/ConfigService.cs
@@ -90,12 +90,6 @@ namespace NzbDrone.Core.Configuration
             set { SetValue("LogIndexerResponse", value); }
         }
 
-        public string DownloadClientWorkingFolders
-        {
-            get { return GetValue("DownloadClientWorkingFolders", "_UNPACK_|_FAILED_"); }
-            set { SetValue("DownloadClientWorkingFolders", value); }
-        }
-
         public int FirstDayOfWeek
         {
             get { return GetValueInt("FirstDayOfWeek", (int)CultureInfo.CurrentCulture.DateTimeFormat.FirstDayOfWeek); }
@@ -145,13 +139,6 @@ namespace NzbDrone.Core.Configuration
             set { SetValue("EnableColorImpairedMode", value); }
         }
 
-        public int MovieInfoLanguage
-        {
-            get { return GetValueInt("MovieInfoLanguage", (int)Language.English); }
-
-            set { SetValue("MovieInfoLanguage", value); }
-        }
-
         public int UILanguage
         {
             get { return GetValueInt("UILanguage", (int)Language.English); }
diff --git a/src/NzbDrone.Core/Configuration/IConfigService.cs b/src/NzbDrone.Core/Configuration/IConfigService.cs
index d2556901d..fb330e41e 100644
--- a/src/NzbDrone.Core/Configuration/IConfigService.cs
+++ b/src/NzbDrone.Core/Configuration/IConfigService.cs
@@ -10,9 +10,6 @@ namespace NzbDrone.Core.Configuration
 
         bool IsDefined(string key);
 
-        //Download Client
-        string DownloadClientWorkingFolders { get; set; }
-
         //History
         int HistoryCleanupDays { get; set; }
 
@@ -25,7 +22,6 @@ namespace NzbDrone.Core.Configuration
         string TimeFormat { get; set; }
         bool ShowRelativeDates { get; set; }
         bool EnableColorImpairedMode { get; set; }
-        int MovieInfoLanguage { get; set; }
         int UILanguage { get; set; }
 
         //Internal
diff --git a/src/NzbDrone.Core/Datastore/Migration/016_cleanup_config.cs b/src/NzbDrone.Core/Datastore/Migration/016_cleanup_config.cs
new file mode 100644
index 000000000..f8d91788d
--- /dev/null
+++ b/src/NzbDrone.Core/Datastore/Migration/016_cleanup_config.cs
@@ -0,0 +1,15 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(016)]
+    public class cleanup_config : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Delete.FromTable("Config").Row(new { Key = "movieinfolanguage" });
+            Delete.FromTable("Config").Row(new { Key = "downloadclientworkingfolders" });
+        }
+    }
+}
diff --git a/src/Prowlarr.Api.V1/Config/DownloadClientConfigResource.cs b/src/Prowlarr.Api.V1/Config/DownloadClientConfigResource.cs
index b779340a1..d958d7057 100644
--- a/src/Prowlarr.Api.V1/Config/DownloadClientConfigResource.cs
+++ b/src/Prowlarr.Api.V1/Config/DownloadClientConfigResource.cs
@@ -5,7 +5,6 @@ namespace Prowlarr.Api.V1.Config
 {
     public class DownloadClientConfigResource : RestResource
     {
-        public string DownloadClientWorkingFolders { get; set; }
     }
 
     public static class DownloadClientConfigResourceMapper
@@ -14,7 +13,6 @@ namespace Prowlarr.Api.V1.Config
         {
             return new DownloadClientConfigResource
             {
-                DownloadClientWorkingFolders = model.DownloadClientWorkingFolders
             };
         }
     }
diff --git a/src/Prowlarr.Api.V1/Config/UiConfigResource.cs b/src/Prowlarr.Api.V1/Config/UiConfigResource.cs
index b1ea90f03..d2e9e786b 100644
--- a/src/Prowlarr.Api.V1/Config/UiConfigResource.cs
+++ b/src/Prowlarr.Api.V1/Config/UiConfigResource.cs
@@ -16,7 +16,6 @@ namespace Prowlarr.Api.V1.Config
         public bool ShowRelativeDates { get; set; }
 
         public bool EnableColorImpairedMode { get; set; }
-        public int MovieInfoLanguage { get; set; }
         public int UILanguage { get; set; }
     }
 
@@ -35,7 +34,6 @@ namespace Prowlarr.Api.V1.Config
                 ShowRelativeDates = model.ShowRelativeDates,
 
                 EnableColorImpairedMode = model.EnableColorImpairedMode,
-                MovieInfoLanguage = model.MovieInfoLanguage,
                 UILanguage = model.UILanguage
             };
         }