diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 17b99c858f..cba9afb986 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -999,7 +999,7 @@ namespace Emby.Server.Implementations
             var versions = new List<LocalPlugin>();
             if (!Directory.Exists(path))
             {
-                // Plugin path doesn't exist, don't try to enumerate subfolders.
+                // Plugin path doesn't exist, don't try to enumerate sub-folders.
                 return Enumerable.Empty<LocalPlugin>();
             }
 
@@ -1070,7 +1070,6 @@ namespace Emby.Server.Implementations
                 if (!string.IsNullOrEmpty(lastName) && cleanup)
                 {
                     // Attempt a cleanup of old folders.
-                    versions.RemoveAt(x);
                     try
                     {
                         Logger.LogDebug("Deleting {Path}", versions[x].Path);
@@ -1080,6 +1079,8 @@ namespace Emby.Server.Implementations
                     {
                         Logger.LogWarning(e, "Unable to delete {Path}", versions[x].Path);
                     }
+
+                    versions.RemoveAt(x);
                 }
             }
 
diff --git a/Emby.Server.Implementations/Plugins/PluginManifest.cs b/Emby.Server.Implementations/Plugins/PluginManifest.cs
index 63cad82716..33762791bc 100644
--- a/Emby.Server.Implementations/Plugins/PluginManifest.cs
+++ b/Emby.Server.Implementations/Plugins/PluginManifest.cs
@@ -56,10 +56,5 @@ namespace Emby.Server.Implementations.Plugins
         /// Gets or sets the Version number of the plugin.
         /// </summary>
         public string Version { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Repository where the plugin originated.
-        /// </summary>
-        public string Repository { get; set; }
     }
 }