diff --git a/src/JsonSchema/AppSettings.cs b/src/JsonSchema/AppSettings.cs
index e80666038c..132c67987c 100644
--- a/src/JsonSchema/AppSettings.cs
+++ b/src/JsonSchema/AppSettings.cs
@@ -35,9 +35,8 @@ namespace JsonSchema
             /// </summary>
             public class CmsDefinition
             {
-                public ActiveDirectorySettings? ActiveDirectory { get; set; }
-
                 public ContentSettings? Content { get; set; }
+                public CoreDebugSettings? Debug { get; set; }
 
                 public ExceptionFilterSettings? ExceptionFilter { get; set; }
 
diff --git a/src/Umbraco.Core/Configuration/ITypeFinderSettings.cs b/src/Umbraco.Core/Configuration/ITypeFinderSettings.cs
index 9dc5805423..e9842ee4cb 100644
--- a/src/Umbraco.Core/Configuration/ITypeFinderSettings.cs
+++ b/src/Umbraco.Core/Configuration/ITypeFinderSettings.cs
@@ -1,5 +1,6 @@
 namespace Umbraco.Cms.Core.Configuration
 {
+    [Obsolete("Not used anymore, will be removed in Umbraco 12")]
     public interface ITypeFinderSettings
     {
         string AssembliesAcceptingLoadExceptions { get; }
diff --git a/src/Umbraco.Core/Configuration/Models/ActiveDirectorySettings.cs b/src/Umbraco.Core/Configuration/Models/ActiveDirectorySettings.cs
index 5e4f371c73..646cd7ff9f 100644
--- a/src/Umbraco.Core/Configuration/Models/ActiveDirectorySettings.cs
+++ b/src/Umbraco.Core/Configuration/Models/ActiveDirectorySettings.cs
@@ -7,6 +7,7 @@ namespace Umbraco.Cms.Core.Configuration.Models
     /// Typed configuration options for active directory settings.
     /// </summary>
     [UmbracoOptions(Constants.Configuration.ConfigActiveDirectory)]
+    [Obsolete("This is not used anymore. Will be removed in Umbraco 12")]
     public class ActiveDirectorySettings
     {
         /// <summary>