Cleanup, fix tests

src/Umbraco.Web/UmbracoModule.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Text;
-using System.Threading;
 using System.Web;
 using System.Web.Routing;
 using LightInject;
@@ -17,12 +15,12 @@ using Umbraco.Web.Security;
 using Umbraco.Core.Collections;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Exceptions;
+using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
 using Umbraco.Web.PublishedCache;
-using GlobalSettings = Umbraco.Core.Configuration.GlobalSettings;
 
 namespace Umbraco.Web
 {
@@ -55,9 +53,6 @@ namespace Umbraco.Web
         [Inject]
         public IUserService UserService { get; set; }
 
-        [Inject]
-        public IEntityService EntityService { get; set; }
-
         [Inject]
         public UrlProviderCollection UrlProviders { get; set; }
 
@@ -71,7 +66,10 @@ namespace Umbraco.Web
         internal PublishedRouter PublishedRouter { get; set; }
 
         [Inject]
-        internal IUmbracoDatabaseFactory DatabaseFactory { get; set; }
+        internal IUmbracoDatabaseFactory DatabaseFactory { get; set; }
+
+        [Inject]
+        internal ICurrentVariationAccessor CurrentVariationAccessor { get; set; }
 
         #endregion
 
@@ -114,8 +112,8 @@ namespace Umbraco.Web
                 new WebSecurity(httpContext, UserService, GlobalSettings),
                 UmbracoConfig.For.UmbracoSettings(),
                 UrlProviders,
-                GlobalSettings,
-                EntityService,
+                GlobalSettings,
+                CurrentVariationAccessor,
                 true);
         }