diff --git a/build/build.ps1 b/build/build.ps1
index 306c5d395c..c998412744 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -216,16 +216,11 @@
     Write-Host "Generating JSON Schema for AppSettings"
     Write-Host "Logging to $($this.BuildTemp)\json.schema.log"
 
-    ## NOTE: Need to specify the outputfile
-    ## As this path is now relative to the 'build' folder we are in and not from the JsonSchema project
-    ##
-    ## src/Umbraco.Web.UI.NetCore/umbraco/config/appsettings-schema.json
+    ## NOTE: Need to specify the outputfile to point to the build temp folder
     &dotnet run --project "$($this.SolutionRoot)\src\JsonSchema\JsonSchema.csproj" `
-        --verbosity detailed `
         -c Release > "$($this.BuildTemp)\json.schema.log" `
         -- `
         --outputFile "$($this.BuildTemp)\WebApp\umbraco\config\appsettings-schema.json"
-
   })
 
   $ubuild.DefineMethod("PrepareTests",
diff --git a/src/JsonSchema/AppSettings.cs b/src/JsonSchema/AppSettings.cs
index 85d468b2df..30b2cf2b45 100644
--- a/src/JsonSchema/AppSettings.cs
+++ b/src/JsonSchema/AppSettings.cs
@@ -59,6 +59,9 @@ namespace JsonSchema
                 public Umbraco.Forms.Core.Configuration.SecuritySettings Security { get; set; }
                 public FieldTypesDefinition FieldTypes { get; set; }
 
+                /// <summary>
+                /// Configurations for the Umbraco Forms Field Types
+                /// </summary>
                 public class FieldTypesDefinition
                 {
                     public DatePickerSettings DatePicker { get; set; }
diff --git a/src/JsonSchema/PrefixedTypeNameGenerator.cs b/src/JsonSchema/PrefixedTypeNameGenerator.cs
deleted file mode 100644
index e9094f106d..0000000000
--- a/src/JsonSchema/PrefixedTypeNameGenerator.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Collections.Generic;
-using NJsonSchema;
-
-namespace JsonSchema
-{
-    /// <summary>
-    /// Prefixes all definitions with the injected prefix.
-    /// </summary>
-    public class PrefixedTypeNameGenerator : DefaultTypeNameGenerator
-    {
-        private readonly string _definitionPrefix;
-
-        /// <summary>
-        /// Creates a new instance of <see cref="PrefixedTypeNameGenerator"/>.
-        /// </summary>
-        /// <param name="definitionPrefix">The prefix to use.</param>
-        public PrefixedTypeNameGenerator(string definitionPrefix) => _definitionPrefix = definitionPrefix;
-
-
-        /// <inheritdoc />
-        public override string Generate(NJsonSchema.JsonSchema schema, string typeNameHint, IEnumerable<string> reservedTypeNames)
-            => $"{_definitionPrefix}{base.Generate(schema, typeNameHint, reservedTypeNames)}";
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/Models/ActiveDirectorySettings.cs b/src/Umbraco.Core/Configuration/Models/ActiveDirectorySettings.cs
index be06d33ba2..c8544dcebc 100644
--- a/src/Umbraco.Core/Configuration/Models/ActiveDirectorySettings.cs
+++ b/src/Umbraco.Core/Configuration/Models/ActiveDirectorySettings.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using Umbraco.Cms.Core.Configuration.Models;
-
 namespace Umbraco.Cms.Core.Configuration.Models
 {
     /// <summary>
diff --git a/src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs b/src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs
index 739c309f80..bfcb41d992 100644
--- a/src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs
+++ b/src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using Umbraco.Cms.Core.Configuration.Models;
-
 namespace Umbraco.Cms.Core.Configuration.Models
 {
     /// <summary>