diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.cs
index eec7e7fcbe..5e3d5b3fdf 100644
--- a/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.cs
@@ -2,15 +2,16 @@ using System.IO;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using umbraco.BusinessLogic;
+using System;
+using System.Data;
+using System.Drawing;
+using System.Web;
+using System.Web.UI.WebControls;
+using System.Web.UI.HtmlControls;
 
 namespace umbraco.presentation.install.steps
 {
-    using System;
-    using System.Data;
-    using System.Drawing;
-    using System.Web;
-    using System.Web.UI.WebControls;
-    using System.Web.UI.HtmlControls;
+    
 
     /// <summary>
     ///		Summary description for theend.
@@ -35,9 +36,6 @@ namespace umbraco.presentation.install.steps
             if (!cms.businesslogic.skinning.Skinning.IsStarterKitInstalled())
                 customizeSite.Visible = false;
 
-            var tempFolder = IOHelper.MapPath("~/App_Data/TEMP/PluginCache");
-            if(Directory.Exists(tempFolder))
-                Directory.Delete(tempFolder, true);
         }
 
         #region Web Form Designer generated code
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs
index b48c905777..5d816ce07f 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs
@@ -15,7 +15,6 @@ using umbraco.interfaces;
 using umbraco.BusinessLogic.Utils;
 using umbraco.BusinessLogic;
 using umbraco.BasePages;
-using TypeFinder = umbraco.BusinessLogic.Utils.TypeFinder;
 
 namespace umbraco.cms.presentation.Trees
 {
@@ -152,12 +151,11 @@ namespace umbraco.cms.presentation.Trees
 
 				l.UpgradeToWriteLock();
 
-                List<Type> foundITrees = TypeFinder.FindClassesOfType<ITree>();
-				//var foundITrees = PluginManager.Current.ResolveTrees();
+
+				var foundITrees = PluginManager.Current.ResolveTrees();
 
 				var objTrees = ApplicationTree.getAll();
-                List<ApplicationTree> appTrees = new List<ApplicationTree>();
-				//var appTrees = new List<ApplicationTree>();
+				var appTrees = new List<ApplicationTree>();
 				appTrees.AddRange(objTrees);
 
 				var apps = Application.getAll();
diff --git a/src/umbraco.businesslogic/ApplicationTreeRegistrar.cs b/src/umbraco.businesslogic/ApplicationTreeRegistrar.cs
index 97628bbacd..07175dcc96 100644
--- a/src/umbraco.businesslogic/ApplicationTreeRegistrar.cs
+++ b/src/umbraco.businesslogic/ApplicationTreeRegistrar.cs
@@ -31,7 +31,7 @@ namespace umbraco.BusinessLogic
         public ApplicationTreeRegistrar()
         {
 			//don't do anything if the application is not configured!
-			if (!ApplicationContext.Current.IsConfigured)
+			if (ApplicationContext.Current == null || !ApplicationContext.Current.IsConfigured)
 				return;
 
             // Load all Trees by attribute and add them to the XML config
diff --git a/src/umbraco.cms/businesslogic/template/MasterpageHelper.cs b/src/umbraco.cms/businesslogic/template/MasterpageHelper.cs
index 8dc6936d03..af7cb213ba 100644
--- a/src/umbraco.cms/businesslogic/template/MasterpageHelper.cs
+++ b/src/umbraco.cms/businesslogic/template/MasterpageHelper.cs
@@ -32,7 +32,7 @@ namespace umbraco.cms.businesslogic.template
             if (!File.Exists(GetFilePath(t)) || overWrite)
             {
                 masterpageContent = CreateDefaultMasterPageContent(t, t.Alias);
-                saveDesignToFile(t, null, masterpageContent);
+                SaveDesignToFile(t, null, masterpageContent);
             }
             else
             {
@@ -59,9 +59,9 @@ namespace umbraco.cms.businesslogic.template
 
         internal static string UpdateMasterPageFile(Template t, string currentAlias)
         {
-            var template = updateMasterPageContent(t, currentAlias);
-            updateChildTemplates(t, currentAlias);
-            saveDesignToFile(t, currentAlias, template);
+            var template = UpdateMasterPageContent(t, currentAlias);
+            UpdateChildTemplates(t, currentAlias);
+            SaveDesignToFile(t, currentAlias, template);
 
             return template;
         }
@@ -137,7 +137,7 @@ namespace umbraco.cms.businesslogic.template
              * */
         }
 
-        internal static string updateMasterPageContent(Template template, string currentAlias)
+        internal static string UpdateMasterPageContent(Template template, string currentAlias)
         {
             var masterPageContent = template.Design;
 
@@ -174,7 +174,7 @@ namespace umbraco.cms.businesslogic.template
             return masterPageContent;
         }
 
-        private static void updateChildTemplates(Template t, string currentAlias)
+        private static void UpdateChildTemplates(Template t, string currentAlias)
         {
             //if we have a Old Alias if the alias and therefor the masterpage file name has changed...
             //so before we save the new masterfile, we'll clear the old one, so we don't up with 
@@ -192,7 +192,7 @@ namespace umbraco.cms.businesslogic.template
         }
 
 
-        private static void saveDesignToFile(Template t, string currentAlias, string design)
+        private static void SaveDesignToFile(Template t, string currentAlias, string design)
         {
             //kill the old file..
             if (!string.IsNullOrEmpty(currentAlias) && currentAlias != t.Alias)