diff --git a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
index ebba8bc1cc..34fb2add8b 100644
--- a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
+++ b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
@@ -52,8 +52,7 @@ namespace Umbraco.Tests.Configurations
             SystemDirectories.Root = rootPath;
             Assert.AreEqual(outcome, UmbracoConfig.For.GlobalSettings().GetUmbracoMvcArea());
         }
-
-        [TestCase("/umbraco/umbraco.aspx")]
+        
         [TestCase("/umbraco/editContent.aspx")]
         [TestCase("/install/default.aspx")]
         [TestCase("/install/")]
diff --git a/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs b/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs
index 7f00bed123..f253d44973 100644
--- a/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs
+++ b/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs
@@ -32,8 +32,7 @@ namespace Umbraco.Tests.CoreThings
         [TestCase("http://www.domain.com/umbraco/test/test.js", "", true)]
         [TestCase("http://www.domain.com/umbrac", "", false)]
         [TestCase("http://www.domain.com/test", "", false)]
-        [TestCase("http://www.domain.com/test/umbraco", "", false)]
-        [TestCase("http://www.domain.com/test/umbraco.aspx", "", false)]
+        [TestCase("http://www.domain.com/test/umbraco", "", false)]        
         [TestCase("http://www.domain.com/Umbraco/restServices/blah", "", true)]
         [TestCase("http://www.domain.com/Umbraco/Backoffice/blah", "", true)]
         [TestCase("http://www.domain.com/Umbraco/anything", "", true)]
@@ -62,8 +61,7 @@ namespace Umbraco.Tests.CoreThings
         [TestCase("http://www.domain.com/install/test/test.js", true)]
         [TestCase("http://www.domain.com/instal", false)]
         [TestCase("http://www.domain.com/umbraco", false)]
