diff --git a/src/Umbraco.Web/Singleton.cs b/src/Umbraco.Web/Singleton.cs
deleted file mode 100644
index 283e4892e6..0000000000
--- a/src/Umbraco.Web/Singleton.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-
-/// <changelog>
-///   <item who="Esben" when="17. november 2006">Created</item>
-/// </changelog>
-
-namespace umbraco
-{
-	/// <summary>
-	/// 
-	/// Threadsafe Singleton best practice design pattern template
-	/// 
-	/// Sample:
-	/// 
-	/// public class Demo
-	/// {
-	///		public static Form1 instance1
-	///		{
-	///			get
-	///			{
-	///				return Singleton<Form1>.Instance;
-	///			}
-	///		}
-	///	}
-	/// </summary>
-	/// <typeparam name="T">Any class that implements default constructor</typeparam>
-	public sealed class Singleton<T> where T : new()
-	{
-		private Singleton()
-		{
-		}
-
-		public static T Instance
-		{
-			get { return Nested.instance; }
-		}
-
-		private class Nested
-		{
-			// Explicit static constructor to tell C# compiler
-			// not to mark type as beforefieldinit
-			static Nested()
-			{
-			}
-
-			internal static readonly T instance = new T();
-		}
-	}
-}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index e670968751..ce55cd0e9b 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -2059,14 +2059,12 @@
   <PropertyGroup>
     <PreBuildEvent>
     </PreBuildEvent>
-    <PostBuildEvent>xcopy "$(ProjectDir)"..\..\lib\SQLCE4\amd64\*.* "$(TargetDir)amd64\" /Y /F /E /D
-xcopy "$(ProjectDir)"..\..\lib\SQLCE4\x86\*.* "$(TargetDir)x86\" /Y /F /E /D</PostBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
   <ProjectExtensions />
-  <Import Project="$(MSBuildStartupDirectory)\..\src\umbraco.presentation.targets" Condition="$(BuildingInsideVisualStudio) != true" />
-  <Import Project="$(SolutionDir)umbraco.presentation.targets" Condition="$(BuildingInsideVisualStudio) == true" />
   <PropertyGroup>
     <!--<PostBuildEvent>xcopy "$(ProjectDir)..\..\lib\*.dll" "$(TargetDir)*.dll" /Y</PostBuildEvent>-->
   </PropertyGroup>
diff --git a/src/Umbraco.Web/Web References/org.umbraco.update/Reference.cs b/src/Umbraco.Web/Web References/org.umbraco.update/Reference.cs
index eff7246d7e..87a309f714 100644
--- a/src/Umbraco.Web/Web References/org.umbraco.update/Reference.cs	
+++ b/src/Umbraco.Web/Web References/org.umbraco.update/Reference.cs	
@@ -13,7 +13,8 @@
 // 
 #pragma warning disable 1591
 
-namespace Umbraco.Web.org.umbraco.update {
+namespace umbraco.presentation.org.umbraco.update
+{
     using System;
     using System.Web.Services;
     using System.Diagnostics;
diff --git a/src/Umbraco.Web/Web References/org.umbraco.update/UpgradeResult1.datasource b/src/Umbraco.Web/Web References/org.umbraco.update/UpgradeResult1.datasource
index a2f372ff9b..533f51b9fe 100644
--- a/src/Umbraco.Web/Web References/org.umbraco.update/UpgradeResult1.datasource	
+++ b/src/Umbraco.Web/Web References/org.umbraco.update/UpgradeResult1.datasource	
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="UpgradeResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>Umbraco.Web.org.umbraco.update.UpgradeResult, Web References.org.umbraco.update.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>umbraco.presentation.org.umbraco.update.UpgradeResult, Web References.org.umbraco.update.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco/developer/Xslt/xsltVisualize.aspx.cs b/src/Umbraco.Web/umbraco/developer/Xslt/xsltVisualize.aspx.cs
index 6ed994eb94..b8ba3f7d9e 100644
--- a/src/Umbraco.Web/umbraco/developer/Xslt/xsltVisualize.aspx.cs
+++ b/src/Umbraco.Web/umbraco/developer/Xslt/xsltVisualize.aspx.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
-using umbraco.presentation.umbraco.templateControls;
+
 using System.Text;
 using System.Xml;
 using System.IO;
diff --git a/src/Umbraco.Web/umbraco/templateControls/ItemRenderer.cs b/src/Umbraco.Web/umbraco/templateControls/ItemRenderer.cs
index a78cd1fe10..9ae03d6a8e 100644
--- a/src/Umbraco.Web/umbraco/templateControls/ItemRenderer.cs
+++ b/src/Umbraco.Web/umbraco/templateControls/ItemRenderer.cs
@@ -6,10 +6,10 @@ using System.Text;
 using System.Web;
 using System.Web.UI;
 using System.Xml;
+using Umbraco.Web.umbraco.templateControls;
 using umbraco.cms.businesslogic;
 using umbraco.cms.businesslogic.property;
 using umbraco.cms.businesslogic.web;
-using umbraco.presentation.umbraco.templateControls;
 using umbraco.IO;
 
 namespace umbraco.presentation.templateControls