diff --git a/src/Umbraco.Web/Editors/PublishedStatusController.cs b/src/Umbraco.Web.BackOffice/Controllers/PublishedStatusController.cs
similarity index 91%
rename from src/Umbraco.Web/Editors/PublishedStatusController.cs
rename to src/Umbraco.Web.BackOffice/Controllers/PublishedStatusController.cs
index 5ed70c4811..f63c2d5e6a 100644
--- a/src/Umbraco.Web/Editors/PublishedStatusController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/PublishedStatusController.cs
@@ -1,9 +1,8 @@
 using System;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using Umbraco.Web.PublishedCache;
-using Umbraco.Web.WebApi;
 
-namespace Umbraco.Web.Editors
+namespace Umbraco.Web.BackOffice.Controllers
 {
     public class PublishedStatusController : UmbracoAuthorizedApiController
     {
diff --git a/src/Umbraco.Web/Editors/RedirectUrlManagementController.cs b/src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs
similarity index 56%
rename from src/Umbraco.Web/Editors/RedirectUrlManagementController.cs
rename to src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs
index d1bb3f873c..c749e85839 100644
--- a/src/Umbraco.Web/Editors/RedirectUrlManagementController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs
@@ -1,30 +1,42 @@
 using System;
-using System.Web.Http;
 using System.Xml;
-using System.Linq;
 using System.Security;
+using Microsoft.AspNetCore.Mvc;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Web.Models.ContentEditing;
-using Umbraco.Web.Mvc;
-using Umbraco.Web.WebApi;
-using File = System.IO.File;
 using Umbraco.Core;
-using Umbraco.Web.Composing;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Hosting;
+using Umbraco.Core.Mapping;
+using Umbraco.Core.Services;
+using Umbraco.Web.Common.Attributes;
 
-namespace Umbraco.Web.Editors
+namespace Umbraco.Web.BackOffice.Controllers
 {
     [PluginController("UmbracoApi")]
     public class RedirectUrlManagementController : UmbracoAuthorizedApiController
     {
         private readonly ILogger _logger;
         private readonly IWebRoutingSettings _webRoutingSettings;
+        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
+        private readonly IRedirectUrlService _redirectUrlService;
+        private readonly UmbracoMapper _umbracoMapper;
+        private readonly IHostingEnvironment _hostingEnvironment;
 
-        public RedirectUrlManagementController(ILogger logger, IWebRoutingSettings webRoutingSettings)
+        public RedirectUrlManagementController(ILogger logger,
+            IWebRoutingSettings webRoutingSettings,
+            IUmbracoContextAccessor umbracoContextAccessor,
+            IRedirectUrlService redirectUrlService,
+            UmbracoMapper umbracoMapper,
+            IHostingEnvironment hostingEnvironment)
         {
-            _logger = logger;
-            _webRoutingSettings = webRoutingSettings;
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            _webRoutingSettings = webRoutingSettings ?? throw new ArgumentNullException(nameof(webRoutingSettings));
+            _umbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
+            _redirectUrlService = redirectUrlService ?? throw new ArgumentNullException(nameof(redirectUrlService));
+            _umbracoMapper = umbracoMapper ?? throw new ArgumentNullException(nameof(umbracoMapper));
+            _hostingEnvironment = hostingEnvironment ?? throw new ArgumentNullException(nameof(hostingEnvironment));
         }
 
         /// <summary>
@@ -32,10 +44,11 @@ namespace Umbraco.Web.Editors
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public IHttpActionResult GetEnableState()
+        public IActionResult GetEnableState()
         {
             var enabled = _webRoutingSettings.DisableRedirectUrlTracking == false;
-            var userIsAdmin = UmbracoContext.Security.CurrentUser.IsAdmin();
+            var umbracoContext = _umbracoContextAccessor.GetRequiredUmbracoContext();
+            var userIsAdmin = umbracoContext.Security.CurrentUser.IsAdmin();
             return Ok(new { enabled, userIsAdmin });
         }
 
@@ -44,14 +57,13 @@ namespace Umbraco.Web.Editors
         public RedirectUrlSearchResult SearchRedirectUrls(string searchTerm, int page = 0, int pageSize = 10)
         {
             var searchResult = new RedirectUrlSearchResult();
-            var redirectUrlService = Services.RedirectUrlService;
             long resultCount;
 
             var redirects = string.IsNullOrWhiteSpace(searchTerm)
-                ? redirectUrlService.GetAllRedirectUrls(page, pageSize, out resultCount)
-                : redirectUrlService.SearchRedirectUrls(searchTerm, page, pageSize, out resultCount);
+                ? _redirectUrlService.GetAllRedirectUrls(page, pageSize, out resultCount)
+                : _redirectUrlService.SearchRedirectUrls(searchTerm, page, pageSize, out resultCount);
 
-            searchResult.SearchResults = Mapper.MapEnumerable<IRedirectUrl, ContentRedirectUrl>(redirects);
+            searchResult.SearchResults = _umbracoMapper.MapEnumerable<IRedirectUrl, ContentRedirectUrl>(redirects);
             searchResult.TotalCount = resultCount;
             searchResult.CurrentPage = page;
             searchResult.PageCount = ((int)resultCount + pageSize - 1) / pageSize;
@@ -71,43 +83,40 @@ namespace Umbraco.Web.Editors
             var redirectsResult = new RedirectUrlSearchResult();
             if (UdiParser.TryParse(contentUdi, out GuidUdi guidIdi))
             {
-                var redirectUrlService = Services.RedirectUrlService;
-                var redirects = redirectUrlService.GetContentRedirectUrls(guidIdi.Guid);
-                var mapped = Mapper.MapEnumerable<IRedirectUrl, ContentRedirectUrl>(redirects);
+
+                var redirects = _redirectUrlService.GetContentRedirectUrls(guidIdi.Guid);
+                var mapped = _umbracoMapper.MapEnumerable<IRedirectUrl, ContentRedirectUrl>(redirects);
                 redirectsResult.SearchResults = mapped;
                 //not doing paging 'yet'
-                redirectsResult.TotalCount = mapped.Count();
+                redirectsResult.TotalCount = mapped.Count;
                 redirectsResult.CurrentPage = 1;
                 redirectsResult.PageCount = 1;
             }
             return redirectsResult;
         }
         [HttpPost]
-        public IHttpActionResult DeleteRedirectUrl(Guid id)
+        public IActionResult DeleteRedirectUrl(Guid id)
         {
-            var redirectUrlService = Services.RedirectUrlService;
-            redirectUrlService.Delete(id);
+            _redirectUrlService.Delete(id);
             return Ok();
         }
 
         [HttpPost]
-        public IHttpActionResult ToggleUrlTracker(bool disable)
+        public IActionResult ToggleUrlTracker(bool disable)
         {
-            var userIsAdmin = UmbracoContext.Security.CurrentUser.IsAdmin();
+            var umbracoContext = _umbracoContextAccessor.GetRequiredUmbracoContext();
+            var userIsAdmin = umbracoContext.Security.CurrentUser.IsAdmin();
             if (userIsAdmin == false)
             {
                 var errorMessage = "User is not a member of the administrators group and so is not allowed to toggle the URL tracker";
                 _logger.Debug<RedirectUrlManagementController>(errorMessage);
                 throw new SecurityException(errorMessage);
             }
-
-            var httpContext = TryGetHttpContext();
-            if (httpContext.Success == false) throw new InvalidOperationException("Cannot acquire HttpContext");
-            var configFilePath = httpContext.Result.Server.MapPath("~/config/umbracoSettings.config");
+            var configFilePath =_hostingEnvironment.MapPathContentRoot("~/config/umbracoSettings.config");
 
             var action = disable ? "disable" : "enable";
 
-            if (File.Exists(configFilePath) == false)
+            if (System.IO.File.Exists(configFilePath) == false)
                 return BadRequest($"Couldn't {action} URL Tracker, the umbracoSettings.config file does not exist.");
 
             var umbracoConfig = new XmlDocument { PreserveWhitespace = true };
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index 2e5e078882..46995fd7ba 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -137,10 +137,10 @@ namespace Umbraco.Web.Editors
                         {
                             "packagesRestApiBaseUrl", Constants.PackageRepository.RestApiBaseUrl
                         },
-                        {
-                            "redirectUrlManagementApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<RedirectUrlManagementController>(
-                                controller => controller.GetEnableState())
-                        },
+                        // {
+                        //     "redirectUrlManagementApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<RedirectUrlManagementController>(
+                        //         controller => controller.GetEnableState())
+                        // },
                         //TODO reintroduce
                         // {
                         //     "tourApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<TourController>(
@@ -295,10 +295,10 @@ namespace Umbraco.Web.Editors
                         //     "codeFileApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<CodeFileController>(
                         //         controller => controller.GetByPath("", ""))
                         // },
-                        {
-                            "publishedStatusBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<PublishedStatusController>(
-                                controller => controller.GetPublishedStatusUrl())
-                        },
+                        // {
+                        //     "publishedStatusBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<PublishedStatusController>(
+                        //         controller => controller.GetPublishedStatusUrl())
+                        // },
                         {
                             "dictionaryApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<DictionaryController>(
                                 controller => controller.DeleteById(int.MaxValue))
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index e9ab9db390..87c653e71f 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -296,7 +296,6 @@
     <Compile Include="WebApi\UnhandedExceptionLoggerConfigurationAttribute.cs" />
     <Compile Include="WebApi\UnhandledExceptionLogger.cs" />
     <Compile Include="Runtime\WebInitialComponent.cs" />
-    <Compile Include="Editors\PublishedStatusController.cs" />
     <Compile Include="Trees\TreeAttribute.cs" />
     <Compile Include="Mvc\ControllerContextExtensions.cs" />
     <Compile Include="Mvc\DisableBrowserCacheAttribute.cs" />
@@ -307,7 +306,6 @@
     <Compile Include="Mvc\UmbracoRequireHttpsAttribute.cs" />
     <Compile Include="Mvc\ValidateMvcAngularAntiForgeryTokenAttribute.cs" />
     <Compile Include="OwinMiddlewareConfiguredEventArgs.cs" />
-    <Compile Include="Editors\RedirectUrlManagementController.cs" />
     <Compile Include="Security\ExternalSignInAutoLinkOptions.cs" />
     <Compile Include="Security\FixWindowsAuthMiddlware.cs" />
     <Compile Include="Security\ForceRenewalCookieAuthenticationHandler.cs" />