diff --git a/src/Umbraco.ModelsBuilder/BackOffice/DashboardReport.cs b/src/Umbraco.ModelsBuilder/BackOffice/DashboardReport.cs
index 64fb217fce..a43ebdb927 100644
--- a/src/Umbraco.ModelsBuilder/BackOffice/DashboardReport.cs
+++ b/src/Umbraco.ModelsBuilder/BackOffice/DashboardReport.cs
@@ -1,5 +1,4 @@
 using System.Text;
-using Umbraco.Core.Composing;
 using Umbraco.ModelsBuilder.Configuration;
 
 namespace Umbraco.ModelsBuilder.BackOffice
diff --git a/src/Umbraco.ModelsBuilder/BackOffice/ModelsBuilderBackOfficeController.cs b/src/Umbraco.ModelsBuilder/BackOffice/ModelsBuilderBackOfficeController.cs
index e4efca70bd..3963ad09f2 100644
--- a/src/Umbraco.ModelsBuilder/BackOffice/ModelsBuilderBackOfficeController.cs
+++ b/src/Umbraco.ModelsBuilder/BackOffice/ModelsBuilderBackOfficeController.cs
@@ -1,10 +1,7 @@
 using System;
-using System.IO;
-using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Runtime.Serialization;
-using System.Text;
 using System.Web.Hosting;
 using Umbraco.Core.Exceptions;
 using Umbraco.ModelsBuilder.Building;
diff --git a/src/Umbraco.ModelsBuilder/Building/Builder.cs b/src/Umbraco.ModelsBuilder/Building/Builder.cs
index bba19c3b9f..f7917cbf22 100644
--- a/src/Umbraco.ModelsBuilder/Building/Builder.cs
+++ b/src/Umbraco.ModelsBuilder/Building/Builder.cs
@@ -1,12 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
 using Umbraco.ModelsBuilder.Configuration;
 
 namespace Umbraco.ModelsBuilder.Building
@@ -71,8 +65,8 @@ namespace Umbraco.ModelsBuilder.Building
         /// Initializes a new instance of the <see cref="Builder"/> class with a list of models to generate,
         /// the result of code parsing, and a models namespace.
         /// </summary>
+        /// <param name="config"></param>
         /// <param name="typeModels">The list of models to generate.</param>
