diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs
index 94f558ccce..0a7da658d2 100644
--- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs
+++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs
@@ -43,7 +43,6 @@ using Umbraco.Core.Serialization;
 using Umbraco.Extensions;
 using Umbraco.Infrastructure.Runtime;
 using Umbraco.Web;
-using Umbraco.Web.Routing;
 using Umbraco.Web.Search;
 
 namespace Umbraco.Cms.Infrastructure.DependencyInjection
diff --git a/src/Umbraco.Infrastructure/Routing/ContentFinderByConfigured404.cs b/src/Umbraco.Infrastructure/Routing/ContentFinderByConfigured404.cs
index 8ad0f8be5a..d7f45c3d4d 100644
--- a/src/Umbraco.Infrastructure/Routing/ContentFinderByConfigured404.cs
+++ b/src/Umbraco.Infrastructure/Routing/ContentFinderByConfigured404.cs
@@ -5,13 +5,11 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Web;
-using Umbraco.Core;
-using Umbraco.Core.Services;
+using Umbraco.Web;
 
-namespace Umbraco.Web.Routing
+namespace Umbraco.Cms.Core.Routing
 {
     /// <summary>
     /// Provides an implementation of <see cref="IContentFinder"/> that runs the legacy 404 logic.
diff --git a/src/Umbraco.Infrastructure/Routing/NotFoundHandlerHelper.cs b/src/Umbraco.Infrastructure/Routing/NotFoundHandlerHelper.cs
index 4727bc7a2d..837f5a57a4 100644
--- a/src/Umbraco.Infrastructure/Routing/NotFoundHandlerHelper.cs
+++ b/src/Umbraco.Infrastructure/Routing/NotFoundHandlerHelper.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
@@ -9,8 +8,9 @@ using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Xml;
 using Umbraco.Extensions;
+using Umbraco.Web;
 
-namespace Umbraco.Web.Routing
+namespace Umbraco.Cms.Core.Routing
 {
     /// <summary>
     /// Used to determine the node to display when content is not found based on the configured error404 elements in umbracoSettings.config
diff --git a/src/Umbraco.Infrastructure/Routing/RedirectTrackingComponent.cs b/src/Umbraco.Infrastructure/Routing/RedirectTrackingComponent.cs
index d67a6d0ace..e78c81a659 100644
--- a/src/Umbraco.Infrastructure/Routing/RedirectTrackingComponent.cs
+++ b/src/Umbraco.Infrastructure/Routing/RedirectTrackingComponent.cs
@@ -12,7 +12,7 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Extensions;
 
-namespace Umbraco.Web.Routing
+namespace Umbraco.Cms.Core.Routing
 {
     /// Implements an Application Event Handler for managing redirect URLs tracking.
     /// <para>when content is renamed or moved, we want to create a permanent 301 redirect from it's old URL</para>
diff --git a/src/Umbraco.Infrastructure/Routing/RedirectTrackingComposer.cs b/src/Umbraco.Infrastructure/Routing/RedirectTrackingComposer.cs
index a5b14df36a..e56fbda4d7 100644
--- a/src/Umbraco.Infrastructure/Routing/RedirectTrackingComposer.cs
+++ b/src/Umbraco.Infrastructure/Routing/RedirectTrackingComposer.cs
@@ -1,6 +1,6 @@
 using Umbraco.Cms.Core.Composing;
 
-namespace Umbraco.Web.Routing
+namespace Umbraco.Cms.Core.Routing
 {
     /// <summary>
     /// Implements an Application Event Handler for managing redirect URLs tracking.
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedRouterTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedRouterTests.cs
index e8df74026e..e59043e087 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedRouterTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedRouterTests.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Collections;
 using System.Collections.ObjectModel;
-using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using Moq;
@@ -9,9 +7,7 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.Routing;
-using Umbraco.Core.Models;
 using Umbraco.Tests.TestHelpers;
-using Umbraco.Web.Routing;
 
 namespace Umbraco.Tests.PublishedContent
 {
diff --git a/src/Umbraco.Tests/Routing/BaseUrlProviderTest.cs b/src/Umbraco.Tests/Routing/BaseUrlProviderTest.cs
index 5236f29872..53e1fcd1f3 100644
--- a/src/Umbraco.Tests/Routing/BaseUrlProviderTest.cs
+++ b/src/Umbraco.Tests/Routing/BaseUrlProviderTest.cs
@@ -6,10 +6,7 @@ using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Web;
 using Umbraco.Cms.Tests.Common;
-using Umbraco.Core;
 using Umbraco.Tests.TestHelpers;
-using Umbraco.Web;
-using Umbraco.Web.Routing;
 
 namespace Umbraco.Tests.Routing
 {
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs
index e26fb71b90..652706377c 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs
@@ -1,14 +1,11 @@
-using Microsoft.Extensions.DependencyInjection;
-using NUnit.Framework;
-using Microsoft.Extensions.Logging;
-using Umbraco.Core;
-using Umbraco.Tests.TestHelpers;
-using Umbraco.Web;
-using Umbraco.Web.Routing;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Web;
+using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.Routing
 {
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs
index 4dc4d4344b..6372dc7424 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs
@@ -4,8 +4,6 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Web;
 using Umbraco.Tests.TestHelpers;
-using Umbraco.Web;
-using Umbraco.Web.Routing;
 
 namespace Umbraco.Tests.Routing
 {
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs
index 54df5b59d1..a7d256c9ed 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs
@@ -1,14 +1,11 @@
-using NUnit.Framework;
-using Microsoft.Extensions.Logging;
-using Umbraco.Tests.TestHelpers;
-using Umbraco.Web.Routing;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Testing;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Tests.Common.Testing;
+using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.Routing
 {
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs
index 4e4b67b203..35f06627fe 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs
@@ -1,16 +1,11 @@
 using System;
-using System.Globalization;
-using NUnit.Framework;
-using Umbraco.Tests.TestHelpers;
-using Umbraco.Tests.Testing;
-using Umbraco.Web.Routing;
-using Microsoft.Extensions.Logging;
-using Umbraco.Web;
-using Moq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Tests.Common.Testing;
+using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.Routing
 {
diff --git a/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs b/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
index 17f213f51b..cb77ea63c9 100644
--- a/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
+++ b/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
@@ -1,10 +1,7 @@
-using Microsoft.Extensions.DependencyInjection;
-using NUnit.Framework;
-using Microsoft.Extensions.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Web.Routing;
-using Umbraco.Core;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Routing;
diff --git a/src/Umbraco.Tests/TestHelpers/Stubs/TestLastChanceFinder.cs b/src/Umbraco.Tests/TestHelpers/Stubs/TestLastChanceFinder.cs
index 8adff546ce..89798b8771 100644
--- a/src/Umbraco.Tests/TestHelpers/Stubs/TestLastChanceFinder.cs
+++ b/src/Umbraco.Tests/TestHelpers/Stubs/TestLastChanceFinder.cs
@@ -1,5 +1,4 @@
 using Umbraco.Cms.Core.Routing;
-using Umbraco.Web.Routing;
 
 namespace Umbraco.Tests.TestHelpers.Stubs
 {
diff --git a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
index 2961e84dd3..99750458b1 100644
--- a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
+++ b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
@@ -1,9 +1,4 @@
-using System;
 using System.Web.Mvc;
-using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Web.Routing;
-using Umbraco.Core;
-using Current = Umbraco.Web.Composing.Current;
 
 namespace Umbraco.Web.Mvc
 {
diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
index d48b92a340..a68d606701 100644
--- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
+++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
@@ -1,14 +1,3 @@
-using System;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.Routing;
-using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Core;
-using Umbraco.Web.Models;
-using Umbraco.Web.Routing;
-using Current = Umbraco.Web.Composing.Current;
-
 namespace Umbraco.Web.Mvc
 {
     // NOTE: already migrated to netcore, just here since the below is referenced still
diff --git a/src/Umbraco.Web/Mvc/RouteDefinition.cs b/src/Umbraco.Web/Mvc/RouteDefinition.cs
index 1f95fadf8e..ae806f9a4e 100644
--- a/src/Umbraco.Web/Mvc/RouteDefinition.cs
+++ b/src/Umbraco.Web/Mvc/RouteDefinition.cs
@@ -1,6 +1,5 @@
 using System;
 using Umbraco.Cms.Core.Routing;
-using Umbraco.Web.Routing;
 
 namespace Umbraco.Web.Mvc
 {
diff --git a/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs b/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs
index 32807448db..5a8de3b55a 100644
--- a/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs
@@ -1,15 +1,11 @@
+using System;
 using System.Web;
-using System.Web.Mvc;
 using System.Web.Routing;
 using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Web.Models;
-using Umbraco.Web.Routing;
-using Umbraco.Core;
-using Umbraco.Web.Composing;
-using System;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Web;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Mvc
 {