diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Services/ModuleService.cs b/src/Orchard.Web/Modules/Orchard.Modules/Services/ModuleService.cs
index 82ad5f8e2..7cd23eb1d 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Services/ModuleService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Services/ModuleService.cs
@@ -11,15 +11,10 @@ using Orchard.Modules.ViewModels;
 using Orchard.UI.Notify;
 
 namespace Orchard.Modules.Services {
-     [Obsolete]
     public interface IModuleService : IDependency {
-        [Obsolete]
         void EnableFeatures(IEnumerable<string> featureNames);
-        [Obsolete]
         void EnableFeatures(IEnumerable<string> featureNames, bool force);
-        [Obsolete]
         void DisableFeatures(IEnumerable<string> featureNames);
-        [Obsolete]
         void DisableFeatures(IEnumerable<string> featureNames, bool force);
     }
 
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs b/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
index 9e6707a1f..d7071db23 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
@@ -102,22 +102,11 @@ namespace Orchard.Setup {
 
         [UsedImplicitly]
         class SafeModeThemeService : IThemeManager {
-            class SafeModeTheme : FeatureDescriptor {
-                public ContentItem ContentItem { get; set; }
-                public bool Enabled { get; set; }
-                public string ThemeName { get; set; }
-                public string DisplayName { get; set; }
-                public string Tags { get; set; }
-                public string Zones { get; set; }
-                public string BaseTheme { get; set; }
-            }
-
             private readonly ExtensionDescriptor _theme = new ExtensionDescriptor {
                 Name = "SafeMode",
                 DisplayName = "SafeMode",
             };
 
-            public ExtensionDescriptor GetThemeByName(string themeName) { return _theme; }
             public ExtensionDescriptor GetRequestTheme(RequestContext requestContext) { return _theme; }
         }