diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/UmbracoPage.master.designer.cs b/src/Umbraco.Web.UI/umbraco/masterpages/UmbracoPage.master.designer.cs
deleted file mode 100644
index a9bb46e922..0000000000
--- a/src/Umbraco.Web.UI/umbraco/masterpages/UmbracoPage.master.designer.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated. 
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace umbraco.presentation.masterpages
-{
-    
-    
-    public partial class umbracoPage {
-	/// <summary>
-		/// ClientLoader control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::umbraco.uicontrols.UmbracoClientDependencyLoader ClientLoader;
-
-		/// <summary>
-		/// CssInclude1 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.CssInclude CssInclude1;
-
-		/// <summary>
-		/// CssInclude2 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.CssInclude CssInclude2;
-
-		/// <summary>
-		/// JsInclude1 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude1;
-
-		/// <summary>
-		/// JsInclude2 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude2;
-
-		/// <summary>
-		/// JsInclude8 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude8;
-
-		/// <summary>
-		/// JsInclude9 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude9;
-
-		/// <summary>
-		/// JsInclude4 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude4;
-
-		/// <summary>
-		/// JsInclude5 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude5;
-
-		/// <summary>
-		/// JsInclude6 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude6;
-
-		/// <summary>
-		/// JsInclude7 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude7;
-
-		/// <summary>
-		/// JsInclude3 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsInclude3;
-
-		/// <summary>
-		/// JsIncludeHotkeys control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::ClientDependency.Core.Controls.JsInclude JsIncludeHotkeys;
-
-		/// <summary>
-		/// head control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::System.Web.UI.WebControls.ContentPlaceHolder head;
-
-		/// <summary>
-		/// form1 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
-		/// <summary>
-		/// ScriptManager1 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::System.Web.UI.ScriptManager ScriptManager1;
-
-		/// <summary>
-		/// body control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::System.Web.UI.WebControls.ContentPlaceHolder body;
-
-		/// <summary>
-		/// footer control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::System.Web.UI.WebControls.ContentPlaceHolder footer;
-    }
-}
diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master.cs b/src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master.cs
deleted file mode 100644
index 7a5cff9fac..0000000000
--- a/src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-//This is only in case an upgrade goes wrong and the the /masterpages/ files are not copied over
-//which would result in an error. so we have kept the old namespaces intact with references to new ones
-using mp = umbraco.presentation.masterpages;
-namespace umbraco.presentation.umbraco.masterpages
-{
-	public class umbracoPage : mp.umbracoPage { }
-	public class umbracoDialog : mp.umbracoDialog { }
-}
-
-namespace umbraco.presentation.masterpages
-{
-	public delegate void MasterPageLoadHandler(object sender, System.EventArgs e);
-
-	public partial class umbracoPage : System.Web.UI.MasterPage
-	{
-
-		public new static event MasterPageLoadHandler Load;
-		public new static event MasterPageLoadHandler Init;
-
-		protected void Page_Load(object sender, EventArgs e)
-		{
-			ClientLoader.DataBind();
-			FireOnLoad(e);
-		}
-
-		protected override void OnInit(EventArgs e)
-		{
-			base.OnInit(e);
-
-			if (Init != null)
-			{
-				Init(this, e);
-			}
-		}
-
-
-		protected virtual void FireOnLoad(EventArgs e)
-		{
-			if (Load != null)
-			{
-				Load(this, e);
-			}
-		}
-
-		
-	}
-}