-        /// <param name="modelsNamespace">The models namespace.</param>
         protected Builder(IModelsBuilderConfig config, IList<TypeModel> typeModels)
         {
             _typeModels = typeModels ?? throw new ArgumentNullException(nameof(typeModels));
diff --git a/src/Umbraco.ModelsBuilder/Building/ModelsGenerator.cs b/src/Umbraco.ModelsBuilder/Building/ModelsGenerator.cs
index 6f6872e8ff..9b1c36b42c 100644
--- a/src/Umbraco.ModelsBuilder/Building/ModelsGenerator.cs
+++ b/src/Umbraco.ModelsBuilder/Building/ModelsGenerator.cs
@@ -1,7 +1,5 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Text;
-using System.Web;
 using Umbraco.ModelsBuilder.Configuration;
 
 namespace Umbraco.ModelsBuilder.Building
diff --git a/src/Umbraco.ModelsBuilder/Building/TextBuilder.cs b/src/Umbraco.ModelsBuilder/Building/TextBuilder.cs
index 56349f16a8..317a9f27d7 100644
--- a/src/Umbraco.ModelsBuilder/Building/TextBuilder.cs
+++ b/src/Umbraco.ModelsBuilder/Building/TextBuilder.cs
@@ -3,8 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
 using Umbraco.ModelsBuilder.Configuration;
 
 namespace Umbraco.ModelsBuilder.Building
@@ -18,6 +16,7 @@ namespace Umbraco.ModelsBuilder.Building
         /// Initializes a new instance of the <see cref="TextBuilder"/> class with a list of models to generate
         /// and the result of code parsing.
         /// </summary>
+        /// <param name="config"></param>
         /// <param name="typeModels">The list of models to generate.</param>
         public TextBuilder(IModelsBuilderConfig config, IList<TypeModel> typeModels)
             : base(config, typeModels)
diff --git a/src/Umbraco.ModelsBuilder/ConfigsExtensions.cs b/src/Umbraco.ModelsBuilder/ConfigsExtensions.cs
index 09314bc3f3..b3605fc541 100644
--- a/src/Umbraco.ModelsBuilder/ConfigsExtensions.cs
+++ b/src/Umbraco.ModelsBuilder/ConfigsExtensions.cs
@@ -4,7 +4,7 @@ using Umbraco.ModelsBuilder.Configuration;
 namespace Umbraco.ModelsBuilder
 {
     /// <summary>
-    /// Provides extension methods for the <see cref="UmbracoConfig"/> class.
+    /// Provides extension methods for the <see cref="Configs"/> class.
     /// </summary>
     public static class ConfigsExtensions
     {
diff --git a/src/Umbraco.ModelsBuilder/Configuration/ModelsBuilderConfig.cs b/src/Umbraco.ModelsBuilder/Configuration/ModelsBuilderConfig.cs
index 48a4423054..e67dcc9157 100644
--- a/src/Umbraco.ModelsBuilder/Configuration/ModelsBuilderConfig.cs
+++ b/src/Umbraco.ModelsBuilder/Configuration/ModelsBuilderConfig.cs
@@ -2,7 +2,6 @@
 using System.Configuration;
 using System.IO;
 using System.Web.Configuration;
-using System.Web.Hosting;
 using Umbraco.Core;
 using Umbraco.Core.IO;
 
diff --git a/src/Umbraco.ModelsBuilder/LiveModelsProvider.cs b/src/Umbraco.ModelsBuilder/LiveModelsProvider.cs
index 0dfe503fce..14a38a3291 100644
--- a/src/Umbraco.ModelsBuilder/LiveModelsProvider.cs
+++ b/src/Umbraco.ModelsBuilder/LiveModelsProvider.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Threading;
-using System.Web;
 using System.Web.Hosting;
-using Umbraco.Core.Exceptions;
-using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.ModelsBuilder.Building;
 using Umbraco.ModelsBuilder.Configuration;
diff --git a/src/Umbraco.ModelsBuilder/ModelsGenerationError.cs b/src/Umbraco.ModelsBuilder/ModelsGenerationError.cs
index 8264fecc87..8585b2094a 100644
--- a/src/Umbraco.ModelsBuilder/ModelsGenerationError.cs
+++ b/src/Umbraco.ModelsBuilder/ModelsGenerationError.cs
@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Text;
-using Umbraco.Core.Composing;
 using Umbraco.ModelsBuilder.Configuration;
 
 namespace Umbraco.ModelsBuilder
diff --git a/src/Umbraco.ModelsBuilder/OutOfDateModelsStatus.cs b/src/Umbraco.ModelsBuilder/OutOfDateModelsStatus.cs
index 3b43ed771e..a394b2611a 100644
--- a/src/Umbraco.ModelsBuilder/OutOfDateModelsStatus.cs
+++ b/src/Umbraco.ModelsBuilder/OutOfDateModelsStatus.cs
@@ -1,5 +1,4 @@
 using System.IO;
-using Umbraco.Core.Composing;
 using Umbraco.ModelsBuilder.Configuration;
 using Umbraco.Web.Cache;
 
diff --git a/src/Umbraco.ModelsBuilder/PublishedModelUtility.cs b/src/Umbraco.ModelsBuilder/PublishedModelUtility.cs
index 44af532a0b..3400b2dd7f 100644
--- a/src/Umbraco.ModelsBuilder/PublishedModelUtility.cs
+++ b/src/Umbraco.ModelsBuilder/PublishedModelUtility.cs
@@ -1,5 +1,4 @@
 using System;
-using System.ComponentModel;
 using System.Linq;
 using System.Linq.Expressions;
 using Umbraco.Web.Composing;
diff --git a/src/Umbraco.ModelsBuilder/PureLiveModelFactory.cs b/src/Umbraco.ModelsBuilder/PureLiveModelFactory.cs
index eb82b4323f..c050ae291a 100644
--- a/src/Umbraco.ModelsBuilder/PureLiveModelFactory.cs
+++ b/src/Umbraco.ModelsBuilder/PureLiveModelFactory.cs
@@ -13,10 +13,8 @@ using System.Web.Compilation;
 using System.Web.Hosting;
 using System.Web.WebPages.Razor;
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Web.Cache;
 using Umbraco.ModelsBuilder.Building;
 using Umbraco.ModelsBuilder.Configuration;
 using File = System.IO.File;
diff --git a/src/Umbraco.ModelsBuilder/ReferencedAssemblies.cs b/src/Umbraco.ModelsBuilder/ReferencedAssemblies.cs
index e0a20eb9d6..e1e503d372 100644
--- a/src/Umbraco.ModelsBuilder/ReferencedAssemblies.cs
+++ b/src/Umbraco.ModelsBuilder/ReferencedAssemblies.cs
@@ -142,26 +142,6 @@ namespace Umbraco.ModelsBuilder
 
         // ----
 
-        private static IEnumerable<Assembly> GetDeepReferencedAssemblies(Assembly assembly)
-        {
-            var visiting = new Stack<Assembly>();
-            var visited = new HashSet<Assembly>();
-
-            visiting.Push(assembly);
-            visited.Add(assembly);
-            while (visiting.Count > 0)
-            {
-                var visAsm = visiting.Pop();
-                foreach (var refAsm in visAsm.GetReferencedAssemblies()
-                    .Select(TryLoad)
-                    .Where(x => x != null && visited.Contains(x) == false))
-                {
-                    yield return refAsm;
-                    visiting.Push(refAsm);
-                    visited.Add(refAsm);
-                }
-            }
-        }
 
         private static Assembly TryLoad(AssemblyName name)
         {
diff --git a/src/Umbraco.ModelsBuilder/UmbracoServices.cs b/src/Umbraco.ModelsBuilder/UmbracoServices.cs
index 725e5b18c4..f21f75b5b1 100644
--- a/src/Umbraco.ModelsBuilder/UmbracoServices.cs
+++ b/src/Umbraco.ModelsBuilder/UmbracoServices.cs
@@ -2,14 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
 using Umbraco.ModelsBuilder.Building;
-using Umbraco.ModelsBuilder.Configuration;
 
 namespace Umbraco.ModelsBuilder
 {