diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
index 93d23f31d1..fa4bb9b538 100644
--- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
+++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
@@ -186,7 +186,8 @@ namespace Umbraco.Tests.Routing
         /// </summary>
         public class CustomDocumentController : RenderMvcController
         {
-            public CustomDocumentController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, CacheHelper applicationCache, ILogger logger, ProfilingLogger profilingLogger) : base(globalSettings, umbracoContext, databaseFactory, services, applicationCache, logger, profilingLogger)
+            public CustomDocumentController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, CacheHelper applicationCache, ILogger logger, ProfilingLogger profilingLogger)
+                : base(globalSettings, umbracoContext, services, applicationCache, logger, profilingLogger)
             {
             }
 
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 30ccb3dbb7..f727c9e2d6 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -62,7 +62,8 @@ namespace Umbraco.Web.Editors
         //    _features = features;
         //}
 
-        public BackOfficeController(ManifestParser manifestParser, UmbracoFeatures features, IGlobalSettings globalSettings, UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, CacheHelper applicationCache, ILogger logger, ProfilingLogger profilingLogger) : base(globalSettings, umbracoContext, databaseFactory, services, applicationCache, logger, profilingLogger)
+        public BackOfficeController(ManifestParser manifestParser, UmbracoFeatures features, IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, CacheHelper applicationCache, ILogger logger, ProfilingLogger profilingLogger)
+            : base(globalSettings, umbracoContext, services, applicationCache, logger, profilingLogger)
         {
             _manifestParser = manifestParser;
             _features = features;
diff --git a/src/Umbraco.Web/Mvc/RenderMvcController.cs b/src/Umbraco.Web/Mvc/RenderMvcController.cs
index 21a0d312b2..bf0ea197b6 100644
--- a/src/Umbraco.Web/Mvc/RenderMvcController.cs
+++ b/src/Umbraco.Web/Mvc/RenderMvcController.cs
@@ -26,7 +26,8 @@ namespace Umbraco.Web.Mvc
             ActionInvoker = new RenderActionInvoker();
         }
 
-        public RenderMvcController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, CacheHelper applicationCache, ILogger logger, ProfilingLogger profilingLogger) : base(globalSettings, umbracoContext, databaseFactory, services, applicationCache, logger, profilingLogger)
+        public RenderMvcController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, CacheHelper applicationCache, ILogger logger, ProfilingLogger profilingLogger)
+            : base(globalSettings, umbracoContext, services, applicationCache, logger, profilingLogger)
         {
             ActionInvoker = new RenderActionInvoker();
         }
diff --git a/src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs b/src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
index 64d3207558..aba498530a 100644
--- a/src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
@@ -18,11 +18,10 @@ namespace Umbraco.Web.Mvc
     public abstract class UmbracoAuthorizedController : UmbracoController
     {
         protected UmbracoAuthorizedController()
-        {
-        }
+        { }
 
-        protected UmbracoAuthorizedController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, CacheHelper applicationCache, ILogger logger, ProfilingLogger profilingLogger) : base(globalSettings, umbracoContext, databaseFactory, services, applicationCache, logger, profilingLogger)
-        {
-        }
+        protected UmbracoAuthorizedController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, CacheHelper applicationCache, ILogger logger, ProfilingLogger profilingLogger)
+            : base(globalSettings, umbracoContext, services, applicationCache, logger, profilingLogger)
+        { }
     }
 }
diff --git a/src/Umbraco.Web/Mvc/UmbracoController.cs b/src/Umbraco.Web/Mvc/UmbracoController.cs
index 3a5d3e0d18..50bfe166de 100644
--- a/src/Umbraco.Web/Mvc/UmbracoController.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoController.cs
@@ -28,6 +28,7 @@ namespace Umbraco.Web.Mvc
         // don't need to implement complex constructors + need to refactor them each time we change ours.
         // this means that these properties have a setter.
         // what can go wrong?
+        // fixme clear this comment
 
         /// <summary>
         /// Gets or sets the Umbraco context.
@@ -39,11 +40,6 @@ namespace Umbraco.Web.Mvc
         /// </summary>
         public virtual UmbracoContext UmbracoContext { get; set; }
 
-        /// <summary>
-        /// Gets or sets the database context.
-        /// </summary>
-        public IUmbracoDatabaseFactory DatabaseFactory { get; set; }
-
         /// <summary>
         /// Gets or sets the services context.
         /// </summary>
@@ -86,7 +82,6 @@ namespace Umbraco.Web.Mvc
             : this(
                   Current.Container.GetInstance<IGlobalSettings>(),
                   Current.Container.GetInstance<UmbracoContext>(),
-                  Current.Container.GetInstance<IUmbracoDatabaseFactory>(),
                   Current.Container.GetInstance<ServiceContext>(),
                   Current.Container.GetInstance<CacheHelper>(),
                   Current.Container.GetInstance<ILogger>(),
@@ -95,11 +90,10 @@ namespace Umbraco.Web.Mvc
         {
         }
 
-        protected UmbracoController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, CacheHelper applicationCache, ILogger logger, ProfilingLogger profilingLogger)
+        protected UmbracoController(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ServiceContext services, CacheHelper applicationCache, ILogger logger, ProfilingLogger profilingLogger)
         {
             GlobalSettings = globalSettings;
             UmbracoContext = umbracoContext;
-            DatabaseFactory = databaseFactory;
             Services = services;
             ApplicationCache = applicationCache;
             Logger = logger;
diff --git a/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs b/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
index 45dedea4ab..c1ec6332ee 100644
--- a/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
+++ b/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
@@ -32,6 +32,7 @@ namespace Umbraco.Web.WebApi
         // don't need to implement complex constructors + need to refactor them each time we change ours.
         // this means that these properties have a setter.
         // what can go wrong?
+        // fixme remove that comment?!
 
         /// <summary>
         /// Gets or sets the Umbraco context.