diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs
index 5c6d5684e7..b4aed9339d 100644
--- a/src/Umbraco.Web/WebBootManager.cs
+++ b/src/Umbraco.Web/WebBootManager.cs
@@ -21,206 +21,212 @@ using umbraco.cms.businesslogic;
 
 namespace Umbraco.Web
 {
-	/// <summary>
-	/// A bootstrapper for the Umbraco application which initializes all objects including the Web portion of the application 
-	/// </summary>
-	internal class WebBootManager : CoreBootManager
-	{
-		private readonly bool _isForTesting;
-		private readonly UmbracoApplication _umbracoApplication;
+    /// <summary>
+    /// A bootstrapper for the Umbraco application which initializes all objects including the Web portion of the application 
+    /// </summary>
+    internal class WebBootManager : CoreBootManager
+    {
+        private readonly bool _isForTesting;
+        private readonly UmbracoApplication _umbracoApplication;
 
-		public WebBootManager(UmbracoApplication umbracoApplication)
-			: this(umbracoApplication, false)
-		{
-		}
+        public WebBootManager(UmbracoApplication umbracoApplication)
+            : this(umbracoApplication, false)
+        {
+        }
 
-		/// <summary>
-		/// Constructor for unit tests, ensures some resolvers are not initialized
-		/// </summary>
-		/// <param name="umbracoApplication"></param>
-		/// <param name="isForTesting"></param>
-		internal WebBootManager(UmbracoApplication umbracoApplication, bool isForTesting)
-		{
-			_isForTesting = isForTesting;
-			_umbracoApplication = umbracoApplication;
-			if (umbracoApplication == null) throw new ArgumentNullException("umbracoApplication");
-		}
-		
-		/// <summary>
-		/// Initialize objects before anything during the boot cycle happens
-		/// </summary>
-		/// <returns></returns>
-		public override IBootManager Initialize()
-		{
-			base.Initialize();
+        /// <summary>
+        /// Constructor for unit tests, ensures some resolvers are not initialized
+        /// </summary>
+        /// <param name="umbracoApplication"></param>
+        /// <param name="isForTesting"></param>
+        internal WebBootManager(UmbracoApplication umbracoApplication, bool isForTesting)
+        {
+            _isForTesting = isForTesting;
+            _umbracoApplication = umbracoApplication;
+            if (umbracoApplication == null) throw new ArgumentNullException("umbracoApplication");
+        }
 
-			// Backwards compatibility - set the path and URL type for ClientDependency 1.5.1 [LK]
-			ClientDependency.Core.CompositeFiles.Providers.XmlFileMapper.FileMapVirtualFolder = "~/App_Data/TEMP/ClientDependency";
-			ClientDependency.Core.CompositeFiles.Providers.BaseCompositeFileProcessingProvider.UrlTypeDefault = ClientDependency.Core.CompositeFiles.Providers.CompositeUrlType.Base64QueryStrings;
+        [Obsolete("This method was never supposed to be here and will be removed in v6.0.0")]
+        public void Boot()
+        {
+            InitializeResolvers();
+        }
 
-			//set master controller factory
-			ControllerBuilder.Current.SetControllerFactory(
-				new MasterControllerFactory(FilteredControllerFactoriesResolver.Current));
+        /// <summary>
+        /// Initialize objects before anything during the boot cycle happens
+        /// </summary>
+        /// <returns></returns>
+        public override IBootManager Initialize()
+        {
+            base.Initialize();
 
-			//set the render view engine
-			ViewEngines.Engines.Add(new RenderViewEngine());
-			//set the plugin view engine
-			ViewEngines.Engines.Add(new PluginViewEngine());
+            // Backwards compatibility - set the path and URL type for ClientDependency 1.5.1 [LK]
+            ClientDependency.Core.CompositeFiles.Providers.XmlFileMapper.FileMapVirtualFolder = "~/App_Data/TEMP/ClientDependency";
+            ClientDependency.Core.CompositeFiles.Providers.BaseCompositeFileProcessingProvider.UrlTypeDefault = ClientDependency.Core.CompositeFiles.Providers.CompositeUrlType.Base64QueryStrings;
 
-			//set model binder
-			ModelBinders.Binders.Add(new KeyValuePair<Type, IModelBinder>(typeof(RenderModel), new RenderModelBinder()));
+            //set master controller factory
+            ControllerBuilder.Current.SetControllerFactory(
+                new MasterControllerFactory(FilteredControllerFactoriesResolver.Current));
+
+            //set the render view engine
+            ViewEngines.Engines.Add(new RenderViewEngine());
+            //set the plugin view engine
+            ViewEngines.Engines.Add(new PluginViewEngine());
+
+            //set model binder
+            ModelBinders.Binders.Add(new KeyValuePair<Type, IModelBinder>(typeof(RenderModel), new RenderModelBinder()));
 
 
-			//find and initialize the application startup handlers, we need to initialize this resolver here because
-			//it is a special resolver where they need to be instantiated first before any other resolvers in order to bind to 
-			//events and to call their events during bootup.
-			//ApplicationStartupHandler.RegisterHandlers();
-			//... and set the special flag to let us resolve before frozen resolution
-			ApplicationEventsResolver.Current = new ApplicationEventsResolver(
-				PluginManager.Current.ResolveApplicationStartupHandlers())
-				{
-					CanResolveBeforeFrozen = true
-				};
-			//add the internal types since we don't want to mark these public
-			ApplicationEventsResolver.Current.AddType<CacheHelperExtensions.CacheHelperApplicationEventListener>();
-			ApplicationEventsResolver.Current.AddType<LegacyScheduledTasks>();
+            //find and initialize the application startup handlers, we need to initialize this resolver here because
+            //it is a special resolver where they need to be instantiated first before any other resolvers in order to bind to 
+            //events and to call their events during bootup.
+            //ApplicationStartupHandler.RegisterHandlers();
+            //... and set the special flag to let us resolve before frozen resolution
+            ApplicationEventsResolver.Current = new ApplicationEventsResolver(
+                PluginManager.Current.ResolveApplicationStartupHandlers())
+            {
+                CanResolveBeforeFrozen = true
+            };
+            //add the internal types since we don't want to mark these public
+            ApplicationEventsResolver.Current.AddType<CacheHelperExtensions.CacheHelperApplicationEventListener>();
+            ApplicationEventsResolver.Current.AddType<LegacyScheduledTasks>();
 
-			//now we need to call the initialize methods
-			ApplicationEventsResolver.Current.ApplicationEventHandlers
-				.ForEach(x => x.OnApplicationInitialized(_umbracoApplication, ApplicationContext));
+            //now we need to call the initialize methods
+            ApplicationEventsResolver.Current.ApplicationEventHandlers
+                .ForEach(x => x.OnApplicationInitialized(_umbracoApplication, ApplicationContext));
 
-			return this;
-		}
+            return this;
+        }
 
-		/// <summary>
-		/// Ensure that the OnApplicationStarting methods of the IApplicationEvents are called
-		/// </summary>
-		/// <param name="afterStartup"></param>
-		/// <returns></returns>
-		public override IBootManager Startup(Action<ApplicationContext> afterStartup)
-		{
-			base.Startup(afterStartup);
+        /// <summary>
+        /// Ensure that the OnApplicationStarting methods of the IApplicationEvents are called
+        /// </summary>
+        /// <param name="afterStartup"></param>
+        /// <returns></returns>
+        public override IBootManager Startup(Action<ApplicationContext> afterStartup)
+        {
+            base.Startup(afterStartup);
 
-			//call OnApplicationStarting of each application events handler
-			ApplicationEventsResolver.Current.ApplicationEventHandlers
-				.ForEach(x => x.OnApplicationStarting(_umbracoApplication, ApplicationContext));
+            //call OnApplicationStarting of each application events handler
+            ApplicationEventsResolver.Current.ApplicationEventHandlers
+                .ForEach(x => x.OnApplicationStarting(_umbracoApplication, ApplicationContext));
 
-			return this;
-		}
+            return this;
+        }
 
-		/// <summary>
-		/// Ensure that the OnApplicationStarted methods of the IApplicationEvents are called
-		/// </summary>
-		/// <param name="afterComplete"></param>
-		/// <returns></returns>
-		public override IBootManager Complete(Action<ApplicationContext> afterComplete)
-		{
-			//set routes
-			CreateRoutes();
+        /// <summary>
+        /// Ensure that the OnApplicationStarted methods of the IApplicationEvents are called
+        /// </summary>
+        /// <param name="afterComplete"></param>
+        /// <returns></returns>
+        public override IBootManager Complete(Action<ApplicationContext> afterComplete)
+        {
+            //set routes
+            CreateRoutes();
 
-			base.Complete(afterComplete);
+            base.Complete(afterComplete);
 
-			//call OnApplicationStarting of each application events handler
-			ApplicationEventsResolver.Current.ApplicationEventHandlers
-				.ForEach(x => x.OnApplicationStarted(_umbracoApplication, ApplicationContext));
+            //call OnApplicationStarting of each application events handler
+            ApplicationEventsResolver.Current.ApplicationEventHandlers
+                .ForEach(x => x.OnApplicationStarted(_umbracoApplication, ApplicationContext));
 
-			// we're ready to serve content!
-			ApplicationContext.IsReady = true;
+            // we're ready to serve content!
+            ApplicationContext.IsReady = true;
 
-			return this;
-		}
+            return this;
+        }
 
-		/// <summary>
-		/// Creates the routes
-		/// </summary>
-		protected internal void CreateRoutes()
-		{
-			var umbracoPath = GlobalSettings.UmbracoMvcArea;
+        /// <summary>
+        /// Creates the routes
+        /// </summary>
+        protected internal void CreateRoutes()
+        {
+            var umbracoPath = GlobalSettings.UmbracoMvcArea;
 
-			//Create the front-end route
-			var defaultRoute = RouteTable.Routes.MapRoute(
-				"Umbraco_default",
-				"Umbraco/RenderMvc/{action}/{id}",
-				new { controller = "RenderMvc", action = "Index", id = UrlParameter.Optional }
-				);
-			defaultRoute.RouteHandler = new RenderRouteHandler(ControllerBuilder.Current.GetControllerFactory());
+            //Create the front-end route
+            var defaultRoute = RouteTable.Routes.MapRoute(
+                "Umbraco_default",
+                "Umbraco/RenderMvc/{action}/{id}",
+                new { controller = "RenderMvc", action = "Index", id = UrlParameter.Optional }
+                );
+            defaultRoute.RouteHandler = new RenderRouteHandler(ControllerBuilder.Current.GetControllerFactory());
 
-			//Create the install routes
-			var installPackageRoute = RouteTable.Routes.MapRoute(
-				"Umbraco_install_packages",
-				"Install/PackageInstaller/{action}/{id}",
-				new { controller = "InstallPackage", action = "Index", id = UrlParameter.Optional }
-				);
-			installPackageRoute.DataTokens.Add("area", umbracoPath);
+            //Create the install routes
+            var installPackageRoute = RouteTable.Routes.MapRoute(
+                "Umbraco_install_packages",
+                "Install/PackageInstaller/{action}/{id}",
+                new { controller = "InstallPackage", action = "Index", id = UrlParameter.Optional }
+                );
+            installPackageRoute.DataTokens.Add("area", umbracoPath);
 
-			//we need to find the surface controllers and route them
-			var surfaceControllers = SurfaceControllerResolver.Current.RegisteredSurfaceControllers.ToArray();
+            //we need to find the surface controllers and route them
+            var surfaceControllers = SurfaceControllerResolver.Current.RegisteredSurfaceControllers.ToArray();
 
-			//local surface controllers do not contain the attribute 			
-			var localSurfaceControlleres = surfaceControllers.Where(x => PluginController.GetMetadata(x).AreaName.IsNullOrWhiteSpace());
-			foreach (var s in localSurfaceControlleres)
-			{
-				var meta = PluginController.GetMetadata(s);
-				var route = RouteTable.Routes.MapRoute(
-					string.Format("umbraco-{0}-{1}", "surface", meta.ControllerName),
-					umbracoPath + "/Surface/" + meta.ControllerName + "/{action}/{id}",//url to match
-					new { controller = meta.ControllerName, action = "Index", id = UrlParameter.Optional },
-					new[] { meta.ControllerNamespace }); //only match this namespace
-				route.DataTokens.Add("umbraco", "surface"); //ensure the umbraco token is set
-			}
-			
-			//need to get the plugin controllers that are unique to each area (group by)
-			//TODO: One day when we have more plugin controllers, we will need to do a group by on ALL of them to pass into the ctor of PluginControllerArea
-			var pluginSurfaceControlleres = surfaceControllers.Where(x => !PluginController.GetMetadata(x).AreaName.IsNullOrWhiteSpace());
-			var groupedAreas = pluginSurfaceControlleres.GroupBy(controller => PluginController.GetMetadata(controller).AreaName);
-			//loop through each area defined amongst the controllers
-			foreach(var g in groupedAreas)
-			{
-				//create an area for the controllers (this will throw an exception if all controllers are not in the same area)
-				var pluginControllerArea = new PluginControllerArea(g.Select(PluginController.GetMetadata));
-				//register it
-				RouteTable.Routes.RegisterArea(pluginControllerArea);
-			}
-		}
+            //local surface controllers do not contain the attribute 			
+            var localSurfaceControlleres = surfaceControllers.Where(x => PluginController.GetMetadata(x).AreaName.IsNullOrWhiteSpace());
+            foreach (var s in localSurfaceControlleres)
+            {
+                var meta = PluginController.GetMetadata(s);
+                var route = RouteTable.Routes.MapRoute(
+                    string.Format("umbraco-{0}-{1}", "surface", meta.ControllerName),
+                    umbracoPath + "/Surface/" + meta.ControllerName + "/{action}/{id}",//url to match
+                    new { controller = meta.ControllerName, action = "Index", id = UrlParameter.Optional },
+                    new[] { meta.ControllerNamespace }); //only match this namespace
+                route.DataTokens.Add("umbraco", "surface"); //ensure the umbraco token is set
+            }
 
-		
+            //need to get the plugin controllers that are unique to each area (group by)
+            //TODO: One day when we have more plugin controllers, we will need to do a group by on ALL of them to pass into the ctor of PluginControllerArea
+            var pluginSurfaceControlleres = surfaceControllers.Where(x => !PluginController.GetMetadata(x).AreaName.IsNullOrWhiteSpace());
+            var groupedAreas = pluginSurfaceControlleres.GroupBy(controller => PluginController.GetMetadata(controller).AreaName);
+            //loop through each area defined amongst the controllers
+            foreach (var g in groupedAreas)
+            {
+                //create an area for the controllers (this will throw an exception if all controllers are not in the same area)
+                var pluginControllerArea = new PluginControllerArea(g.Select(PluginController.GetMetadata));
+                //register it
+                RouteTable.Routes.RegisterArea(pluginControllerArea);
+            }
+        }
 
-		/// <summary>
-		/// Initializes all web based and core resolves 
-		/// </summary>
-		protected override void InitializeResolvers()
-		{
-			base.InitializeResolvers();
 
-			//TODO: This needs to be removed in future versions (i.e. 6.0 when the PublishedContentHelper can access the business logic)
-			// see the TODO noted in the PublishedContentHelper.
-			PublishedContentHelper.GetDataTypeCallback = ContentType.GetDataType;
 
-			SurfaceControllerResolver.Current = new SurfaceControllerResolver(
-				PluginManager.Current.ResolveSurfaceControllers());
+        /// <summary>
+        /// Initializes all web based and core resolves 
+        /// </summary>
+        protected override void InitializeResolvers()
+        {
+            base.InitializeResolvers();
 
-			//the base creates the PropertyEditorValueConvertersResolver but we want to modify it in the web app and replace
-			//the TinyMcePropertyEditorValueConverter with the RteMacroRenderingPropertyEditorValueConverter
-			PropertyEditorValueConvertersResolver.Current.RemoveType<TinyMcePropertyEditorValueConverter>();
-			PropertyEditorValueConvertersResolver.Current.AddType<RteMacroRenderingPropertyEditorValueConverter>();
+            //TODO: This needs to be removed in future versions (i.e. 6.0 when the PublishedContentHelper can access the business logic)
+            // see the TODO noted in the PublishedContentHelper.
+            PublishedContentHelper.GetDataTypeCallback = ContentType.GetDataType;
 
-			PublishedContentStoreResolver.Current = new PublishedContentStoreResolver(new DefaultPublishedContentStore());
-			PublishedMediaStoreResolver.Current = new PublishedMediaStoreResolver(new DefaultPublishedMediaStore());
+            SurfaceControllerResolver.Current = new SurfaceControllerResolver(
+                PluginManager.Current.ResolveSurfaceControllers());
 
-			FilteredControllerFactoriesResolver.Current = new FilteredControllerFactoriesResolver(
-				//add all known factories, devs can then modify this list on application startup either by binding to events
-				//or in their own global.asax
-				new[]
+            //the base creates the PropertyEditorValueConvertersResolver but we want to modify it in the web app and replace
+            //the TinyMcePropertyEditorValueConverter with the RteMacroRenderingPropertyEditorValueConverter
+            PropertyEditorValueConvertersResolver.Current.RemoveType<TinyMcePropertyEditorValueConverter>();
+            PropertyEditorValueConvertersResolver.Current.AddType<RteMacroRenderingPropertyEditorValueConverter>();
+
+            PublishedContentStoreResolver.Current = new PublishedContentStoreResolver(new DefaultPublishedContentStore());
+            PublishedMediaStoreResolver.Current = new PublishedMediaStoreResolver(new DefaultPublishedMediaStore());
+
+            FilteredControllerFactoriesResolver.Current = new FilteredControllerFactoriesResolver(
+                //add all known factories, devs can then modify this list on application startup either by binding to events
+                //or in their own global.asax
+                new[]
 					{
 						typeof (RenderControllerFactory)
 					});
 
-			LastChanceLookupResolver.Current = new LastChanceLookupResolver(new DefaultLastChanceLookup());
+            LastChanceLookupResolver.Current = new LastChanceLookupResolver(new DefaultLastChanceLookup());
 
-			DocumentLookupsResolver.Current = new DocumentLookupsResolver(
-				//add all known resolvers in the correct order, devs can then modify this list on application startup either by binding to events
-				//or in their own global.asax
-				new[]
+            DocumentLookupsResolver.Current = new DocumentLookupsResolver(
+                //add all known resolvers in the correct order, devs can then modify this list on application startup either by binding to events
+                //or in their own global.asax
+                new[]
 					{
 						typeof (LookupByPageIdQuery),
 						typeof (LookupByNiceUrl),
@@ -230,18 +236,18 @@ namespace Umbraco.Web
 						typeof (LookupByAlias)
 					});
 
-			RoutesCacheResolver.Current = new RoutesCacheResolver(new DefaultRoutesCache(_isForTesting == false));
+            RoutesCacheResolver.Current = new RoutesCacheResolver(new DefaultRoutesCache(_isForTesting == false));
 
-			ThumbnailProvidersResolver.Current = new ThumbnailProvidersResolver(
-				PluginManager.Current.ResolveThumbnailProviders());
+            ThumbnailProvidersResolver.Current = new ThumbnailProvidersResolver(
+                PluginManager.Current.ResolveThumbnailProviders());
 
             ImageUrlProviderResolver.Current = new ImageUrlProviderResolver(
                 PluginManager.Current.ResolveImageUrlProviders());
 
-			CultureDictionaryFactoryResolver.Current = new CultureDictionaryFactoryResolver(
-				new DefaultCultureDictionaryFactory());
+            CultureDictionaryFactoryResolver.Current = new CultureDictionaryFactoryResolver(
+                new DefaultCultureDictionaryFactory());
 
-		}
+        }
 
-	}
+    }
 }