Fix merge

src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs

@@ -69,7 +69,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             var sp = TestObjects.GetScopeProvider(Logger);
             using (var scope = sp.CreateScope())
             {
-                var repo = new AuditRepository((IScopeAccessor)sp, CacheHelper, Logger);
+                var repo = new AuditRepository((IScopeAccessor)sp, Logger);
 
                 for (var i = 0; i < 100; i++)
                 {
@@ -82,7 +82,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
             using (var scope = sp.CreateScope())
             {
-                var repo = new AuditRepository((IScopeAccessor)sp, CacheHelper, Logger);
+                var repo = new AuditRepository((IScopeAccessor)sp, Logger);
 
                 var query = sp.SqlContext.Query<IAuditItem>().Where(x => x.UserId == -1);
 

src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs

@@ -40,7 +40,7 @@ namespace Umbraco.Tests.PublishedContent
             Container.RegisterSingleton<IPublishedModelFactory>(f => new PublishedModelFactory(f.GetInstance<TypeLoader>().GetTypes<PublishedContentModel>()));
         }
 
-        protected override TypeLoader CreatePluginManager(IServiceFactory f)
+        protected override TypeLoader CreatePluginManager(IContainer f)
         {
             var pluginManager = base.CreatePluginManager(f);
 

src/Umbraco.Web/ContentApps/ContentAppDefinitionCollectionBuilder.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using LightInject;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
@@ -10,7 +9,7 @@ namespace Umbraco.Web.ContentApps
 {
     public class ContentAppDefinitionCollectionBuilder : OrderedCollectionBuilderBase<ContentAppDefinitionCollectionBuilder, ContentAppDefinitionCollection, IContentAppDefinition>
     {
-        public ContentAppDefinitionCollectionBuilder(IServiceContainer container)
+        public ContentAppDefinitionCollectionBuilder(IContainer container)
             : base(container)
         { }
 
@@ -25,14 +24,14 @@ namespace Umbraco.Web.ContentApps
             return new ContentAppDefinitionCollection(CreateItems(), logger);
         }
 
-        protected override IEnumerable<IContentAppDefinition> CreateItems(params object[] args)
+        protected override IEnumerable<IContentAppDefinition> CreateItems()
         {
             // get the manifest parser just-in-time - injecting it in the ctor would mean that
             // simply getting the builder in order to configure the collection, would require
             // its dependencies too, and that can create cycles or other oddities
             var manifestParser = Container.GetInstance<ManifestParser>();
 
-            return base.CreateItems(args).Concat(manifestParser.Manifest.ContentApps);
+            return base.CreateItems().Concat(manifestParser.Manifest.ContentApps);
         }
     }
 }

src/Umbraco.Web/UmbracoInjectedModule.cs

@@ -91,11 +91,6 @@ namespace Umbraco.Web
 
             // ok, process
 
-            // create the LegacyRequestInitializer
-            // and initialize legacy stuff
-            var legacyRequestInitializer = new LegacyRequestInitializer(httpContext.Request.Url, httpContext);
-            legacyRequestInitializer.InitializeRequest();
-
             // create the UmbracoContext singleton, one per request, and assign
             // replace existing if any (eg during app startup, a temp one is created)
             UmbracoContext.EnsureContext(