Cleanup

src/Umbraco.Core/UmbracoApplicationBase.cs

@@ -34,8 +34,6 @@ namespace Umbraco.Core
         /// </summary>
         protected virtual IContainer GetContainer()
         {
-            // note: the actual, web UmbracoApplication is overriding this
-            // with a web-supporting container
             return ContainerFactory.Create();
         }
 
@@ -70,7 +68,6 @@ namespace Umbraco.Core
             // create the container for the application, and configure.
             // the boot manager is responsible for registrations
             var container = GetContainer();
-            container.RegisterInstance(container);
             Current.Container = container;
 
             // register the essential stuff,
@@ -107,6 +104,8 @@ namespace Umbraco.Core
 
         protected virtual void ConfigureAssemblyResolve(ILogger logger)
         {
+            // TODO - do we still need this?
+
             // When an assembly can't be resolved. In here we can do magic with the assembly name and try loading another.
             // This is used for loading a signed assembly of AutoMapper (v. 3.1+) without having to recompile old code.
             AppDomain.CurrentDomain.AssemblyResolve += (sender, args) =>

src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs

@@ -34,8 +34,6 @@ namespace Umbraco.Tests.TestHelpers
 
             var container = Current.Container = ContainerFactory.Create();
 
-            PreSetUp();
-
             container.RegisterSingleton<ILogger>(factory => Mock.Of<ILogger>());
             container.RegisterSingleton<IProfiler>(factory => Mock.Of<IProfiler>());
 
@@ -57,9 +55,6 @@ namespace Umbraco.Tests.TestHelpers
             SetUp();
         }
 
-        public virtual void PreSetUp()
-        {}
-
         public virtual void SetUp()
         {}
 

src/Umbraco.Web/UmbracoContext.cs

@@ -5,7 +5,6 @@ using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.Services;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
 using Umbraco.Web.Runtime;