-        [TestCase("http://www.domain.com/umbraco/umbraco", false)]
-        [TestCase("http://www.domain.com/test/umbraco.aspx", false)]
+        [TestCase("http://www.domain.com/umbraco/umbraco", false)]        
         public void Is_Installer_Request(string input, bool expected)
         {
             var source = new Uri(input);
diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
index 5f42c8d3ae..69533c3c77 100644
--- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
+++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
@@ -62,8 +62,7 @@ namespace Umbraco.Tests.Routing
 
         // do not test for /base here as it's handled before EnsureUmbracoRoutablePage is called
         [TestCase("/umbraco_client/Tree/treeIcons.css", false)]
-        [TestCase("/umbraco_client/Tree/Themes/umbraco/style.css?cdv=37", false)]
-        [TestCase("/umbraco/umbraco.aspx", false)]
+        [TestCase("/umbraco_client/Tree/Themes/umbraco/style.css?cdv=37", false)]        
         [TestCase("/umbraco/editContent.aspx", false)]
         [TestCase("/install/default.aspx", false)]
         [TestCase("/install/?installStep=license", false)]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 5751e9155c..b4a020deea 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -218,14 +218,6 @@
     <Content Include="Umbraco\Config\Lang\zh_tw.xml" />
     <Content Include="Umbraco\create.aspx" />
     <Content Include="Umbraco\Developer\Packages\installer.aspx" />
-    <Content Include="Umbraco\umbraco.aspx" />
-    <Compile Include="Umbraco\umbraco.aspx.cs">
-      <DependentUpon>umbraco.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Umbraco\umbraco.aspx.designer.cs">
-      <DependentUpon>umbraco.aspx</DependentUpon>
-    </Compile>
     <Content Include="Config\Splashes\booting.aspx" />
     <Content Include="Config\Splashes\noNodes.aspx" />
     <Content Include="Umbraco\Install\Views\Web.config" />
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
index b2296b1ccf..0edabebb76 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
@@ -881,7 +881,7 @@ das Dokument '%1%' wurde von '%2%' zur Übersetzung in '%5%' freigegeben.
 
 Zum Bearbeiten verwenden Sie bitte diesen Link: http://%3%/translation/details.aspx?id=%4%.
 
-Sie können sich auch alle anstehenden Übersetzungen gesammelt im Umbraco-Verwaltungsbereich anzeigen lassen: http://%3%/Umbraco.aspx
+Sie können sich auch alle anstehenden Übersetzungen gesammelt im Umbraco-Verwaltungsbereich anzeigen lassen: http://%3%/umbraco
 
 Einen schönen Tag wünscht
 Ihr freundlicher Umbraco-Robot
@@ -977,4 +977,4 @@ Ihr freundlicher Umbraco-Robot
     <key alias="yourHistory" version="7.0">Ihr Verlauf</key>
     <key alias="sessionExpires" version="7.0">Sitzung läuft ab in</key>
   </area>
-</language>
\ No newline at end of file
+</language>
diff --git a/src/Umbraco.Web.UI/Umbraco/umbraco.aspx b/src/Umbraco.Web.UI/Umbraco/umbraco.aspx
deleted file mode 100644
index 6e70513afd..0000000000
--- a/src/Umbraco.Web.UI/Umbraco/umbraco.aspx
+++ /dev/null
@@ -1,2 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="umbraco.aspx.cs" Inherits="Umbraco.Web.UI.Umbraco.umbraco" %>
-
diff --git a/src/Umbraco.Web.UI/Umbraco/umbraco.aspx.cs b/src/Umbraco.Web.UI/Umbraco/umbraco.aspx.cs
deleted file mode 100644
index b70378bb01..0000000000
--- a/src/Umbraco.Web.UI/Umbraco/umbraco.aspx.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using Umbraco.Core.Configuration;
-
-namespace Umbraco.Web.UI.Umbraco
-{
-    public partial class umbraco : System.Web.UI.Page
-    {
-        protected void Page_Load(object sender, EventArgs e)
-        {
-            Response.Status = "301 Moved Permanently";
-            Response.AddHeader("Location", UmbracoConfig.For.GlobalSettings().Path);
-        }
-    }
-}
diff --git a/src/Umbraco.Web.UI/Umbraco/umbraco.aspx.designer.cs b/src/Umbraco.Web.UI/Umbraco/umbraco.aspx.designer.cs
deleted file mode 100644
index c9a577fb34..0000000000
--- a/src/Umbraco.Web.UI/Umbraco/umbraco.aspx.designer.cs
+++ /dev/null
@@ -1,15 +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.Web.UI.Umbraco {
-
-
-    public partial class umbraco {
-    }
-}
diff --git a/src/Umbraco.Web.UI/default.aspx b/src/Umbraco.Web.UI/default.aspx
index 75b0e5d28c..a41d1eccf7 100644
--- a/src/Umbraco.Web.UI/default.aspx
+++ b/src/Umbraco.Web.UI/default.aspx
@@ -1,2 +1,2 @@
-<%@ Page language="c#" Codebehind="default.aspx.cs" AutoEventWireup="True" Inherits="umbraco.UmbracoDefault" trace="true" validateRequest="false" %>
+<%@ Page language="c#" AutoEventWireup="True" Inherits="umbraco.UmbracoDefault" trace="true" validateRequest="false" %>
 
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index c7e8b0d109..ea3ff32220 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1166,9 +1166,6 @@
     <Compile Include="umbraco.presentation\umbraco\masterpages\default.Master.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="umbraco.presentation\umbraco\Default.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
     <Compile Include="umbraco.presentation\umbraco\dialogs\umbracoField.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Default.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Default.aspx.cs
deleted file mode 100644
index f1a05c1185..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Default.aspx.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-
-namespace umbraco
-{
-    /// <summary>
-    /// Summary description for _Default.
-    /// </summary>
-    public partial class _Default : System.Web.UI.Page
-    {
-        protected void Page_Load(object sender, System.EventArgs e)
-        {
-            //var mvcHandler = new MvcHandler()
-            //Server.TransferRequest();
-            //Server.Transfer("~/Umbraco/Default");
-            //Server.Transfer("umbraco.aspx");
-            // Put user code to initialize the page here
-        }
-
-        /// <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;
-
-    }
-}