diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/DeveloperElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/DeveloperElement.cs
deleted file mode 100644
index 66531a1ab1..0000000000
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/DeveloperElement.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class DeveloperElement : ConfigurationElement, IDeveloperSection
-    {
-        private AppCodeFileExtensionsElement _default;
-
-        [ConfigurationProperty("appCodeFileExtensions")]
-        internal AppCodeFileExtensionsElement AppCodeFileExtensions
-        {
-            get
-            {
-                if (_default != null)
-                {
-                    return _default;
-                }
-
-                //here we need to check if this element is defined, if it is not then we'll setup the defaults
-                var prop = Properties["appCodeFileExtensions"];
-                var autoFill = this[prop] as ConfigurationElement;
-                if (autoFill != null && autoFill.ElementInformation.IsPresent == false)
-                {
-                    var collection = new AppCodeFileExtensionsCollection
-                        {
-                            new FileExtensionElement {RawValue = "cs"},
-                            new FileExtensionElement {RawValue = "vb"}
-                        };
-                    _default = new AppCodeFileExtensionsElement
-                        {
-                            AppCodeFileExtensionsCollection = collection
-                        };
-
-                    return _default;
-                }
-
-                return (AppCodeFileExtensionsElement)base["appCodeFileExtensions"];
-            }
-        }
-
-        IEnumerable<IFileExtension> IDeveloperSection.AppCodeFileExtensions
-        {
-            get { return AppCodeFileExtensions.AppCodeFileExtensionsCollection; }
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IDeveloperSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IDeveloperSection.cs
deleted file mode 100644
index 40aa6af0db..0000000000
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IDeveloperSection.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IDeveloperSection : IUmbracoConfigurationSection
-    {
-        IEnumerable<IFileExtension> AppCodeFileExtensions { get; }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
index 6bbfea49da..1776f1cbf2 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
@@ -14,10 +14,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         IRequestHandlerSection RequestHandler { get; }
 
         ITemplatesSection Templates { get; }
-
-        IDeveloperSection Developer { get; }
-
-
+        
         ILoggingSection Logging { get; }
 
         IScheduledTasksSection ScheduledTasks { get; }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs
index f972c2c7b3..3b76a43c39 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs
@@ -37,14 +37,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         {
             get { return (TemplatesElement)this["templates"]; }
         }
-
-        [ConfigurationProperty("developer")]
-        internal DeveloperElement Developer
-        {
-            get { return (DeveloperElement)this["developer"]; }
-        }
-
-
+        
         [ConfigurationProperty("logging")]
         internal LoggingElement Logging
         {
@@ -101,11 +94,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
             get { return BackOffice; }
         }
 
-        IDeveloperSection IUmbracoSettingsSection.Developer
-        {
-            get { return Developer; }
-        }
-
         ILoggingSection IUmbracoSettingsSection.Logging
         {
             get { return Logging; }
diff --git a/src/Umbraco.Core/Models/Macro.cs b/src/Umbraco.Core/Models/Macro.cs
index 6e72942b6e..a24d659ce3 100644
--- a/src/Umbraco.Core/Models/Macro.cs
+++ b/src/Umbraco.Core/Models/Macro.cs
@@ -96,9 +96,7 @@ namespace Umbraco.Core.Models
         private bool _cacheByMember;
         private bool _dontRender;
         private string _scriptFile;
-        private string _scriptAssembly;
         private string _scriptPath;
-        private string _xslt;
         private MacroPropertyCollection _properties;
         private List<string> _addedProperties;
         private List<string> _removedProperties;
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 3f67f820e1..448acce472 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -250,7 +250,6 @@
     <Compile Include="Configuration\UmbracoSettings\ContentImagingElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\ContentScriptEditorElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\ContentSectionExtensions.cs" />
-    <Compile Include="Configuration\UmbracoSettings\DeveloperElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\DisabledLogTypesCollection.cs" />
     <Compile Include="Configuration\UmbracoSettings\DistributedCallElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\ExternalLoggerElement.cs" />
@@ -259,7 +258,6 @@
     <Compile Include="Configuration\UmbracoSettings\IChar.cs" />
     <Compile Include="Configuration\UmbracoSettings\IContentErrorPage.cs" />
     <Compile Include="Configuration\UmbracoSettings\IContentSection.cs" />
-    <Compile Include="Configuration\UmbracoSettings\IDeveloperSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\IDistributedCallSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\IFileExtension.cs" />
     <Compile Include="Configuration\UmbracoSettings\IImagingAutoFillUploadField.cs" />
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/DeveloperElementDefaultTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/DeveloperElementDefaultTests.cs
deleted file mode 100644
index a3f8b79aa1..0000000000
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/DeveloperElementDefaultTests.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using NUnit.Framework;
-
-namespace Umbraco.Tests.Configurations.UmbracoSettings
-{
-    [TestFixture]
-    public class DeveloperElementDefaultTests : DeveloperElementTests
-    {
-        protected override bool TestingDefaults
-        {
-            get { return true; }
-        }
-    }
-}
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/DeveloperElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/DeveloperElementTests.cs
deleted file mode 100644
index aa79ffd965..0000000000
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/DeveloperElementTests.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Linq;
-using NUnit.Framework;
-
-namespace Umbraco.Tests.Configurations.UmbracoSettings
-{
-    [TestFixture]
-    public class DeveloperElementTests : UmbracoSettingsTests
-    {
-        [Test]
-        public void AppCodeFileExtensions()
-        {
-            Assert.IsTrue(SettingsSection.Developer.AppCodeFileExtensions.Count() == 2);
-            Assert.IsTrue(SettingsSection.Developer.AppCodeFileExtensions.All(
-                x => "cs,vb".Split(',').Contains(x.Extension)));
-        }
-    }
-}
diff --git a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
index f3b7eee50a..34c6a35833 100644
--- a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
+++ b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
@@ -56,7 +56,6 @@ namespace Umbraco.Tests.TestHelpers
             var security = new Mock<ISecuritySection>();
             var requestHandler = new Mock<IRequestHandlerSection>();
             var templates = new Mock<ITemplatesSection>();
-            var dev = new Mock<IDeveloperSection>();
             var logging = new Mock<ILoggingSection>();
             var tasks = new Mock<IScheduledTasksSection>();
             var distCall = new Mock<IDistributedCallSection>();
@@ -67,7 +66,6 @@ namespace Umbraco.Tests.TestHelpers
             settings.Setup(x => x.Security).Returns(security.Object);
             settings.Setup(x => x.RequestHandler).Returns(requestHandler.Object);
             settings.Setup(x => x.Templates).Returns(templates.Object);
-            settings.Setup(x => x.Developer).Returns(dev.Object);
             settings.Setup(x => x.Logging).Returns(logging.Object);
             settings.Setup(x => x.ScheduledTasks).Returns(tasks.Object);
             settings.Setup(x => x.DistributedCall).Returns(distCall.Object);
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 3eb6d8ae73..d39608c49c 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -282,8 +282,6 @@
     <Compile Include="Configurations\FileSystemProviderTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\ContentElementDefaultTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\ContentElementTests.cs" />
-    <Compile Include="Configurations\UmbracoSettings\DeveloperElementDefaultTests.cs" />
-    <Compile Include="Configurations\UmbracoSettings\DeveloperElementTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\DistributedCallElementDefaultTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\DistributedCallElementTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\LoggingElementDefaultTests.cs" />
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 0fb48f2d93..20f75c30d4 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -228,20 +228,6 @@
     <Compile Include="Umbraco\Masterpages\UmbracoPage.master.designer.cs">
       <DependentUpon>umbracoPage.Master</DependentUpon>
     </Compile>
-    <Compile Include="Umbraco\Settings\Stylesheet\editstylesheet.aspx.cs">
-      <DependentUpon>editstylesheet.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Umbraco\Settings\Stylesheet\editstylesheet.aspx.designer.cs">
-      <DependentUpon>editstylesheet.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Umbraco\Settings\Stylesheet\Property\EditStyleSheetProperty.aspx.cs">
-      <DependentUpon>EditStyleSheetProperty.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Umbraco\Settings\Stylesheet\Property\EditStyleSheetProperty.aspx.designer.cs">
-      <DependentUpon>EditStyleSheetProperty.aspx</DependentUpon>
-    </Compile>
     <Compile Include="Umbraco\TreeInit.aspx.cs">
       <DependentUpon>treeInit.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -411,7 +397,6 @@
     <Content Include="Umbraco\Dialogs\Preview.aspx" />
     <Content Include="Umbraco\Controls\ProgressBar.ascx" />
     <Content Include="Umbraco\Controls\Tree\TreeControl.ascx" />
-    <Content Include="Umbraco_Client\CodeArea\UmbracoEditor.js" />
     <Content Include="default.aspx" />
     <Content Include="Umbraco\Config\Lang\da.xml" />
     <Content Include="Umbraco\Config\Lang\de.xml" />
@@ -425,7 +410,6 @@
     <Content Include="Umbraco_Client\Tablesorting\Img\bg.gif" />
     <Content Include="Umbraco\Dialogs\empty.htm" />
     <Content Include="Umbraco\Dialogs\republish.aspx" />
-    <Content Include="Umbraco\Dialogs\search.aspx" />
     <Content Include="Umbraco\Dialogs\SendPublish.aspx" />
     <Content Include="Umbraco_Client\Application\JQuery\jquery-fieldselection.js" />
     <Content Include="Umbraco_Client\Application\JQuery\jquery.metadata.min.js" />
@@ -552,9 +536,6 @@
       <SubType>Form</SubType>
     </Content>
     <Content Include="Umbraco\Settings\EditDictionaryItem.aspx" />
-    <Content Include="Umbraco\Settings\Modals\ShowUmbracoTags.aspx" />
-    <Content Include="Umbraco\Settings\Stylesheet\editstylesheet.aspx" />
-    <Content Include="Umbraco\Settings\Stylesheet\Property\EditStyleSheetProperty.aspx" />
     <Content Include="Umbraco\Dialogs\sort.aspx" />
     <Content Include="Umbraco\treeInit.aspx" />
     <!--<Content Include="Umbraco\users\PermissionEditor.aspx" />-->
@@ -565,8 +546,6 @@
     <Content Include="Umbraco\Webservices\codeEditorSave.asmx" />
     <Content Include="Umbraco\Webservices\legacyAjaxCalls.asmx" />
     <Content Include="Umbraco\Webservices\nodeSorter.asmx" />
-    <Content Include="Umbraco_Client\CodeArea\javascript.js" />
-    <Content Include="Umbraco_Client\CodeArea\styles.css" />
     <Content Include="Umbraco_Client\Menuicon\Images\buttonbg.gif" />
     <Content Include="Umbraco_Client\Menuicon\Images\buttonbgdown.gif" />
     <Content Include="Umbraco_Client\Menuicon\Images\split.gif" />
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
index d8c9f8570f..f9d7fc616e 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
@@ -321,8 +321,6 @@
     <key alias="stylesNoStylesOnPage">Žádne aktivní styly nejsou dostupné</key>
     <key alias="tableColMergeLeft">Umístěte, prosím, kurzor nalevo od těch dvou buňek, které chcete sloučit</key>
     <key alias="tableSplitNotSplittable">Nemužete rozdělit buňku, která nebyla sloučená.</key>
-    <key alias="xsltErrorHeader">Chyba ve zdroji XSLT</key>
-    <key alias="xsltErrorText">Soubor XSLT nebyl uložen, protože obsahoval chyby</key>
     <key alias="missingPropertyEditorErrorMessage">V nastavení datového typu použitého pro tuto vlastnost je chyba, zkontrolujte, prosím, datový typ</key>
   </area>
   <area alias="general">
@@ -817,11 +815,6 @@
     <key alias="templateErrorText">Ujistěte se, prosím, že nemáte 2 šablony se stejným aliasem</key>
     <key alias="templateSavedHeader">Šablona byla uložena</key>
     <key alias="templateSavedText">Šablona byla uložena bez chyb!</key>
-    <key alias="xsltErrorHeader">XSLT nebyl uložen</key>
-    <key alias="xsltErrorText">XSLT obsahoval chybu</key>
-    <key alias="xsltPermissionErrorText">XSLT nemohl být uložen, zkontrolujte oprávnění k souboru</key>
-    <key alias="xsltSavedHeader">XSLT byl uložen</key>
-    <key alias="xsltSavedText">V XSLT nejsou žádné chyby</key>
     <key alias="contentUnpublished">Publikování obsahu bylo zrušeno</key>
     <key alias="partialViewSavedHeader">Částečný pohled byl uložen</key>
     <key alias="partialViewSavedText">Částečný pohled byl uložen bez chyb!</key>
@@ -990,7 +983,6 @@
     <key alias="scripts">Skripty</key>
     <key alias="stylesheets">Stylopisy</key>
     <key alias="templates">Šablony</key>
-    <key alias="xslt">XSLT soubory</key>
     <key alias="userPermissions">Oprávnění Uživatele</key>
     <key alias="userTypes">Typy Uživatelů</key>
     <key alias="users">Uživatelé</key>
@@ -1041,4 +1033,4 @@
     <key alias="yourHistory" version="7.0">Vaše nedávná historie</key>
     <key alias="sessionExpires" version="7.0">Relace vyprší za</key>
   </area>
-</language>
\ No newline at end of file
+</language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
index dee52cff5c..e3b58903d1 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
@@ -337,8 +337,6 @@
     <key alias="stylesNoStylesOnPage">Det er ingen aktive stiler eller formateringer på denne siden</key>
     <key alias="tableColMergeLeft">Sett markøren til venstre i de 2 cellene du ønsker å slå sammen</key>
     <key alias="tableSplitNotSplittable">Du kan ikke dele en celle som allerede er delt.</key>
-    <key alias="xsltErrorHeader">Feil i XSLT kode</key>
-    <key alias="xsltErrorText">XSLT ble ikke lagret på grunn av feil i koden</key>
     <key alias="missingPropertyEditorErrorMessage">Det er et problem dem datatypen som brukes til denne egenskapen. Kontroller innstillingene og prøv igjen.</key>
   </area>
   <area alias="general">
@@ -795,11 +793,6 @@ Vennlig hilsen Umbraco roboten
     <key alias="templateErrorText">Vennligst forviss deg om at du ikke har to maler med samme alias</key>
     <key alias="templateSavedHeader">Malen ble lagret</key>
     <key alias="templateSavedText">Malen ble lagret uten feil!</key>
-    <key alias="xsltErrorHeader">XSLT-koden ble ikke lagret</key>
-    <key alias="xsltErrorText">XSLT-koden inneholdt en feil</key>
-    <key alias="xsltPermissionErrorText">XSLT-koden ble ikke lagret, sjekk filrettigheter</key>
-    <key alias="xsltSavedHeader">XSLT lagret</key>
-    <key alias="xsltSavedText">Ingen feil i XSLT!</key>
     <key alias="contentUnpublished">Innhold avpublisert</key>
     <key alias="partialViewSavedHeader">Delmal lagret</key>
     <key alias="partialViewSavedText">Delmal lagret uten feil</key>
@@ -974,7 +967,6 @@ Vennlig hilsen Umbraco roboten
     <key alias="scripts">Skript</key>
     <key alias="stylesheets">Stiler</key>
     <key alias="templates">Maler</key>
-    <key alias="xslt">XSLT Filer</key>
     <key alias="analytics">Analytics</key>
     <key alias="userPermissions">Brukertillatelser</key>
     <key alias="userTypes">Brukertyper typer</key>
@@ -1028,4 +1020,4 @@ Vennlig hilsen Umbraco roboten
     <key alias="yourHistory" version="7.0">Din historikk</key>
     <key alias="sessionExpires" version="7.0">Sesjonen utløper om</key>
   </area>
-</language>
\ No newline at end of file
+</language>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
index c362f91df0..37c3dec60e 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
@@ -388,8 +388,6 @@
     <key alias="stylesNoStylesOnPage">沒有可用的樣式</key>
     <key alias="tableColMergeLeft">請把游標放在您要合併的兩個儲存格中的左邊儲存格</key>
     <key alias="tableSplitNotSplittable">非合併儲存格不能分離。</key>
-    <key alias="xsltErrorHeader">XSLT源碼出錯</key>
-    <key alias="xsltErrorText">XSLT未保存，因為包含錯誤。</key>
     <key alias="missingPropertyEditorErrorMessage">這是此屬性所使用的資料類別設定錯誤，請檢查資料類別</key>
   </area>
   <area alias="general">
@@ -957,11 +955,6 @@
     <key alias="templateErrorText">範本別名相同</key>
     <key alias="templateSavedHeader">範本已保存</key>
     <key alias="templateSavedText">範本保存，無錯誤。</key>
-    <key alias="xsltErrorHeader">XSLT未保存</key>
-    <key alias="xsltErrorText">XSLT有錯誤</key>
-    <key alias="xsltPermissionErrorText">XSLT無法保存，請檢查許可權。</key>
-    <key alias="xsltSavedHeader">XSLT已保存</key>
-    <key alias="xsltSavedText">XSLT無錯誤</key>
     <key alias="contentUnpublished">內容已取消發佈</key>
     <key alias="partialViewSavedHeader">片段視圖已保存</key>
     <key alias="partialViewSavedText">片段視圖保存，無錯誤。</key>
@@ -1184,7 +1177,6 @@
     <key alias="scripts">腳本</key>
     <key alias="stylesheets">樣式表</key>
     <key alias="templates">範本</key>
-    <key alias="xslt">XSLT文件</key>
     <key alias="analytics">統計</key>
   </area>
   <area alias="update">
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index 84b610b4af..fc7bcad135 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -173,15 +173,6 @@
     <defaultRenderingEngine>Mvc</defaultRenderingEngine>
   </templates>
 
-
-  <!-- this is used by Umbraco to determine if there's valid classes in the /App_Code folder to be used for Rest/XSLT extensions -->
-  <developer>
-    <appCodeFileExtensions>
-      <ext>cs</ext>
-      <ext>vb</ext>
-    </appCodeFileExtensions>
-  </developer>
-
   <!--
 		Now that we have Log4Net logging enabled, this section is only used for what gets logged to the umbracoLog table
 		which currently logs items used in the audit trail and roll back scenarios.
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index 8491af027a..40f16ede1f 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -488,8 +488,6 @@
     <key alias="stylesNoStylesOnPage">Der er ingen aktive styles eller formatteringer på denne side</key>
     <key alias="tableColMergeLeft">Du skal stå til venstre for de 2 celler du ønsker at samle!</key>
     <key alias="tableSplitNotSplittable">Du kan ikke opdele en celle, som ikke allerede er delt.</key>
-    <key alias="xsltErrorHeader">Fejl i XSLT kode</key>
-    <key alias="xsltErrorText">Din XSLT er ikke opdateret, da det indeholdt en fejl</key>
     <key alias="missingPropertyEditorErrorMessage">Der er et problem med den datatype, der bruges til denn egenskab. Kontroller konfigurationen og prøv igen.</key>
   </area>
   <area alias="general">
@@ -1058,11 +1056,6 @@ Mange hilsner fra Umbraco robotten
     <key alias="templateErrorText">Undgå venligst at du har 2 templates med samme alias</key>
     <key alias="templateSavedHeader">Skabelon gemt</key>
     <key alias="templateSavedText">Skabelon gemt uden fejl!</key>
-    <key alias="xsltErrorHeader">XSLT'en blev ikke gemt</key>
-    <key alias="xsltErrorText">XSLT'en indeholdt fejl</key>
-    <key alias="xsltPermissionErrorText">XSLT kunne ikke gemmes, check filrettigheder</key>
-    <key alias="xsltSavedHeader">XSLT gemt</key>
-    <key alias="xsltSavedText">Der var ingen fejl i din XSLT!</key>
     <key alias="contentUnpublished">Indhold fjernet fra udgivelse</key>
     <key alias="partialViewSavedHeader">Partial view gemt</key>
     <key alias="partialViewSavedText">Partial view gemt uden fejl!</key>
@@ -1313,7 +1306,6 @@ Mange hilsner fra Umbraco robotten
     <key alias="scripts">Scripts</key>
     <key alias="stylesheets">Stylesheets</key>
     <key alias="templates">Skabeloner</key>
-    <key alias="xslt">XSLT-filer</key>
     <key alias="analytics">Analytics</key>
     <key alias="userPermissions">Brugertilladelser</key>
     <key alias="userTypes">Bruger Typer</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
index 454b122b7a..fb0106f519 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
@@ -342,8 +342,6 @@
     <key alias="stylesNoStylesOnPage">Keine aktiven Stile vorhanden</key>
     <key alias="tableColMergeLeft">Bitte platzieren Sie den Mauszeiger in die erste der zusammenzuführenden Zellen</key>
     <key alias="tableSplitNotSplittable">Sie können keine Zelle trennen, die nicht zuvor aus mehreren zusammengeführt wurde.</key>
-    <key alias="xsltErrorHeader">Fehler im XSLT</key>
-    <key alias="xsltErrorText">Das XSLT ist fehlerhaft und wurde daher nicht gespeichert.</key>
     <key alias="missingPropertyEditorErrorMessage">Es liegt ein Konfigurationsfehler beim Datentyp dieser Eigenschaft vor. Bitte prüfen Sie den Datentyp bzw. die Eigenschaft.</key>
   </area>
   <area alias="general">
@@ -817,11 +815,6 @@ Wenn Sie sich für Runway entscheiden, können Sie optional Blöcke nutzen, die
     <key alias="templateErrorText">Bitte prüfen Sie, ob möglicherweise zwei Vorlagen den gleichen Alias verwenden.</key>
     <key alias="templateSavedHeader">Vorlage gespeichert</key>
     <key alias="templateSavedText">Vorlage erfolgreich gespeichert!</key>
-    <key alias="xsltErrorHeader">XSLT nicht gespeichert</key>
-    <key alias="xsltErrorText">Das XSLT enthält Fehler</key>
-    <key alias="xsltPermissionErrorText">XSLT kann nicht gespeichert werden. Bitte überprüfen Sie die Schreibrechte auf Dateiebene.</key>
-    <key alias="xsltSavedHeader">XSLT gespeichert</key>
-    <key alias="xsltSavedText">Keine Fehler im XSLT</key>
     <key alias="contentUnpublished">Veröffentlichung des Inhalts aufgehoben</key>
     <key alias="partialViewSavedHeader">Partielle Ansicht gespeichert</key>
     <key alias="partialViewSavedText">Partielle Ansicht ohne Fehler gespeichert.</key>
@@ -982,7 +975,6 @@ Ihr freundlicher Umbraco-Robot
     <key alias="scripts">Client-Skripte</key>
     <key alias="stylesheets">Stylesheets</key>
     <key alias="templates">Vorlagen</key>
-    <key alias="xslt">XSLT-Dateien</key>
     <key alias="analytics">Auswertungen</key>
     <key alias="userPermissions">Berechtigungen</key>
     <key alias="userTypes">Benutzertypen</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 50ee041e9f..ab33d9af1b 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -444,8 +444,6 @@
         <key alias="stylesNoStylesOnPage">No active styles available</key>
         <key alias="tableColMergeLeft">Please place cursor at the left of the two cells you wish to merge</key>
         <key alias="tableSplitNotSplittable">You cannot split a cell that hasn't been merged.</key>
-        <key alias="xsltErrorHeader">Error in XSLT source</key>
-        <key alias="xsltErrorText">The XSLT has not been saved, because it contained error(s)</key>
         <key alias="missingPropertyEditorErrorMessage">There is a configuration error with the data type used for this property, please check the data type</key>
     </area>
     <area alias="general">
@@ -1260,11 +1258,6 @@ To manage your website, simply open the Umbraco back office and start adding con
         <key alias="templateErrorText">Please make sure that you do not have 2 templates with the same alias</key>
         <key alias="templateSavedHeader">Template saved</key>
         <key alias="templateSavedText">Template saved without any errors!</key>
-        <key alias="xsltErrorHeader">XSLT not saved</key>
-        <key alias="xsltErrorText">XSLT contained an error</key>
-        <key alias="xsltPermissionErrorText">XSLT could not be saved, check file permissions</key>
-        <key alias="xsltSavedHeader">XSLT saved</key>
-        <key alias="xsltSavedText">No errors in XSLT</key>
         <key alias="contentUnpublished">Content unpublished</key>
         <key alias="partialViewSavedHeader">Partial view saved</key>
         <key alias="partialViewSavedText">Partial view saved without any errors!</key>
@@ -1666,7 +1659,6 @@ To manage your website, simply open the Umbraco back office and start adding con
         <key alias="scripts">Scripts</key>
         <key alias="stylesheets">Stylesheets</key>
         <key alias="templates">Templates</key>
-        <key alias="xslt">XSLT Files</key>
         <key alias="analytics">Analytics</key>
         <key alias="users">Users</key>
     </area>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index 6304fda60f..6b18680930 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -513,8 +513,6 @@
         <key alias="stylesNoStylesOnPage">No active styles available</key>
         <key alias="tableColMergeLeft">Please place cursor at the left of the two cells you wish to merge</key>
         <key alias="tableSplitNotSplittable">You cannot split a cell that hasn't been merged.</key>
-        <key alias="xsltErrorHeader">Error in XSLT source</key>
-        <key alias="xsltErrorText">The XSLT has not been saved, because it contained error(s)</key>
         <key alias="missingPropertyEditorErrorMessage">There is a configuration error with the data type used for this property, please check the data type</key>
     </area>
     <area alias="general">
@@ -1382,11 +1380,6 @@ To manage your website, simply open the Umbraco back office and start adding con
         <key alias="templateErrorText">Please make sure that you do not have 2 templates with the same alias</key>
         <key alias="templateSavedHeader">Template saved</key>
         <key alias="templateSavedText">Template saved without any errors!</key>
-        <key alias="xsltErrorHeader">XSLT not saved</key>
-        <key alias="xsltErrorText">XSLT contained an error</key>
-        <key alias="xsltPermissionErrorText">XSLT could not be saved, check file permissions</key>
-        <key alias="xsltSavedHeader">XSLT saved</key>
-        <key alias="xsltSavedText">No errors in XSLT</key>
         <key alias="contentUnpublished">Content unpublished</key>
         <key alias="partialViewSavedHeader">Partial view saved</key>
         <key alias="partialViewSavedText">Partial view saved without any errors!</key>
@@ -1794,7 +1787,6 @@ To manage your website, simply open the Umbraco back office and start adding con
         <key alias="scripts">Scripts</key>
         <key alias="stylesheets">Stylesheets</key>
         <key alias="templates">Templates</key>
-        <key alias="xslt">XSLT Files</key>
         <key alias="analytics">Analytics</key>
         <key alias="users">Users</key>
     </area>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
index a259c11346..eea06e5a86 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
@@ -509,11 +509,6 @@
             <![CDATA[No se puede dividir una celda que no ha sido combinada.
 ]]>
         </key>
-        <key alias="xsltErrorHeader">
-            <![CDATA[Error en la fuente XSLT
-]]>
-        </key>
-        <key alias="xsltErrorText">El XSLT no se ha guardado, porque contenía un error (s)</key>
         <key alias="missingPropertyEditorErrorMessage">Hay un error en la configuración el tipo de datos usado para esta propiedad, por favor revisa el tipo de datos.</key>
     </area>
     <area alias="general">
@@ -1158,11 +1153,6 @@
         <key alias="templateErrorText">Por favor, asegúrate de que no hay 2 plantillas con el mismo alias</key>
         <key alias="templateSavedHeader">Plantilla guardada</key>
         <key alias="templateSavedText">Plantilla guardada sin errores</key>
-        <key alias="xsltErrorHeader">El XSLT no se ha guardado</key>
-        <key alias="xsltErrorText">El XSLT tenía un error</key>
-        <key alias="xsltPermissionErrorText">El XSLT no se ha podido guardar, comprueba los permisos de los ficheros</key>
-        <key alias="xsltSavedHeader">XSLT guardado</key>
-        <key alias="xsltSavedText">No hay errores en el XSLT</key>
         <key alias="contentUnpublished">Contenido oculto</key>
         <key alias="partialViewSavedHeader">Vista parcial guardada</key>
         <key alias="partialViewSavedText">Vista parcial guardada sin errores</key>
@@ -1528,7 +1518,6 @@
         <key alias="scripts">Scripts</key>
         <key alias="stylesheets">Hojas de estilo</key>
         <key alias="templates">Plantillas</key>
-        <key alias="xslt">Archivos XSLT</key>
         <key alias="analytics">Analíticas</key>
         <key alias="users">Usuarios</key>
     </area>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
index e047ff611b..64034eb9df 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
@@ -398,8 +398,6 @@
     <key alias="stylesNoStylesOnPage">Aucun style actif disponible</key>
     <key alias="tableColMergeLeft">Veuillez placer le curseur à gauche des deux cellules que vous voulez fusionner</key>
     <key alias="tableSplitNotSplittable">Vous ne pouvez pas scinder une cellule qui n'a pas été fusionnée.</key>
-    <key alias="xsltErrorHeader">Erreur dans le code source XSLT</key>
-    <key alias="xsltErrorText">Le XSLT n'a pas été sauvegardé car il contient des erreurs</key>
     <key alias="missingPropertyEditorErrorMessage">Il y a une erreur de configuration du type de données utilisé pour cette propriété, veuillez vérifier le type de données.</key>
   </area>
   <area alias="general">
@@ -988,11 +986,6 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="templateErrorText">Assurez-vous de ne pas avoir 2 modèles avec le même alias.</key>
     <key alias="templateSavedHeader">Modèle sauvegardé</key>
     <key alias="templateSavedText">Modèle sauvegardé sans aucune erreurs !</key>
-    <key alias="xsltErrorHeader">Le XSLT n'a pas été sauvegardé</key>
-    <key alias="xsltErrorText">Le XSLT contenait une erreur</key>
-    <key alias="xsltPermissionErrorText">Le XSLT n'a pas pu être sauvegardé, vérifiez les permissions de fichier</key>
-    <key alias="xsltSavedHeader">Le XSLT a été sauvegardé</key>
-    <key alias="xsltSavedText">Aucune erreur dans le XSLT</key>
     <key alias="contentUnpublished">Contenu publié</key>
     <key alias="partialViewSavedHeader">Vue partielle sauvegardée</key>
     <key alias="partialViewSavedText">Vue partielle sauvegardée sans erreurs !</key>
@@ -1249,7 +1242,6 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="scripts">Scripts</key>
     <key alias="stylesheets">Feuilles de style</key>
     <key alias="templates">Modèles</key>
-    <key alias="xslt">Fichiers XSLT</key>
     <key alias="userPermissions">Permissions utilisateur</key>
     <key alias="userTypes">Types d'utilisateurs</key>
     <key alias="users">Utilisateurs</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml
index 3443e4ddf3..0697b4512f 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml
@@ -261,8 +261,6 @@
     <key alias="stylesNoStylesOnPage">סגנונות עיצוב פעילים לא זמינים</key>
     <key alias="tableColMergeLeft">יש למקם את הסמן משמאל לשני התאים אותם תרצה למזג</key>
     <key alias="tableSplitNotSplittable">אין אפשרות לפצל תא שלא מוזג לפני כן.</key>
-    <key alias="xsltErrorHeader">שגיאה במקור XSLT</key>
-    <key alias="xsltErrorText">קובץ ה- XSLT לא נשמר, הקובץ מכיל שגיאות.</key>
   </area>
   <area alias="general">
     <key alias="about">אודות</key>
@@ -720,11 +718,6 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="templateErrorText">שים לב שאין 2 תבניות עם אותו השם/כינוי</key>
     <key alias="templateSavedHeader">התבנית נשמרה</key>
     <key alias="templateSavedText">התבנית נשמרה ללא שגיאות!</key>
-    <key alias="xsltErrorHeader">הקובץ XSLT לאנשמר</key>
-    <key alias="xsltErrorText">הקובץ XSLT מכיל שגיאה</key>
-    <key alias="xsltPermissionErrorText">אין אפשרות לשמור את ה- XSLT, בדוק הרשאות קובץ לפני</key>
-    <key alias="xsltSavedHeader">הקובץ XSLT נשמר</key>
-    <key alias="xsltSavedText">אין שגיאות ב- XSLT</key>
   </area>
   <area alias="stylesheet">
     <key alias="aliasHelp">השתמש בסינטקס CSS לדוגמא: h1, .redHeader, .blueTex</key>
@@ -892,7 +885,6 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="scripts">סקריפטים</key>
     <key alias="stylesheets">גיליונות סגנון</key>
     <key alias="templates">תבניות</key>
-    <key alias="xslt">קבצי XSLT</key>
     <key alias="userPermissions">הרשאות משתמש</key>
     <key alias="userTypes">משתמש מקליד</key>
     <key alias="users">משתמש</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml
index f1f00bbafe..50f8417bed 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml
@@ -262,8 +262,6 @@
     <key alias="stylesNoStylesOnPage"><![CDATA[Nessuno stile attivo disponibile]]></key>
     <key alias="tableColMergeLeft"><![CDATA[Per favore posiziona il cursore a sinistra delle due celle che desideri unire ]]></key>
     <key alias="tableSplitNotSplittable"><![CDATA[Non puoi dividere una cella che non è stata unita.]]></key>
-    <key alias="xsltErrorHeader"><![CDATA[Errore nel file sorgente XSLT]]></key>
-    <key alias="xsltErrorText"><![CDATA[Il file XSLT non è stato salvato, perchè conteneva degli errori]]></key>
   </area>
   <area alias="general">
     <key alias="about">Info</key>
@@ -707,11 +705,6 @@ Per gestire il tuo sito web, è sufficiente aprire il back office di Umbraco e i
     <key alias="templateErrorText"><![CDATA[Per favore controlla di non avere due templates con lo stesso alias]]></key>
     <key alias="templateSavedHeader"><![CDATA[Template salvato]]></key>
     <key alias="templateSavedText"><![CDATA[Template salvato con successo!]]></key>
-    <key alias="xsltErrorHeader"><![CDATA[XSLT non salvato]]></key>
-    <key alias="xsltErrorText"><![CDATA[L'XSLT contiene uno o più errori]]></key>
-    <key alias="xsltPermissionErrorText"><![CDATA[L'XSLT non può essere salvato, controlla i permessi sui file]]></key>
-    <key alias="xsltSavedHeader"><![CDATA[XSLT salvato]]></key>
-    <key alias="xsltSavedText"><![CDATA[Non ci sono errori in XSLT!]]></key>
   </area>
   <area alias="stylesheet">
     <key alias="aliasHelp"><![CDATA[Usa la sintassi CSS standard es: h1, .redHeader, .blueTex]]></key>
@@ -882,7 +875,6 @@ Per gestire il tuo sito web, è sufficiente aprire il back office di Umbraco e i
     <key alias="scripts">Scripts</key>
     <key alias="stylesheets">Fogli di stile</key>
     <key alias="templates">Templates</key>
-    <key alias="xslt">Files XSLT</key>
     <key alias="userPermissions">Permessi Utente</key>
     <key alias="userTypes">Tipi di Utente</key>
     <key alias="users">Utenti</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
index 1fcb8d889c..282f092966 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
@@ -380,8 +380,6 @@
     <key alias="stylesNoStylesOnPage">有効なスタイルがありません</key>
     <key alias="tableColMergeLeft">結合したい2つのセルの左側にカーソルを置いてください</key>
     <key alias="tableSplitNotSplittable">このセルは結合されたものではないので分離する事はできません。</key>
-    <key alias="xsltErrorHeader">XSLTソースにエラーがあります</key>
-    <key alias="xsltErrorText">1つ以上のエラーがあるのでこのXSLTは保存できませんでした</key>
     <key alias="missingPropertyEditorErrorMessage">このプロパティに使用されているデータタイプにエラーがあります</key>
   </area>
   <area alias="general">
@@ -939,11 +937,6 @@ Runwayをインストールして作られた新しいウェブサイトがど
     <key alias="templateErrorText">2つのテンプレートで同じエイリアスを使用していないか確認してください</key>
     <key alias="templateSavedHeader">テンプレートを保存しました</key>
     <key alias="templateSavedText">エラーなくテンプレートを保存しました！</key>
-    <key alias="xsltErrorHeader">XSLTは未保存です</key>
-    <key alias="xsltErrorText">XSLTにエラーがあります</key>
-    <key alias="xsltPermissionErrorText">XSLTを保存できません。アクセス権を確認してください。</key>
-    <key alias="xsltSavedHeader">XSLTを保存しました</key>
-    <key alias="xsltSavedText">XSLTにエラーはありません</key>
     <key alias="contentUnpublished">コンテンツは公開されていません</key>
     <key alias="partialViewSavedHeader">部分ビュー保存しました</key>
     <key alias="partialViewSavedText">部分ビューをエラーなしで保存しました!</key>
@@ -1188,7 +1181,6 @@ Runwayをインストールして作られた新しいウェブサイトがど
     <key alias="scripts">スクリプト</key>
     <key alias="stylesheets">スタイルシート</key>
     <key alias="templates">テンプレート</key>
-    <key alias="xslt">XSLT ファイル</key>
     <key alias="analytics">アナリティクス</key>
     <key alias="userPermissions">ユーザーの権限</key>
     <key alias="userTypes">ユーザータイプ</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
index 9cbe4a0ee2..08445b7a79 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
@@ -259,8 +259,6 @@
     <key alias="stylesNoStylesOnPage">사용할 수 있는 스타일이 없습니다.</key>
     <key alias="tableColMergeLeft">합치기 원하시는 두셀의 왼쪽에 커서를 가져다놓으세요</key>
     <key alias="tableSplitNotSplittable">병합되지 않은 셀을 분리할 수 없습니다.</key>
-    <key alias="xsltErrorHeader">XSLT 소스에러</key>
-    <key alias="xsltErrorText">에러를 포함하고 있어 XSLT가 저장되지 않았습니다.</key>
   </area>
   <area alias="general">
     <key alias="about">정보</key>
@@ -702,11 +700,6 @@
     <key alias="templateErrorText">2 템플릿에 동일한 별칭이 적용되지 않았는지 확인하시기 바랍니다.</key>
     <key alias="templateSavedHeader">템플릿 저장</key>
     <key alias="templateSavedText">탬플릿이 에러없이 저장되었습니다!</key>
-    <key alias="xsltErrorHeader">XSLT 저장되지 않음</key>
-    <key alias="xsltErrorText">XSLT 에 에러가 포함됨</key>
-    <key alias="xsltPermissionErrorText">XSLT가 저장되지 않았습니다. 권한을 확인하세요</key>
-    <key alias="xsltSavedHeader">XSLT 저장</key>
-    <key alias="xsltSavedText">XSLT 에러없음</key>
   </area>
   <area alias="stylesheet">
     <key alias="aliasHelp">CSS 태그를 사용하세요 예: h1, .redHeader, .blueTex</key>
@@ -875,7 +868,6 @@
     <key alias="scripts">스크립트</key>
     <key alias="stylesheets">스타일시트</key>
     <key alias="templates">템플릿</key>
-    <key alias="xslt">XSLT 파일</key>
     <key alias="userPermissions">사용자권한</key>
     <key alias="userTypes">사용자 유형</key>
     <key alias="users">사용자</key>
@@ -920,4 +912,4 @@
     <key alias="userTypes">사용자 타입</key>
     <key alias="writer">작성자</key>
   </area>
-</language>
\ No newline at end of file
+</language>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
index dd7f5b58a2..84922e8ae9 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
@@ -408,8 +408,6 @@
     <key alias="stylesNoStylesOnPage">Geen actieve stijlen beschikbaar</key>
     <key alias="tableColMergeLeft">Plaats de cursor links van de twee cellen die je wilt samenvoegen</key>
     <key alias="tableSplitNotSplittable">Je kunt een cel die is samengevoegd niet delen</key>
-    <key alias="xsltErrorHeader">Fout in de XSLT bron</key>
-    <key alias="xsltErrorText">De XSLT is niet opgeslagen omdat deze fout(en) bevat</key>
     <key alias="missingPropertyEditorErrorMessage">Er is een configuratiefout bij het gegevenstype dat wordt gebruikt voor deze eigenschap. Controleer het gegevenstype</key>
   </area>
   <area alias="general">
@@ -1001,11 +999,6 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="templateErrorText">Controleer dat je geen 2 tamplates met dezelfde naam hebt</key>
     <key alias="templateSavedHeader">Template opgeslagen</key>
     <key alias="templateSavedText">Template opgeslagen zonder fouten!</key>
-    <key alias="xsltErrorHeader">XSLT niet opgeslagen</key>
-    <key alias="xsltErrorText">XSLT bevat een fout</key>
-    <key alias="xsltPermissionErrorText">XSLT kon niet worden opgeslagen, controleer de bestandsbeveiliging</key>
-    <key alias="xsltSavedHeader">XSLT opgeslagen</key>
-    <key alias="xsltSavedText">Geen fouten in de XSLT!</key>
     <key alias="contentUnpublished">Inhoud gedepubliceerd</key>
     <key alias="partialViewSavedHeader">Partial view opgeslagen</key>
     <key alias="partialViewSavedText">Partial view opgeslagen zonder fouten!</key>
@@ -1262,7 +1255,6 @@ Om een vertalingstaak te sluiten, ga aub naar het detailoverzicht en klik op de
     <key alias="scripts">Scripts</key>
     <key alias="stylesheets">Stylesheets</key>
     <key alias="templates">Sjablonen</key>
-    <key alias="xslt">XSLT Bestanden</key>
 	<key alias="analytics">Analytics</key>
   </area>
   <area alias="update">
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
index 39e70003fe..05dcf4d181 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
@@ -497,8 +497,6 @@
     <key alias="stylesNoStylesOnPage">Brak dostępnych aktywnych stylów</key>
     <key alias="tableColMergeLeft">Proszę ustaw kursor po lewej stronie dwóch komórek, które chcesz połączyć</key>
     <key alias="tableSplitNotSplittable">Nie możesz podzielić komórki, która nie była wcześniej połączona.</key>
-    <key alias="xsltErrorHeader">Błąd w źródle XSLT</key>
-    <key alias="xsltErrorText">Plik XSLT nie został zapisany, ponieważ wystąpiły błędy</key>
     <key alias="missingPropertyEditorErrorMessage">Wystąpił błąd konfiguracji związany z typem danych użytych we właściwościach, proszę sprawdź typ danych</key>
   </area>
   <area alias="general">
@@ -1140,11 +1138,6 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
     <key alias="templateErrorText">Proszę się upewnić że nie ma dwóch szablonów o tym samym aliasie</key>
     <key alias="templateSavedHeader">Szablon został zapisany</key>
     <key alias="templateSavedText">Szablon został zapisany bez żadnych błędów!</key>
-    <key alias="xsltErrorHeader">Nie zapisano XSLT</key>
-    <key alias="xsltErrorText">XSLT zawiera błędy</key>
-    <key alias="xsltPermissionErrorText">Nie można zapisać XSLT, sprawdź uprawnienia dostępu do pliku</key>
-    <key alias="xsltSavedHeader">Zapisano XSLT</key>
-    <key alias="xsltSavedText">XSLT nie zawiera błedów</key>
     <key alias="contentUnpublished">Cofnięto publikację treści</key>
     <key alias="partialViewSavedHeader">Częściowy Widok został zapisany</key>
     <key alias="partialViewSavedText">Częściowy Widok został zapisany bez błędów!</key>
@@ -1500,7 +1493,6 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
     <key alias="scripts">Skrypty</key>
     <key alias="stylesheets">Arkusze stylów</key>
     <key alias="templates">Szablony</key>
-    <key alias="xslt">Pliki XSLT</key>
     <key alias="analytics">Analizy</key>
 	<key alias="partialViews">Częściowe Widoki</key>
     <key alias="partialViewMacros">Pliki Makro Częściowych Widoków</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
index 1f3d3d9120..e3ed402e52 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
@@ -256,8 +256,6 @@
     <key alias="stylesNoStylesOnPage">Nenhum estilo ativo disponível</key>
     <key alias="tableColMergeLeft">Favor colocar o cursos à esquerda das duas células que deseja mesclar</key>
     <key alias="tableSplitNotSplittable">Você não pode dividir uma célula que não foi mesclada.</key>
-    <key alias="xsltErrorHeader">Erro na fonta XSLT</key>
-    <key alias="xsltErrorText">O XSLT não foi salvo porque contém erro(s)</key>
   </area>
   <area alias="general">
     <key alias="about">Sobre</key>
@@ -690,11 +688,6 @@ Você pode publicar esta página e todas suas sub-páginas ao selecionar <em>pub
     <key alias="templateErrorText">Favor confirmar que não existem 2 modelos com o mesmo apelido</key>
     <key alias="templateSavedHeader">Modelo salvo</key>
     <key alias="templateSavedText">Modelo salvo sem nenhum erro!</key>
-    <key alias="xsltErrorHeader">XSLT não salvo</key>
-    <key alias="xsltErrorText">XSLT continha um erro</key>
-    <key alias="xsltPermissionErrorText">XSLT não pode ser salvo, cheque as permissões do arquivo</key>
-    <key alias="xsltSavedHeader">XSLT salvo</key>
-    <key alias="xsltSavedText">Nenhum erro no XSLT</key>
   </area>
   <area alias="stylesheet">
     <key alias="aliasHelp">Use sintaxe CSS ex: h1, .redHeader, .blueTex</key>
@@ -858,7 +851,6 @@ Para fechar a tarefa de tradução vá até os detalhes e clique no botão "Fech
     <key alias="scripts">Scripts</key>
     <key alias="stylesheets">Stylesheets</key>
     <key alias="templates">Modelos</key>
-    <key alias="xslt">Arquivos XSLT</key>
     <key alias="userPermissions">Permissões de usuário</key>
     <key alias="userTypes">Tipos de Usuários</key>
     <key alias="users">Usuários</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
index d234ab0e62..27a67a2c5e 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
@@ -523,8 +523,6 @@
     <key alias="stylesNoStylesOnPage">Не определен ни один доступный стиль</key>
     <key alias="tableColMergeLeft">Поместите курсор в левую из двух ячеек, которые хотите объединить</key>
     <key alias="tableSplitNotSplittable">Нельзя разделить ячейку, которая не была до этого объединена</key>
-    <key alias="xsltErrorHeader">Ошибка в XSLT-документе</key>
-    <key alias="xsltErrorText">XSLT-документ не был сохранен, так как он содержит одну или несколько ошибок</key>
   </area>
   <area alias="general">
     <key alias="about">О системе</key>
@@ -1387,11 +1385,6 @@
     <key alias="templateSavedText">Шаблон сохранен без ошибок</key>
     <key alias="validationFailedHeader">Проверка значений</key>
     <key alias="validationFailedMessage">Ошибки, найденные при проверке значений, должны быть исправлены, чтобы было возможно сохранить документ</key>
-    <key alias="xsltErrorHeader">XSLT-документ не сохранен</key>
-    <key alias="xsltErrorText">XSLT-документ содержит одну или несколько ошибок</key>
-    <key alias="xsltPermissionErrorText">XSLT-документ не может быть сохранен, проверьте установки файловых разрешений</key>
-    <key alias="xsltSavedHeader">XSLT-документ сохранен</key>
-    <key alias="xsltSavedText">Ошибок в XSLT-документе нет</key>
     <key alias="deleteUserGroupsSuccess">Удалено %0% групп пользователей</key>
     <key alias="deleteUserGroupSuccess">'%0%' была удалена</key>
     <key alias="enableUsersSuccess">Активировано %0% пользователей</key>
@@ -1647,7 +1640,6 @@
     <key alias="stylesheets">Стили CSS</key>
     <key alias="templates">Шаблоны</key>
     <key alias="users">Пользователи</key>
-    <key alias="xslt">Файлы XSLT</key>
   </area>
   <area alias="update">
     <key alias="updateAvailable">Доступны обновления</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
index d1fcb46576..b71a702e70 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
@@ -326,8 +326,6 @@
     <key alias="stylesNoStylesOnPage">Det finns inga tillgängliga stilar</key>
     <key alias="tableColMergeLeft">Placera markören i den vänstra av de två celler du vill slå ihop</key>
     <key alias="tableSplitNotSplittable">Du kan inte dela en cell som inte är ihopslagen.</key>
-    <key alias="xsltErrorHeader">Fel i XSLT-scriptet</key>
-    <key alias="xsltErrorText">XSLT-scriptet har inte sparats eftersom det innehåller ett eller flera fel</key>
   </area>
   <area alias="general">
     <key alias="about">Om</key>
@@ -756,11 +754,6 @@
     <key alias="templateErrorText">Kontrollera att du inte har två sidmallar med samma alias</key>
     <key alias="templateSavedHeader">Sidmallen har sparats</key>
     <key alias="templateSavedText">Sidmallen sparades utan fel</key>
-    <key alias="xsltErrorHeader">XSLT-scriptet sparades inte</key>
-    <key alias="xsltErrorText">XSLT-scriptet innehöll ett fel</key>
-    <key alias="xsltPermissionErrorText">XSLT-scripet kunde inte sparas, kontrollera filrättigheterna</key>
-    <key alias="xsltSavedHeader">XSLT-scriptet har sparats</key>
-    <key alias="xsltSavedText">Inga fel i XSLT-scriptet</key>
   </area>
   <area alias="stylesheet">
     <key alias="aliasHelp">Använder CSS-syntax, t ex: h1, .redHeader, .blueTex</key>
@@ -905,7 +898,6 @@
     <key alias="scripts">Skript</key>
     <key alias="stylesheets">Stilmallar</key>
     <key alias="templates">Sidmallar</key>
-    <key alias="xslt">XSLT-filer</key>
     <key alias="userPermissions">Användarrättigheter</key>
     <key alias="userTypes">Användartyper</key>
     <key alias="users">Användare</key>
@@ -959,4 +951,4 @@
     <key alias="translator">Översättare</key>
     <key alias="yourProfile">Din profil</key>
   </area>
-</language>
\ No newline at end of file
+</language>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/tr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/tr.xml
index 0439b09b3a..a26459b23e 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/tr.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/tr.xml
@@ -324,8 +324,6 @@
     <key alias="stylesNoStylesOnPage">Henüz aktif stilleri</key>
     <key alias="tableColMergeLeft">Birleştirmek istediğiniz iki hücre solundaki imleci Lütfen</key>
     <key alias="tableSplitNotSplittable">Sen birleştirilmiş henüz bir hücreyi bölemezsiniz.</key>
-    <key alias="xsltErrorHeader">XSLT kaynak hatae</key>
-    <key alias="xsltErrorText">O hatayı içerdiği XSLT, kaydedilmemiş (ler))</key>
     <key alias="missingPropertyEditorErrorMessage">Bu özellik için kullanılan veri türüne sahip bir yapılandırma hatası var, veri türünü kontrol edin</key>
   </area>
   <area alias="general">
@@ -892,11 +890,6 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="templateErrorText">Aynı isim ile 2 template bulunmadığından emin olun</key>
     <key alias="templateSavedHeader">Template kaydedildi</key>
     <key alias="templateSavedText">Template sorunsuz kaydedildi!</key>
-    <key alias="xsltErrorHeader">XSLT kaydedilmedi</key>
-    <key alias="xsltErrorText">XSLT hata içeriyor</key>
-    <key alias="xsltPermissionErrorText">XSLT kaydedilemedi, dosya izinlerini kontrol edin</key>
-    <key alias="xsltSavedHeader">XSLT kaydedildi</key>
-    <key alias="xsltSavedText">XSLT'de hata içermiyor</key>
     <key alias="contentUnpublished">İçerik yayından kaldırıldı</key>
     <key alias="partialViewSavedHeader">Partial view kaydedildi</key>
     <key alias="partialViewSavedText">Partial view sorunsuz kaydedildi!</key>
@@ -1079,7 +1072,6 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="scripts">Scriptler</key>
     <key alias="stylesheets">Stil dosyaları</key>
     <key alias="templates">Şablonlar</key>
-    <key alias="xslt">XSLT Dosyaları</key>
     <key alias="analytics">Analitikler</key>
   </area>
   <area alias="update">
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
index 9513536c98..502dfabc4c 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
@@ -403,8 +403,6 @@
     <key alias="stylesNoStylesOnPage">没有可用的样式</key>
     <key alias="tableColMergeLeft">请把光标放在您要合并的两个单元格中的左边单元格</key>
     <key alias="tableSplitNotSplittable">非合并单元格不能分离。</key>
-    <key alias="xsltErrorHeader">XSLT源码出错</key>
-    <key alias="xsltErrorText">XSLT未保存，因为包含错误。</key>
     <key alias="missingPropertyEditorErrorMessage">此属性使用的数据类型存在配置错误, 请检查数据类型</key>
   </area>
   <area alias="general">
@@ -990,11 +988,6 @@
     <key alias="templateErrorText">模板别名相同</key>
     <key alias="templateSavedHeader">模板已保存</key>
     <key alias="templateSavedText">模板保存，无错误。</key>
-    <key alias="xsltErrorHeader">XSLT未保存</key>
-    <key alias="xsltErrorText">XSLT有错误</key>
-    <key alias="xsltPermissionErrorText">XSLT无法保存，请检查权限。</key>
-    <key alias="xsltSavedHeader">XSLT已保存</key>
-    <key alias="xsltSavedText">XSLT无错误</key>
     <key alias="contentUnpublished">未发布内容</key>
     <key alias="partialViewSavedHeader">片段视图已保存</key>
     <key alias="partialViewSavedText">片段视图保存，无错误。</key>
@@ -1245,7 +1238,6 @@
     <key alias="scripts">脚本</key>
     <key alias="stylesheets">样式表</key>
     <key alias="templates">模板</key>
-    <key alias="xslt">XSLT文件</key>
     <key alias="userPermissions">用户权限</key>
     <key alias="users">Users</key>
     <key alias="partialViews">分部视图</key>
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx b/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx
index e8884acfe0..17cab262e6 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx
@@ -132,7 +132,7 @@
         <table border="0" style="width: 100%;">
             <tr>
                 <td>
-                    <strong style="color: Red;">Remember:</strong> .xslt and .ascx files for your macros
+                    <strong style="color: Red;">Remember:</strong> .ascx files for your macros
                     will be added automaticly, but you will still need to add <strong>assemblies</strong>,
                     <strong>images</strong> and <strong>script files</strong> manually to the list below.
                 </td>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/search.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/search.aspx
deleted file mode 100644
index bb1b7a6f3c..0000000000
--- a/src/Umbraco.Web.UI/umbraco/dialogs/search.aspx
+++ /dev/null
@@ -1,48 +0,0 @@
-<%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true"
-    CodeBehind="search.aspx.cs" Inherits="umbraco.presentation.dialogs.search" %>
-<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
-
-<asp:Content ID="header1" ContentPlaceHolderID="head" runat="server">
-<script type="text/javascript">
-    function openItem(id) {
-
-        var url = "";
-
-        switch (UmbClientMgr.mainWindow().UmbClientMgr.appActions().getCurrApp().toLowerCase()) {
-            case "media":
-                url = "editMedia.aspx";
-                break;
-            case "content":
-                url = "editContent.aspx";
-                break;
-            case "member":
-                url = "members/editMember.aspx";
-                break;
-            default:
-                url = "editContent.aspx";
-        }
-        url = url + "?id=" + id;
-
-
-        UmbClientMgr.contentFrame(url);
-        UmbClientMgr.closeModalWindow();
-    }
-</script>
-</asp:Content>
-<asp:Content ID="Content1" ContentPlaceHolderID="body" runat="server">
-    <cc1:Pane ID="Wizard" runat="server">
-        <h3>Search</h3>
-        <p>
-        <asp:TextBox ID="keyword" runat="server" Width="500" CssClass="bigInput"></asp:TextBox>
-            <asp:Button ID="searchButton" runat="server" Text="Search" onclick="search_Click" /><br />
-        </p>
-        <asp:Panel ID="nothingFound" runat="server" Visible="false">
-        <p class="error">No results match</p></asp:Panel>
-        <asp:Xml ID="searchResult" runat="server" TransformSource="../xslt/searchResult.xslt"></asp:Xml>
-    </cc1:Pane>
-</asp:Content>
-<asp:Content ID="footer1" ContentPlaceHolderID="footer" runat="server">
-<script type="text/javascript">
-    jQuery(".bigInput").focus();
-</script>
-</asp:Content>
diff --git a/src/Umbraco.Web.UI/umbraco/settings/modals/ShowUmbracoTags.aspx b/src/Umbraco.Web.UI/umbraco/settings/modals/ShowUmbracoTags.aspx
deleted file mode 100644
index b36acbfca7..0000000000
--- a/src/Umbraco.Web.UI/umbraco/settings/modals/ShowUmbracoTags.aspx
+++ /dev/null
@@ -1,60 +0,0 @@
-<%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoPage.Master" Title="ShowUmbracoTags"
-    Codebehind="ShowUmbracoTags.aspx.cs" AutoEventWireup="True"
-  Inherits="umbraco.cms.presentation.settings.modal.ShowUmbracoTags" %>
-<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
-<%@ Import Namespace="Umbraco.Core.IO" %>
-
-<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
-    <style type="text/css">
-    code{display: block; background: #999; color: #fff; padding: 5px; margin-bottom: 10px;white-space:normal;text-wrap:normal;}
-    small{color: #000 !Important; margin-bottom: 10px; display: block;}
-    </style>
-</asp:Content>
-
-<asp:Content ID="Content2" ContentPlaceHolderID="body" runat="server">
-    <cc1:Pane ID="Pane7" Style="padding-right: 10px; padding-left: 10px; padding-bottom: 10px;
-            padding-top: 10px; text-align: left" runat="server">
-            <table id="Table1" width="100%">
-              <tr><th width="120">Insert field</th><td>
-              <code>
-                &lt;umbraco:Item field="bodyText" runat="server"/&gt;
-              </code>
-              <small>
-              Fetches a value from the current page.
-              </small>
-              </td></tr>
-              <tr><th width="120">Insert macro</th><td>
-              <code>
-              &lt;umbraco:Macro macroAlias="MacroAlias" Alias="MacroAlias" runat="server"/&gt;
-              </code>
-              <small>Inserts a macro into the template</small>
-              </td></tr>
-              <tr><th width="120">Load child template</th><td>
-              <code>
-                &lt;asp:ContentPlaceHolder runat="server" id="<%= alias %>ContentPlaceHolder" /&gt;
-              </code>
-              <small>
-              This is the default placeholder for content stored in a child template using this exact template as it's master template.
-              </small>
-              </td></tr>
-              <tr><th width="120">Disable Request Validation</th><td>
-              <code>
-              &lt;umbraco:DisableRequestValidation runat="server"/&gt;
-              </code>
-              <small>Disable ASP.NET request validation. It's the same as adding a enableEventValidation="false" to a page directive (but this is not possible in Umbraco as all pages use the same ASPX page for all pages)</small>
-              </td></tr>
-              <tr><th width="120">MetaBlogApi / Content Channels</th><td>
-              <code>
-              &lt;link rel="EditURI" type="application/rsd+xml" href="http://<%=Request.ServerVariables["SERVER_NAME"] %><%= IOHelper.ResolveUrl(SystemDirectories.Umbraco)%>/channels/rsd.aspx" /&gt;
-              <br /><br />
-              &lt;link rel="wlwmanifest" type="application/wlwmanifest+xml" href="http://<%=Request.ServerVariables["SERVER_NAME"] %><%= IOHelper.ResolveUrl(SystemDirectories.Umbraco)%>/channels/wlwmanifest.aspx" /&gt;
-              </code>
-              <small>
-              Insert the above two elements to the head element to gain optimal support for
-              using the MetaBlog Apis with 3rd party clients and to enable autodiscovery for Windows
-              Live Writer.
-              </small>
-              </td></tr>
-            </table>
-    </cc1:Pane>
-</asp:Content>
diff --git a/src/Umbraco.Web.UI/umbraco/settings/scripts/editScript.aspx b/src/Umbraco.Web.UI/umbraco/settings/scripts/editScript.aspx
deleted file mode 100644
index beef2a401f..0000000000
--- a/src/Umbraco.Web.UI/umbraco/settings/scripts/editScript.aspx
+++ /dev/null
@@ -1,60 +0,0 @@
-<%@ Page Language="C#" MasterPageFile="../../masterpages/umbracoPage.Master" AutoEventWireup="true"
-    CodeBehind="editScript.aspx.cs" Inherits="umbraco.cms.presentation.settings.scripts.editScript"
-    ValidateRequest="False" %>
-<%@ Import Namespace="Umbraco.Core" %>
-<%@ Import Namespace="Umbraco.Web.Mvc" %>
-
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-
-<asp:Content ID="DocTypeContent" ContentPlaceHolderID="DocType" runat="server">
-    <!DOCTYPE html>
-</asp:Content>
-
-<asp:Content ContentPlaceHolderID="head" runat="server">
-    
-    <umb:JsInclude ID="JsInclude1" runat="server" FilePath="Editors/EditScript.js" PathNameAlias="UmbracoClient" />
-
-    <script language="javascript" type="text/javascript">
-
-        (function ($) {
-            $(document).ready(function () {
-                var editor = new Umbraco.Editors.EditScript({
-                    nameTxtBox: $('#<%= NameTxt.ClientID %>'),
-                    originalFileName: '<%= NameTxt.Text %>',
-                    saveButton: $("#<%= ((Control)SaveButton).ClientID %>"),
-                    restServiceLocation: "<%= Url.GetSaveFileServicePath() %>",
-                    editorSourceElement: $('#<%= editorSource.ClientID %>'),
-                    treeSyncPath: "<%= ScriptTreeSyncPath %>",
-                    lttPathElement: $('#<%= lttPath.ClientID %>')
-                });
-                editor.init();
-                
-                //bind save shortcut
-                UmbClientMgr.appActions().bindSaveShortCut();
-            });
-        })(jQuery);
-        
-    </script>
-</asp:Content>
-<asp:Content ContentPlaceHolderID="body" runat="server">
-    <cc1:TabView ID="Panel1" runat="server" hasMenu="true">
-         <cc1:Pane ID="Pane7" runat="server" >
-            <cc1:PropertyPanel ID="pp_source" runat="server">
-                <cc1:CodeArea ID="editorSource" CodeBase="JavaScript" ClientSaveMethod="doSubmit"
-                    runat="server" AutoResize="false" />
-            </cc1:PropertyPanel>
-         </cc1:Pane>
-
-        <cc1:Pane ID="Pane8" runat="server" >
-            <cc1:PropertyPanel runat="server" ID="pp_name">
-                <asp:TextBox ID="NameTxt" runat="server"></asp:TextBox>
-            </cc1:PropertyPanel>
-            <cc1:PropertyPanel runat="server" ID="pp_path">
-                <asp:Literal ID="lttPath" runat="server" />
-            </cc1:PropertyPanel>
-            
-        </cc1:Pane>
-    </cc1:TabView>
-    
-</asp:Content>
diff --git a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx b/src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx
deleted file mode 100644
index 81eb204650..0000000000
--- a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx
+++ /dev/null
@@ -1,54 +0,0 @@
-<%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoPage.Master" CodeBehind="editstylesheet.aspx.cs" AutoEventWireup="True"
-    Inherits="Umbraco.Web.UI.Umbraco.Settings.Stylesheet.EditStyleSheet" ValidateRequest="False" %>
-<%@ Import Namespace="Umbraco.Core" %>
-<%@ Import Namespace="Umbraco.Web.Mvc" %>
-
-<%@ Register TagPrefix="cdf" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
-
-<asp:Content ContentPlaceHolderID="head" runat="server">
-    <cdf:JsInclude runat="server" FilePath="Editors/EditStyleSheet.js" PathNameAlias="UmbracoClient"></cdf:JsInclude>
-
-    <script type="text/javascript">
-
-        (function ($) {
-            $(document).ready(function () {
-                var editor = new Umbraco.Editors.EditStyleSheet({
-                    nameTxtBox: $('#<%= NameTxt.ClientID %>'),
-                    originalFileName: '<%= NameTxt.Text %>',
-                    saveButton: $("#<%= ((Control)SaveButton).ClientID %>"),
-                    editorSourceElement: $('#<%= editorSource.ClientID %>'),
-                    restServiceLocation: "<%= Url.GetSaveFileServicePath() %>",
-                    treeSyncPath: "<%= TreeSyncPath %>",
-                    lttPathElement: $('#<%= lttPath.ClientID %>')
-                });
-                editor.init();
-
-                //bind save shortcut
-                UmbClientMgr.appActions().bindSaveShortCut();
-            });
-
-            })(jQuery);
-
-    </script>
-</asp:Content>
-
-<asp:Content ContentPlaceHolderID="body" runat="server">
-    <cc1:TabView ID="Panel1" runat="server" CssClass="panel" hasMenu="true">
-
-        <cc1:Pane ID="Pane7" CssClass="pane" runat="server">
-            <cc1:PropertyPanel ID="pp_source" runat="server">
-                <cc1:CodeArea ID="editorSource" CodeBase="Css" AutoResize="false" runat="server" />
-            </cc1:PropertyPanel>
-        </cc1:Pane>
-
-        <cc1:Pane ID="Pane8" CssClass="pane" runat="server">
-            <cc1:PropertyPanel ID="pp_name" runat="server">
-                <asp:TextBox ID="NameTxt" Width="350px" runat="server"></asp:TextBox>
-            </cc1:PropertyPanel>
-            <cc1:PropertyPanel ID="pp_path" runat="server">
-                <asp:Literal ID="lttPath" runat="server"></asp:Literal>
-            </cc1:PropertyPanel>
-        </cc1:Pane>
-    </cc1:TabView>
-</asp:Content>
diff --git a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx.cs b/src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx.cs
deleted file mode 100644
index 7cb1d62410..0000000000
--- a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace Umbraco.Web.UI.Umbraco.Settings.Stylesheet
-{
-    public partial class EditStyleSheet : global::umbraco.cms.presentation.settings.stylesheet.editstylesheet
-    {
-    }
-}
diff --git a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx.designer.cs b/src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx.designer.cs
deleted file mode 100644
index 7788269b14..0000000000
--- a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.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.Settings.Stylesheet {
-
-
-    public partial class EditStyleSheet {
-    }
-}
diff --git a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx b/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx
deleted file mode 100644
index dc61833366..0000000000
--- a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx
+++ /dev/null
@@ -1,67 +0,0 @@
-<%@ Page Language="c#" MasterPageFile="../../../masterpages/umbracoPage.Master" CodeBehind="EditStyleSheetProperty.aspx.cs"
-  AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.Settings.Stylesheet.Property.EditStyleSheetProperty"
-  ValidateRequest="False" %>
-<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
-
-<asp:Content ContentPlaceHolderID="body" runat="server">
-  <cc1:UmbracoPanel ID="Panel1" runat="server" Text="Edit stylesheet property" Width="432px" Height="176px" hasMenu="true">
-    <cc1:Pane ID="Pane7" CssClass="pane" runat="server">
-      <table cellspacing="0" cellpadding="4" border="0">
-        <tr>
-          <th width="30%">
-              <%=Services.TextService.Localize("name")%>
-          </th>
-          <td class="propertyContent">
-            <asp:HiddenField runat="server" ID="OriginalName"/>
-            <asp:TextBox ID="NameTxt" Width="350px" runat="server" /><br />
-            <small><%=Services.TextService.Localize("stylesheet/nameHelp")%></small>
-          </td>
-        </tr>
-        <tr>
-          <th width="30%">
-            <%=Services.TextService.Localize("alias")%>:
-          </th>
-          <td class="propertyContent">
-            <asp:TextBox ID="AliasTxt" Width="350px" runat="server" /><br />
-            <small><%=Services.TextService.Localize("stylesheet/aliasHelp")%></small>
-          </td>
-        </tr>
-        <tr>
-          <th width="30%">
-              <%=Services.TextService.Localize("styles")%>
-          </th>
-          <td class="propertyContent">
-            <asp:TextBox ID="Content" Style="width: 350px" TextMode="MultiLine" runat="server" />
-            <br />
-            <br />
-          </td>
-        </tr>
-        <tr>
-          <th width="30%">
-              <%=Services.TextService.Localize("preview")%>
-          </th>
-          <td class="propertyContent">
-            <div id="preview" style="padding: 10px; border: 1px solid #ccc; width: 330px;">
-              <div runat="server" id="prStyles">
-                a b c d e f g h i j k l m n o p q r s t u v w x t z
-                <br />
-                A B C D E F G H I J K L M N O P Q R S T U V W X Y Z<br />
-                1 2 3 4 5 6 7 8 9 0 � � $ % & (.,;:'\"!?)
-                <br />
-                <br />
-                Just keep examining every bid quoted for zinc etchings.
-              </div>
-            </div>
-          </td>
-        </tr>
-      </table>
-    </cc1:Pane>
-  </cc1:UmbracoPanel>
-
-    <script type="text/javascript">
-        jQuery(document).ready(function () {
-            UmbClientMgr.appActions().bindSaveShortCut();
-        });
-    </script>
-
-</asp:Content>
diff --git a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.cs b/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.cs
deleted file mode 100644
index 10fbd19bb9..0000000000
--- a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace Umbraco.Web.UI.Umbraco.Settings.Stylesheet.Property
-{
-    public partial class EditStyleSheetProperty : global::umbraco.cms.presentation.settings.stylesheet.EditStyleSheetProperty
-    {
-    }
-}
diff --git a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.designer.cs b/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.designer.cs
deleted file mode 100644
index a91ca8778c..0000000000
--- a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.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.Settings.Stylesheet.Property {
-
-
-    public partial class EditStyleSheetProperty {
-    }
-}
diff --git a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx
deleted file mode 100644
index 1e38071822..0000000000
--- a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx
+++ /dev/null
@@ -1,89 +0,0 @@
-<%@ Page Language="C#" MasterPageFile="../../masterpages/umbracoPage.Master" AutoEventWireup="True"
-    CodeBehind="EditView.aspx.cs" Inherits="Umbraco.Web.UI.Umbraco.Settings.Views.EditView"
-    ValidateRequest="False" %>
-
-<%@ OutputCache Location="None" %>
-
-<%@ Import Namespace="Umbraco.Core" %>
-<%@ Import Namespace="Umbraco.Core.IO" %>
-<%@ Import Namespace="Umbraco.Web" %>
-<%@ Import Namespace="Umbraco.Web.Mvc" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-
-<asp:Content ID="DocTypeContent" ContentPlaceHolderID="DocType" runat="server">
-    <!DOCTYPE html>
-</asp:Content>
-
-<asp:Content ContentPlaceHolderID="head" runat="server">
-    
-    <umb:JsInclude ID="JsInclude1" runat="server" FilePath="Editors/EditView.js" PathNameAlias="UmbracoClient" />
-
-    <script type="text/javascript">
-
-        //we need to have this as a global object since we reference this object with callbacks.
-        var editViewEditor;
-
-        (function ($) {
-            $(document).ready(function () {
-                //create and assign a new EditView object
-                editViewEditor = new Umbraco.Editors.EditView({
-                    treeSyncPath: "<%=TemplateTreeSyncPath%>",
-                    currentTreeType: "<%=CurrentTreeType%>",
-                    editorType: "<%= EditorType.ToString() %>",
-                    originalFileName: "<%=OriginalFileName %>",
-                    restServiceLocation: "<%= Url.GetSaveFileServicePath() %>",                    
-                    masterPageDropDown: $("#<%= MasterTemplate.ClientID %>"),
-                    nameTxtBox: $("#<%= NameTxt.ClientID %>"),
-                    aliasTxtBox: $("#<%= AliasTxt.ClientID %>"),
-                    saveButton: $("#<%= ((Control)SaveButton).ClientID %>"),
-                    templateId: '<%= Request.CleanForXss("templateID") %>',
-                    codeEditorElementId: '<%= editorSource.ClientID %>',
-                    modalUrl: "<%= IOHelper.ResolveUrl(SystemDirectories.Umbraco) %>/dialogs/editMacro.aspx"
-                });
-
-                //initialize it.
-                editViewEditor.init();
-                
-                //bind save shortcut
-                UmbClientMgr.appActions().bindSaveShortCut();
-            });            
-        })(jQuery);
-       
-    </script>
-
-</asp:Content>
-
-
-<asp:Content ContentPlaceHolderID="body" runat="server">
-    
-    <cc1:TabView ID="Panel1" runat="server" hasMenu="true">
-        
-         <cc1:Pane ID="Pane8" runat="server" >
-            <cc1:PropertyPanel ID="pp_source" runat="server">
-                <cc1:CodeArea ID="editorSource" runat="server" CodeBase="Razor" ClientSaveMethod="doSubmit" AutoResize="false" />
-            </cc1:PropertyPanel>
-         </cc1:Pane>
-            
-        <cc1:Pane ID="Pane7" runat="server" >
-            
-            <cc1:PropertyPanel ID="pp_name" runat="server">
-                <asp:Literal runat="server" ID="PathPrefix"></asp:Literal>
-                <asp:TextBox ID="NameTxt" runat="server"></asp:TextBox>
-            </cc1:PropertyPanel>
-            
-            <cc1:PropertyPanel ID="pp_alias" runat="server">
-                <asp:TextBox ID="AliasTxt" runat="server"></asp:TextBox>
-            </cc1:PropertyPanel>
-
-            <cc1:PropertyPanel ID="pp_masterTemplate" runat="server">
-                <asp:DropDownList ID="MasterTemplate" runat="server" />
-            </cc1:PropertyPanel>
-
-            
-        </cc1:Pane>
-
-        
-    </cc1:TabView>
-
-</asp:Content>
diff --git a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs
deleted file mode 100644
index 68178aeef6..0000000000
--- a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs
+++ /dev/null
@@ -1,281 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
-using Umbraco.Web.Trees;
-using Umbraco.Web.UI.Controls;
-using umbraco;
-using umbraco.cms.businesslogic.template;
-using umbraco.cms.presentation.Trees;
-using Umbraco.Core;
-using umbraco.uicontrols;
-using Umbraco.Core.Configuration;
-using Umbraco.Web.UI.Pages;
-using Umbraco.Core.Services;
-
-namespace Umbraco.Web.UI.Umbraco.Settings.Views
-{
-    public partial class EditView : UmbracoEnsuredPage
-    {
-        private Template _template;
-        public MenuButton SaveButton;
-
-        public EditView()
-        {
-            CurrentApp = Constants.Applications.Settings;
-        }
-
-        /// <summary>
-        /// The type of MVC/Umbraco view the editor is editing
-        /// </summary>
-        public enum ViewEditorType
-        {
-            Template,
-            PartialView,
-            PartialViewMacro
-        }
-
-        /// <summary>
-        /// Returns the type of view being edited
-        /// </summary>
-        protected ViewEditorType EditorType
-        {
-            get
-            {
-                if (_template != null) return ViewEditorType.Template;
-                if (Request.QueryString["treeType"].IsNullOrWhiteSpace() == false && Request.QueryString["treeType"].InvariantEquals("partialViewMacros")) return ViewEditorType.PartialViewMacro;
-                return ViewEditorType.PartialView;
-            }
-        }
-
-        protected string TemplateTreeSyncPath { get; private set; }
-
-        /// <summary>
-        /// This view is shared between different trees so we'll look for the query string
-        /// </summary>
-        protected string CurrentTreeType
-        {
-            get
-            {
-                if (Request.QueryString["treeType"].IsNullOrWhiteSpace())
-                {
-                    return Constants.Trees.PartialViews;
-                }
-                return Request.CleanForXss("treeType");
-            }
-        }
-
-        /// <summary>
-        /// Returns the original file name that the editor was loaded with
-        /// </summary>
-        /// <remarks>
-        /// this is used for editing a partial view
-        /// </remarks>
-        protected string OriginalFileName { get; private set; }
-
-        protected override void OnLoad(EventArgs e)
-        {
-            base.OnLoad(e);
-
-            if (!IsPostBack)
-            {
-
-                //configure screen for editing a template
-                if (_template != null)
-                {
-                    MasterTemplate.Items.Add(new ListItem(Services.TextService.Localize("none"), "0"));
-                    var selectedTemplate = string.Empty;
-
-                    foreach (var t in Template.GetAllAsList())
-                    {
-                        if (t.Id == _template.Id) continue;
-
-                        var li = new ListItem(t.Text, t.Id.ToString(CultureInfo.InvariantCulture));
-                        li.Attributes.Add("id", t.Alias.Replace(" ", "") + ".cshtml");
-                        MasterTemplate.Items.Add(li);
-                    }
-
-                    try
-                    {
-                        if (_template.MasterTemplate > 0)
-                            MasterTemplate.SelectedValue = _template.MasterTemplate.ToString(CultureInfo.InvariantCulture);
-                    }
-                    catch (Exception ex)
-                    {
-                        Current.Logger.Error<EditView>("An error occurred setting a master template id", ex);
-                    }
-
-                    MasterTemplate.SelectedValue = selectedTemplate;
-                    NameTxt.Text = _template.GetRawText();
-                    AliasTxt.Text = _template.Alias;
-                    editorSource.Text = _template.Design;
-                    PathPrefix.Visible = false;
-                }
-                else
-                {
-                    //configure editor for editing a file....
-
-                    NameTxt.Text = OriginalFileName;
-                    var svce = Current.Services.FileService;
-                    var file = EditorType == ViewEditorType.PartialView
-                        ? svce.GetPartialView(OriginalFileName)
-                        : svce.GetPartialViewMacro(OriginalFileName);
-                    editorSource.Text = file.Content;
-
-                    const string prefixFormat = "<span style=\"display: inline-block; height: 20px; line-height: 20px; margin-bottom: 0px; padding: 4px 6px;\">{0}</span>";
-                    PathPrefix.Text = string.Format(prefixFormat, EditorType == ViewEditorType.PartialView
-                        ? "Partials/"
-                        : "MacroPartials/");
-                }
-            }
-
-            ClientTools
-                .SetActiveTreeType(CurrentTreeType)
-                .SyncTree(TemplateTreeSyncPath, false);
-        }
-
-
-        protected override void OnInit(EventArgs e)
-        {
-            base.OnInit(e);
-
-            //check if a templateId is assigned, meaning we are editing a template
-            if (!Request.QueryString["templateID"].IsNullOrWhiteSpace())
-            {
-                _template = new Template(int.Parse(Request.QueryString["templateID"]));
-                TemplateTreeSyncPath = "-1,init," + _template.Path.Replace("-1,", "");
-            }
-            else if (!Request.QueryString["file"].IsNullOrWhiteSpace())
-            {
-                //we are editing a view (i.e. partial view)
-                OriginalFileName = HttpUtility.UrlDecode(Request.QueryString["file"]);
-
-                //TemplateTreeSyncPath = "-1,init," + Path.GetFileName(OriginalFileName);
-
-                TemplateTreeSyncPath = BaseTree.GetTreePathFromFilePath(OriginalFileName.TrimStart("MacroPartials/").TrimStart("Partials/"));
-            }
-            else
-            {
-                throw new InvalidOperationException("Cannot render the editor without a supplied templateId or a file");
-            }
-
-            Panel1.hasMenu = true;
-            var editor = Panel1.NewTabPage(Services.TextService.Localize("template"));
-            editor.Controls.Add(Pane8);
-
-            var props = Panel1.NewTabPage(Services.TextService.Localize("properties"));
-            props.Controls.Add(Pane7);
-
-
-            SaveButton = Panel1.Menu.NewButton();
-            SaveButton.Text = Services.TextService.Localize("save");
-            SaveButton.ButtonType = MenuButtonType.Primary;
-            SaveButton.ID = "save";
-            SaveButton.CssClass = "client-side";
-
-            Panel1.Text = Services.TextService.Localize("edittemplate");
-            pp_name.Text = Services.TextService.Localize("name");
-            pp_alias.Text = Services.TextService.Localize("alias");
-            pp_masterTemplate.Text = Services.TextService.Localize("mastertemplate");
-
-            // Editing buttons
-            MenuIconI umbField = editorSource.Menu.NewIcon();
-            umbField.ImageURL = SystemDirectories.Umbraco + "/images/editor/insField.gif";
-            umbField.OnClickCommand =
-                ClientTools.Scripts.OpenModalWindow(
-                    IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/umbracoField.aspx?objectId=" +
-                    editorSource.ClientID + "&tagName=UMBRACOGETDATA&mvcView=true", Services.TextService.Localize("template/insertPageField"), 640, 550);
-            umbField.AltText = Services.TextService.Localize("template/insertPageField");
-
-
-            // TODO: Update icon
-            MenuIconI umbDictionary = editorSource.Menu.NewIcon();
-            umbDictionary.ImageURL = GlobalSettings.Path + "/images/editor/dictionaryItem.gif";
-            umbDictionary.OnClickCommand =
-                ClientTools.Scripts.OpenModalWindow(
-                    IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/umbracoField.aspx?objectId=" +
-                    editorSource.ClientID + "&tagName=UMBRACOGETDICTIONARY&mvcView=true", Services.TextService.Localize("template/insertDictionaryItem"),
-                    640, 550);
-            umbDictionary.AltText = "Insert umbraco dictionary item";
-
-            var macroSplitButton = new InsertMacroSplitButton
-                {
-                    ClientCallbackInsertMacroMarkup = "function(alias) {editViewEditor.insertMacroMarkup(alias);}",
-                    ClientCallbackOpenMacroModel = "function(alias) {editViewEditor.openMacroModal(alias);}"
-                };
-            editorSource.Menu.InsertNewControl(macroSplitButton, 40);
-
-            MenuIconI umbTemplateQueryBuilder = editorSource.Menu.NewIcon();
-            umbTemplateQueryBuilder.ImageURL = SystemDirectories.Umbraco + "/images/editor/inshtml.gif";
-            umbTemplateQueryBuilder.OnClickCommand = "editViewEditor.openQueryModal()";
-            umbTemplateQueryBuilder.AltText = "Open query builder";
-
-            if (_template == null)
-            {
-                InitializeEditorForPartialView();
-            }
-            else
-            {
-                InitializeEditorForTemplate();
-            }
-
-        }
-
-        protected override void OnPreRender(EventArgs e)
-        {
-            base.OnPreRender(e);
-            ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference("../webservices/codeEditorSave.asmx"));
-            ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference("../webservices/legacyAjaxCalls.asmx"));
-        }
-
-        /// <summary>
-        /// Configure the editor for partial view editing
-        /// </summary>
-        private void InitializeEditorForPartialView()
-        {
-            pp_masterTemplate.Visible = false;
-            pp_alias.Visible = false;
-            pp_name.Text = "Filename";
-        }
-
-        /// <summary>
-        /// Configure the editor for editing a template
-        /// </summary>
-        private void InitializeEditorForTemplate()
-        {
-
-            //TODO: implement content placeholders, etc... just like we had in v5
-
-            editorSource.Menu.InsertSplitter();
-
-            MenuIconI umbRenderBody = editorSource.Menu.NewIcon();
-            umbRenderBody.ImageURL = SystemDirectories.Umbraco + "/images/editor/renderbody.gif";
-            //umbContainer.AltText = Services.TextService.Localize("template/insertContentAreaPlaceHolder");
-            umbRenderBody.AltText = "Insert @RenderBody()";
-
-            umbRenderBody.OnClickCommand = "editViewEditor.insertRenderBody()";
-
-            MenuIconI umbSection = editorSource.Menu.NewIcon();
-            umbSection.ImageURL = SystemDirectories.Umbraco + "/images/editor/masterpagePlaceHolder.gif";
-            //umbContainer.AltText = Services.TextService.Localize("template/insertContentAreaPlaceHolder");
-            umbSection.AltText = "Insert Section";
-
-            umbSection.OnClickCommand = "editViewEditor.openSnippetModal('section')";
-
-            MenuIconI umbRenderSection = editorSource.Menu.NewIcon();
-            umbRenderSection.ImageURL = SystemDirectories.Umbraco + "/images/editor/masterpageContent.gif";
-            //umbContainer.AltText = Services.TextService.Localize("template/insertContentAreaPlaceHolder");
-            umbRenderSection.AltText = "Insert @RenderSection";
-
-            umbRenderSection.OnClickCommand = "editViewEditor.openSnippetModal('rendersection')";
-
-        }
-
-    }
-}
diff --git a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.designer.cs b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.designer.cs
deleted file mode 100644
index 6f8dea35aa..0000000000
--- a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.designer.cs
+++ /dev/null
@@ -1,132 +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.Settings.Views {
-
-
-    public partial class EditView {
-
-        /// <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>
-        /// Panel1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.TabView Panel1;
-
-        /// <summary>
-        /// Pane8 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Pane Pane8;
-
-        /// <summary>
-        /// pp_source control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.PropertyPanel pp_source;
-
-        /// <summary>
-        /// editorSource control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.CodeArea editorSource;
-
-        /// <summary>
-        /// Pane7 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Pane Pane7;
-
-        /// <summary>
-        /// pp_name control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.PropertyPanel pp_name;
-
-        /// <summary>
-        /// PathPrefix 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.Literal PathPrefix;
-
-        /// <summary>
-        /// NameTxt 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.TextBox NameTxt;
-
-        /// <summary>
-        /// pp_alias control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.PropertyPanel pp_alias;
-
-        /// <summary>
-        /// AliasTxt 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.TextBox AliasTxt;
-
-        /// <summary>
-        /// pp_masterTemplate control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.PropertyPanel pp_masterTemplate;
-
-        /// <summary>
-        /// MasterTemplate 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.DropDownList MasterTemplate;
-    }
-}
diff --git a/src/Umbraco.Web.UI/umbraco_client/CodeArea/UmbracoEditor.js b/src/Umbraco.Web.UI/umbraco_client/CodeArea/UmbracoEditor.js
deleted file mode 100644
index 96ef28f53c..0000000000
--- a/src/Umbraco.Web.UI/umbraco_client/CodeArea/UmbracoEditor.js
+++ /dev/null
@@ -1,163 +0,0 @@
-/// <reference path="/umbraco_client/Application/NamespaceManager.js" />
-
-Umbraco.Sys.registerNamespace("Umbraco.Controls.CodeEditor");
-
-(function($) {
-    Umbraco.Controls.CodeEditor.UmbracoEditor = function(isSimpleEditor, controlId) {
-
-        //initialize
-        var _isSimpleEditor = isSimpleEditor;
-        var _controlId = controlId;
-
-        if (!_isSimpleEditor && typeof(codeEditor) == "undefined") {
-            throw "CodeMirror editor not found!";
-        }
-
-        //create the inner object
-        var obj = {
-            _editor: (typeof(codeEditor) == "undefined" ? null : codeEditor), //the codemirror object
-            _control: $("#" + _controlId), //the original textbox as a jquery object
-            _cmSave: null,//the saved selection of the code mirror editor (used for IE)
-
-            IsSimpleEditor: typeof(CodeMirror) == "undefined" ? true : typeof(codeEditor) == "undefined" ? true : _isSimpleEditor,
-
-            GetCode: function() {
-                if (this.IsSimpleEditor) {
-                    return this._control.val();
-                }
-                else {
-                    //this is a wrapper for CodeMirror
-                    return this._editor.getValue();
-                }
-            },
-            SetCode: function(code) {
-                if (this.IsSimpleEditor) {
-                    this._control.val(code);
-                }
-                else {
-					//this is a wrapper for CodeMirror
-                    this._editor.focus();
-
-                    var codeChanged = this._editor.getValue() != code;
-                    var cursor = this._editor.doc.getCursor();
-
-                    this._editor.setValue(code);
-
-                    // Restore cursor position if the server saved code matches.
-                    if (!codeChanged)
-                        this._editor.setCursor(cursor);
-
-                    this._editor.focus();
-                }
-            },
-            GetSelection: function(code) {
-                if (this.IsSimpleEditor) {
-                    this._control.getSelection().text
-                }
-                else {
-                    //this is a wrapper for CodeMirror
-                    this._editor.getSelection();
-                }
-            },
-            Insert: function(open, end, txtEl, arg3) {
-                //arg3 gets appended to open, not actually sure why it's needed but we'll keep it for legacy, it's optional                
-                if (_isSimpleEditor) {
-                    if (navigator.userAgent.match('MSIE')) {
-                        this._IEInsertSelection(open, end, txtEl, arg3);
-                    }
-                    else {
-                        //if not ie, use jquery field select, it's easier                        
-                        var selection = jQuery("#" + txtEl).getSelection().text;
-                        var replace = (arg3) ? open + arg3 : open; //concat open and arg3, if arg3 specified
-                        if (end != "") {
-                            replace = replace + selection + end;
-                        }
-                        jQuery("#" + txtEl).replaceSelection(replace);
-                        jQuery("#" + txtEl).focus();
-                        this._insertSimple(open, end, txtEl, arg3);
-                    }
-                }
-                else {
-                    this._editor.focus(); //need to restore the focus to the editor body
-
-                    //if the saved selection (IE only) is not null, then               
-                    if (this._cmSave != null) {
-                        this._editor.selectLines(this._cmSave.start.line, this._cmSave.start.character, this._cmSave.end.line, this._cmSave.end.character);
-                    }
-
-                    var selection = this._editor.getSelection();
-
-                    var replace = (arg3) ? open + arg3 : open; //concat open and arg3, if arg3 specified
-                    if (end != "") {
-                        replace = replace + selection + end;
-                    }
-                    this._editor.replaceSelection(replace);
-                    this._editor.focus();
-                }
-            },
-            _IEInsertSelection: function(open, end, txtEl) {
-                var tArea = document.getElementById(txtEl);
-                tArea.focus();
-                open = (open) ? open : "";
-                end = (end) ? end : "";
-                var curSelect = tArea.currRange;
-                if (arguments[3]) {
-                    if (end == "") {
-                        curSelect.text = open + arguments[3];
-                    }
-                    else {
-                        curSelect.text = open + arguments[3] + curSelect.text + end;
-                    }
-                }
-                else {
-                    if (end == "") {
-                        curSelect.text = open;
-                    }
-                    else {
-                        curSelect.text = open + curSelect.text + end;
-                    }
-                }
-                curSelect.select();
-            },
-            _IESelectionHelper: function() {
-                /// <summary>
-                /// Because IE is lame, we have to continuously save the selections created by the user
-                /// in the editors so that when the selections are lost (i.e. the user types in a different text box
-                /// we'll need to restore the selection when they return focus
-                /// </summary>
-                if (document.all) {
-                    var _this = this;
-                    if (this._editor == null) {
-
-                        function storeCaret(editEl) {
-                            editEl.currRange = document.selection.createRange().duplicate();
-                        }
-
-                        //need to store the selection details on each event while editing content                        
-                        this._control.select(function() { storeCaret(this) });
-                        this._control.click(function() { storeCaret(this) });
-                        this._control.keyup(function() { storeCaret(this) });
-                    }
-                    else {
-
-                        /*
-                        //Removed as its not needed in codemirror2 apparently
-                        this._editor.options.cursorActivity = function() {
-                            _this._cmSave = {
-                                start: _this._editor.cursorPosition(true), //save start position
-                                end: _this._editor.cursorPosition(false) //save end position
-                            }
-                        }*/
-
-                    }
-                }
-            }
-        };
-
-        // obj._IESelectionHelper();
-
-        // alert(obj);
-
-        return obj;
-    };
-})(jQuery); 
diff --git a/src/Umbraco.Web.UI/umbraco_client/CodeArea/javascript.js b/src/Umbraco.Web.UI/umbraco_client/CodeArea/javascript.js
deleted file mode 100644
index 77c5557286..0000000000
--- a/src/Umbraco.Web.UI/umbraco_client/CodeArea/javascript.js
+++ /dev/null
@@ -1,191 +0,0 @@
-function resizeTextArea(textEditor, offsetX, offsetY) {
-    var clientHeight = getViewportHeight();
-    var clientWidth = getViewportWidth();
-
-    if (textEditor != null) {
-       // textEditor.style.width = (clientWidth - offsetX) + "px";
-        textEditor.style.height = (clientHeight - getY(textEditor) - offsetY) + "px";
-    }
-}
-
-function UmbracoCodeSnippet() {
-    this.BeginTag = "";
-    this.EndTag = "";
-    this.TargetId = "";
-    this.CursorPos = 0;
-}
-
-
-// Ctrl + S support
-var ctrlDown = false;
-var shiftDown = false;
-var keycode = 0;
-
-function shortcutCheckKeysDown(e) {
-
-    ctrlDown = e.ctrlKey;
-    shiftDown = e.shiftKey;
-    keycode = e.keyCode;
-
-    //save
-    // uncommented by NH 07-05-11 as it's been replaced by a native bindShortcutkey() method in the ClientManager
-/*
-    if (ctrlDown && keycode == 83) {
-        doSubmit();
-        if (window.addEventListener) {
-            e.preventDefault();
-        } else
-            return false;
-    }
-    */
-    //snippet
-    if (ctrlDown && keycode == 77) {
-        if (window.umbracoInsertSnippet) {
-            var snippetCode = umbracoInsertSnippet();
-            if (window.UmbEditor) {
-                UmbEditor.Insert(snippetCode.BeginTag, snippetCode.EndTag, snippetCode.TargetId);
-                if (window.addEventListener) {
-                    e.preventDefault();
-                } else
-                    return false;
-            }
-        }
-
-    }
-
-    //load the insert value dialog: ctrl + g
-    if (ctrlDown && keycode == 71) {
-        umbracoInsertField('', 'xsltInsertValueOf', '', 'felt', 750, 230, '');
-        if (window.addEventListener) {
-            e.preventDefault();
-        } else
-            return false;
-    }
-}
-
-function shortcutCheckKeysUp(e) {
-    ctrlDown = e.ctrlKey;
-    shiftDown = e.shiftKey;
-}
-
-function shortcutCheckKeysPressFirefox(e) {
-    if (ctrlDown && keycode == 83)
-        e.preventDefault();
-}
-
-if (window.addEventListener) {
-    document.addEventListener('keyup', shortcutCheckKeysUp, false);
-    document.addEventListener('keydown', shortcutCheckKeysDown, false);
-    document.addEventListener('keypress', shortcutCheckKeysPressFirefox, false);
-} else {
-    document.attachEvent("onkeyup", shortcutCheckKeysUp);
-    document.attachEvent("onkeydown", shortcutCheckKeysDown);
-}
-
-
-var tab = {
-    key: 9,
-    string: "\t",
-    nl2br: true,
-    tosp: true,
-    watching: {},
-    results: {},
-    $: function (id) {
-        return document.getElementById(id);
-    },
-
-    watch: function (obj) {
-        if (obj && this.$(obj)) {
-            this.watching["_" + obj] = this.$(obj);
-            this.addEvent(this.$(obj), "keydown", function (evt) {
-                var sct = tab.$(obj).scrollTop;
-                var l = tab.$(obj).value.length;
-                var evt = (evt) ? evt : ((window.event) ? event : null);
-
-                if (evt) {
-                    var elem = (evt.target) ? evt.target : ((evt.srcElement) ? evt.srcElement : null);
-
-                    if (elem) {
-                        var char_code = (evt.charCode) ? evt.charCode : ((evt.which) ? evt.which : evt.keyCode);
-
-                        if (char_code == tab.key) {
-                            if (tab.$(obj).attachEvent) {
-                                var range = document.selection.createRange();
-
-                                range.text = tab.string;
-                                range.moveStart("character", -1);
-                                //range.select();
-                            } else if (typeof tab.$(obj).selectionStart != "undefined") {
-                                var start = tab.$(obj).value.substr(0, tab.$(obj).selectionStart);
-                                var end = tab.$(obj).value.substr(tab.$(obj).selectionStart, l);
-                                var selection = tab.$(obj).value.replace(start, "").replace(end, "")
-                                tab.$(obj).value = start + tab.string + selection + end;
-                                tab.$(obj).setSelectionRange(start.length + 1, start.length + 1);
-                                tab.$(obj).scrollTop = sct;
-                            } else {
-                                tab.$(obj).value += tab.string;
-                            }
-
-                            if (evt.preventDefault) {
-                                evt.preventDefault();
-                                evt.stopPropagation();
-                            } else {
-                                evt.returnValue = false;
-                                evt.cancelBubble = true;
-                            }
-
-                            return false;
-                        }
-                    }
-                }
-            });
-        }
-    },
-
-    click: function (obj, fn) {
-        if (obj && this.$(obj)) {
-            this.addEvent(this.$(obj), "click", function () {
-                tab.results["_" + this.id.split("_")[1]] = tab.parse(tab.watching["_" + this.id.split("_")[1]].value);
-
-                if (fn && fn.constructor == Function) {
-                    fn();
-                }
-            });
-        }
-    },
-
-    get: function (obj) {
-        if (obj && this.$(obj)) {
-            return this.results["_" + obj];
-        }
-    },
-
-    parse: function (str) {
-        var str = (str) ? str : "";
-
-        if (str.length) {
-            if (this.tosp) {
-                str = str.replace(/\t/g, "&nbsp;&nbsp;&nbsp;");
-            }
-
-            if (this.nl2br) {
-                str = str.replace(/\r?\n/g, "<br />");
-            }
-        }
-
-        return str;
-    },
-
-    addEvent: function (obj, type, fn) {
-        if (obj.attachEvent) {
-            obj["e" + type + fn] = fn;
-            obj[type + fn] = function () {
-                obj["e" + type + fn](window.event);
-            }
-
-            obj.attachEvent("on" + type, obj[type + fn]);
-        } else {
-            obj.addEventListener(type, fn, false);
-        }
-    }
-};
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco_client/CodeArea/styles.css b/src/Umbraco.Web.UI/umbraco_client/CodeArea/styles.css
deleted file mode 100644
index 0a64e1e40e..0000000000
--- a/src/Umbraco.Web.UI/umbraco_client/CodeArea/styles.css
+++ /dev/null
@@ -1,8 +0,0 @@
- .CodeMirror { 
-        border: none !Important;
-        font-size: 15px !Important;
-    }
- .CodeMirror-gutter{background: none !Important; border: none; padding-right: 5px;}
- 
- span.cm-at{background: yellow !Important;}
- textarea.codepress{display: block; width: 100% !Important; font-size: 14px;}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 5b4da825a8..d1ebf54a87 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -995,12 +995,6 @@
     <Compile Include="umbraco.presentation\umbraco\dialogs\AssignDomain2.aspx.designer.cs">
       <DependentUpon>AssignDomain2.aspx</DependentUpon>
     </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\stylesheet\editstylesheet.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\stylesheet\property\EditStyleSheetProperty.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
     <Compile Include="Controllers\UmbLoginController.cs" />
     <Compile Include="UrlHelperExtensions.cs" />
     <Compile Include="Editors\MediaController.cs" />
@@ -1102,7 +1096,6 @@
     <Compile Include="_Legacy\BusinessLogic\Tasks.cs" />
     <Compile Include="_Legacy\BusinessLogic\TaskType.cs" />
     <Compile Include="_Legacy\Controls\BaseTreePicker.cs" />
-    <Compile Include="_Legacy\Controls\CodeArea.cs" />
     <Compile Include="_Legacy\Controls\DataAttributes.cs" />
     <Compile Include="_Legacy\Controls\feedback.cs" />
     <Compile Include="_Legacy\Controls\FieldDropDownList.cs" />
@@ -1188,9 +1181,6 @@
     <Compile Include="umbraco.presentation\umbraco\masterpages\umbracoDialog.master.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\modals\ShowUmbracoTags.aspx.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
     <Compile Include="umbraco.presentation\umbraco\templateControls\Image.cs" />
     <Compile Include="UmbracoHelper.cs" />
     <Compile Include="Mvc\ViewContextExtensions.cs" />
@@ -1337,13 +1327,6 @@
     <Compile Include="umbraco.presentation\umbraco\dialogs\republish.aspx.designer.cs">
       <DependentUpon>republish.aspx</DependentUpon>
     </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\search.aspx.cs">
-      <DependentUpon>search.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\dialogs\search.aspx.designer.cs">
-      <DependentUpon>search.aspx</DependentUpon>
-    </Compile>
     <Compile Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx.cs">
       <DependentUpon>SendPublish.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -1570,7 +1553,6 @@
     <Content Include="umbraco.presentation\umbraco\dialogs\republish.aspx">
       <SubType>ASPXCodeBehind</SubType>
     </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\search.aspx" />
     <Content Include="umbraco.presentation\umbraco\dialogs\SendPublish.aspx" />
     <Content Include="umbraco.presentation\umbraco\translation\details.aspx" />
     <Content Include="umbraco.presentation\umbraco\developer\Packages\editPackage.aspx">
diff --git a/src/Umbraco.Web/_Legacy/Controls/CodeArea.cs b/src/Umbraco.Web/_Legacy/Controls/CodeArea.cs
deleted file mode 100644
index db4a8a9bda..0000000000
--- a/src/Umbraco.Web/_Legacy/Controls/CodeArea.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Web;
-using System.Web.SessionState;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.HtmlControls;
-using ClientDependency.Core;
-using System.Linq;
-using ClientDependency.Core.Controls;
-using Umbraco.Core.Configuration;
-
-namespace Umbraco.Web._Legacy.Controls
-{
-
-    [ClientDependency(ClientDependencyType.Javascript, "CodeArea/javascript.js", "UmbracoClient")]
-    [ClientDependency(ClientDependencyType.Javascript, "CodeArea/UmbracoEditor.js", "UmbracoClient")]
-    [ClientDependency(ClientDependencyType.Css, "CodeArea/styles.css", "UmbracoClient")]
-    [ClientDependency(ClientDependencyType.Javascript, "Application/jQuery/jquery-fieldselection.js", "UmbracoClient")]
-    public class CodeArea : WebControl
-    {
-
-        public CodeArea()
-        {
-            //set the default to Css
-            CodeBase = EditorType.Css;
-        }
-
-        protected TextBox CodeTextBox;
-
-        public bool AutoResize { get; set; }
-        public bool AutoSuggest { get; set; }
-        public string EditorMimeType { get; set; }
-
-        public ScrollingMenu Menu = new ScrollingMenu();
-
-        public int OffSetX { get; set; }
-        public int OffSetY { get; set; }
-        public string Text
-        {
-            get
-            {
-                EnsureChildControls();
-                return CodeTextBox.Text;
-            }
-            set
-            {
-                EnsureChildControls();
-                CodeTextBox.Text = value;
-            }
-        }
-
-        public bool CodeMirrorEnabled
-        {
-            get
-            {
-                return UmbracoConfig.For.UmbracoSettings().Content.ScriptEditorDisable == false;
-            }
-        }
-
-        public EditorType CodeBase { get; set; }
-        public string ClientSaveMethod { get; set; }
-
-        public enum EditorType { JavaScript, Css, XML, HTML, Razor, HtmlMixed }
-
-        protected override void OnInit(EventArgs e)
-        {
-            base.OnInit(e);
-            EnsureChildControls();
-
-            if (CodeMirrorEnabled)
-            {
-                ClientDependencyLoader.Instance.RegisterDependency(0, "lib/CodeMirror/lib/codemirror.js", "UmbracoRoot", ClientDependencyType.Javascript);
-
-
-                ClientDependencyLoader.Instance.RegisterDependency(2, "lib/CodeMirror/mode/" + CodeBase.ToString().ToLower() + "/" + CodeBase.ToString().ToLower() + ".js", "UmbracoRoot", ClientDependencyType.Javascript);
-                if (CodeBase == EditorType.HtmlMixed)
-                {
-                    ClientDependencyLoader.Instance.RegisterDependency(1, "lib/CodeMirror/mode/xml/xml.js", "UmbracoRoot", ClientDependencyType.Javascript);
-                    ClientDependencyLoader.Instance.RegisterDependency(1, "lib/CodeMirror/mode/javascript/javascript.js", "UmbracoRoot", ClientDependencyType.Javascript);
-                    ClientDependencyLoader.Instance.RegisterDependency(1, "lib/CodeMirror/mode/css/css.js", "UmbracoRoot", ClientDependencyType.Javascript);
-                    ClientDependencyLoader.Instance.RegisterDependency(1, "lib/CodeMirror/mode/htmlmixed/htmlmixed.js", "UmbracoRoot", ClientDependencyType.Javascript);
-
-                }
-
-                ClientDependencyLoader.Instance.RegisterDependency(1, "lib/CodeMirror/addon/edit/matchbrackets.js", "UmbracoRoot", ClientDependencyType.Javascript);
-
-                ClientDependencyLoader.Instance.RegisterDependency(2, "lib/CodeMirror/addon/search/search.js", "UmbracoRoot", ClientDependencyType.Javascript);
-                ClientDependencyLoader.Instance.RegisterDependency(2, "lib/CodeMirror/addon/search/searchcursor.js", "UmbracoRoot", ClientDependencyType.Javascript);
-                ClientDependencyLoader.Instance.RegisterDependency(2, "lib/CodeMirror/addon/dialog/dialog.js", "UmbracoRoot", ClientDependencyType.Javascript);
-                ClientDependencyLoader.Instance.RegisterDependency(2, "lib/CodeMirror/addon/dialog/dialog.css", "UmbracoRoot", ClientDependencyType.Css);
-
-                ClientDependencyLoader.Instance.RegisterDependency(2, "lib/CodeMirror/lib/codemirror.css", "UmbracoRoot", ClientDependencyType.Css);
-                //ClientDependencyLoader.Instance.RegisterDependency(3, "CodeMirror/css/umbracoCustom.css", "UmbracoClient", ClientDependencyType.Css);
-                ClientDependencyLoader.Instance.RegisterDependency(4, "CodeArea/styles.css", "UmbracoClient", ClientDependencyType.Css);
-            }
-        }
-
-        protected override void CreateChildControls()
-        {
-            base.CreateChildControls();
-            CodeTextBox = new TextBox();
-            CodeTextBox.ID = "CodeTextBox";
-
-            if (CodeMirrorEnabled == false)
-            {
-                CodeTextBox.Attributes.Add("class", "codepress");
-                CodeTextBox.Attributes.Add("wrap", "off");
-            }
-
-            CodeTextBox.TextMode = TextBoxMode.MultiLine;
-
-            this.Controls.Add(Menu);
-            this.Controls.Add(CodeTextBox);
-
-        }
-
-        /// <summary>
-        /// Client ID is different if the code editor is turned on/off
-        /// </summary>
-        public override string ClientID
-        {
-            get
-            {
-                if (CodeMirrorEnabled == false)
-                    return CodeTextBox.ClientID;
-                else
-                    return base.ClientID;
-            }
-        }
-
-        protected override void Render(HtmlTextWriter writer)
-        {
-            EnsureChildControls();
-
-            var jsEventCode = new StringBuilder();
-
-
-            if (CodeMirrorEnabled == false)
-            {
-                CodeTextBox.RenderControl(writer);
-                jsEventCode.Append(RenderBasicEditor());
-            }
-            else
-            {
-                writer.WriteBeginTag("div");
-                writer.WriteAttribute("id", this.ClientID);
-                writer.WriteAttribute("class", "umb-editor umb-codeeditor " + this.CssClass);
-                this.ControlStyle.AddAttributesToRender(writer);
-                writer.Write(HtmlTextWriter.TagRightChar);
-                Menu.RenderControl(writer);
-
-                writer.WriteBeginTag("div");
-                writer.WriteAttribute("class", "code-container");
-                this.ControlStyle.AddAttributesToRender(writer);
-                writer.Write(HtmlTextWriter.TagRightChar);
-                CodeTextBox.RenderControl(writer);
-                writer.WriteEndTag("div");
-                writer.WriteEndTag("div");
-
-                jsEventCode.Append(RenderCodeEditor());
-            }
-
-            jsEventCode.Append(@"
-                    //TODO: for now this is a global var, need to refactor all this so that is using proper js standards
-                    //with correct objects, and proper accessors to these objects.
-                    var UmbEditor;
-                    $(document).ready(function () {
-                        //create the editor
-                       UmbEditor = new Umbraco.Controls.CodeEditor.UmbracoEditor(" + (CodeMirrorEnabled == false).ToString().ToLower() + @", '" + ClientID + @"');");
-
-            if (this.AutoResize)
-            {
-                if (CodeMirrorEnabled)
-                {
-                    //reduce the width if using code mirror because of the line numbers
-                    OffSetX += 20;
-                    OffSetY += 50;
-                }
-
-                //add the resize code
-                jsEventCode.Append(@"
-                        var m_textEditor = jQuery('#" + ClientID + @"');
-
-                       //with codemirror adding divs for line numbers, we need to target a different element
-                       m_textEditor = m_textEditor.find('iframe').length > 0 ? m_textEditor.children('div').get(0) : m_textEditor.get(0);
-
-                       jQuery(window).resize(function(){  resizeTextArea(m_textEditor, " + OffSetX + "," + OffSetY + @"); });
-                       jQuery(document).ready(function(){  resizeTextArea(m_textEditor, " + OffSetX + "," + OffSetY + @"); });");
-
-            }
-
-            jsEventCode.Append(@"
-                    });");
-
-            writer.WriteLine(@"<script type=""text/javascript"">{0}</script>", jsEventCode);
-
-        }
-
-        protected string RenderBasicEditor()
-        {
-            string jsEventCode = @"
-                                    var m_textEditor = document.getElementById('" + this.ClientID + @"');
-                                    tab.watch('" + this.ClientID + @"');
-                                    ";
-            return jsEventCode;
-        }
-
-        protected string RenderCodeEditor()
-        {
-            var extraKeys = "";
-            var editorMimetype = "";
-
-            if (string.IsNullOrEmpty(EditorMimeType) == false)
-                editorMimetype = @",
-                                     mode: """ + EditorMimeType + "\"";
-
-
-
-            var jsEventCode = @"
-                                var textarea = document.getElementById('" + CodeTextBox.ClientID + @"');
-                                var codeEditor = CodeMirror.fromTextArea(textarea, {
-                                                tabMode: ""shift"",
-                                                matchBrackets: true,
-                                                indentUnit: 4,
-                                                indentWithTabs: true,
-                                                enterMode: ""keep"",
-                                                lineWrapping: false" +
-                                                editorMimetype + @",
-                                                lineNumbers: true" +
-                                                extraKeys + @"
-                                                });
-                                ";
-
-            return jsEventCode;
-        }
-    }
-
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx
deleted file mode 100644
index 7feb7a60d2..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx
+++ /dev/null
@@ -1,48 +0,0 @@
-<%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true"
-    CodeBehind="search.aspx.cs" Inherits="umbraco.presentation.dialogs.search" %>
-<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
-
-<asp:Content ID="header1" ContentPlaceHolderID="head" runat="server">
-<script type="text/javascript">
-    function openItem(id) {
-
-        var url = "";
-
-        switch (UmbClientMgr.mainWindow().UmbClientMgr.appActions().getCurrApp().toLowerCase()) {
-            case "media":
-                url = "editMedia.aspx";
-                break;
-            case "content":
-                url = "editContent.aspx";
-                break;
-            case "member":
-                url = "members/editMember.aspx";
-                break;
-            default:
-                url = "editContent.aspx";
-        }
-        url = url + "?id=" + id;
-
-
-        UmbClientMgr.contentFrame(url);
-        UmbClientMgr.closeModalWindow();
-    }
-</script>
-</asp:Content>
-<asp:Content ID="Content1" ContentPlaceHolderID="body" runat="server">
-    <cc1:Pane ID="Wizard" runat="server">
-        <h3>Search</h3>
-        <p>
-        <asp:TextBox ID="keyword" runat="server" Width="500" CssClass="bigInput"></asp:TextBox>
-            <asp:Button ID="searchButton" runat="server" Text="Search" onclick="search_Click" /><br />
-        </p>
-        <asp:Panel ID="nothingFound" runat="server" Visible="false">
-        <p class="error">No results match</p></asp:Panel>
-        <asp:Xml ID="searchResult" runat="server" TransformSource="../xslt/searchResult.xslt"></asp:Xml>
-    </cc1:Pane>
-</asp:Content>
-<asp:Content ID="footer1" ContentPlaceHolderID="footer" runat="server">
-<script type="text/javascript">
-    jQuery(".bigInput").focus();
-</script>
-</asp:Content>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.cs
deleted file mode 100644
index d570b32d85..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using Umbraco.Core;
-using Umbraco.Examine;
-using System.Xml;
-using Examine;
-using Examine.LuceneEngine.SearchCriteria;
-using System.Linq;
-using Umbraco.Core;
-using Umbraco.Core.Xml;
-
-
-namespace umbraco.presentation.dialogs
-{
-    //fixme - is this even used anymore?
-    public partial class search : Umbraco.Web.UI.Pages.UmbracoEnsuredPage
-    {
-
-        protected override void OnInit(EventArgs e)
-        {
-            CurrentApp = IndexTypes.Content;
-            if (!string.IsNullOrEmpty(Request["app"]))
-            {
-                CurrentApp = Request["app"].ToLower();
-            }
-
-            base.OnInit(e);
-        }
-
-        protected void Page_Load(object sender, EventArgs e)
-        {
-            Page.Form.DefaultButton = searchButton.UniqueID;
-
-            if (!IsPostBack && Request["search"] != "")
-            {
-                keyword.Text = Request["search"];
-                DoSearch();
-
-            }
-        }
-
-        protected void search_Click(object sender, EventArgs e)
-        {
-            DoSearch();
-        }
-
-        private void DoSearch()
-        {
-            var txt = keyword.Text.ToLower();
-
-            int limit;
-            if (!int.TryParse(Request["limit"], out limit))
-            {
-                limit = 100;
-            }
-
-            //if it doesn't start with "*", then search only nodeName and nodeId
-            var internalSearcher = (CurrentApp == Constants.Applications.Members)
-                ? ExamineManager.Instance.GetSearcher(Constants.Examine.InternalMemberIndexer)
-                : ExamineManager.Instance.GetSearcher(Constants.Examine.InternalIndexer);
-
-            //create some search criteria, make everything combined to be 'And' and only search the current app
-            var criteria = internalSearcher.CreateCriteria(CurrentApp, Examine.SearchCriteria.BooleanOperation.And);
-
-            IEnumerable<SearchResult> results;
-            if (txt.StartsWith("*"))
-            {
-                //if it starts with * then search all fields
-                results = internalSearcher.Search(txt.Substring(1), true);
-            }
-            else
-            {
-                var words = txt.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries).Select(w => w.ToLower().MultipleCharacterWildcard()).ToList();
-                var operation = criteria.GroupedOr(new[] { "__nodeName", "__NodeId", "id" }, new[] { words[0] });
-                words.RemoveAt(0);
-                foreach (var word in words)
-                    operation = operation.And().GroupedOr(new[] { "__nodeName" }, new[] { word });
-
-                // ensure the user can only find nodes they are allowed to see
-                // fixme BORKED because we don't deal with all start nodes
-                if (Security.CurrentUser.StartContentIds.FirstOrDefault() > 0)
-                {
-                    //TODO: This is not correct! This will not filter out seearches 'from' this node, this
-                    // query is meant to search 'for' a specific node.
-                    operation = operation.And().Id(Security.CurrentUser.StartContentIds.FirstOrDefault());
-                }
-
-                results = internalSearcher.Search(operation.Compile());
-            }
-
-            nothingFound.Visible = !results.Any();
-
-            searchResult.XPathNavigator = ResultsAsXml(results).CreateNavigator();
-        }
-
-        private XmlDocument ResultsAsXml(IEnumerable<SearchResult> results)
-        {
-            var result = new XmlDocument();
-            result.LoadXml("<results/>");
-
-            foreach (var r in results)
-            {
-                var x = XmlHelper.AddTextNode(result, "result", "");
-                x.Attributes.Append(XmlHelper.AddAttribute(result, "id", r.Id.ToString(CultureInfo.InvariantCulture)));
-                x.Attributes.Append(XmlHelper.AddAttribute(result, "title", r.Fields["nodeName"]));
-                x.Attributes.Append(XmlHelper.AddAttribute(result, "author", r.Fields["writerName"]));
-                x.Attributes.Append(XmlHelper.AddAttribute(result, "changeDate", r.Fields["updateDate"]));
-                x.Attributes.Append(XmlHelper.AddAttribute(result, "type", r.Fields["nodeTypeAlias"]));
-                result.DocumentElement.AppendChild(x);
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.designer.cs
deleted file mode 100644
index efc60d5bed..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.designer.cs
+++ /dev/null
@@ -1,60 +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.dialogs {
-    
-    
-    public partial class search {
-        
-        /// <summary>
-        /// Wizard control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Umbraco.Web._Legacy.Controls.Pane Wizard;
-        
-        /// <summary>
-        /// keyword 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.TextBox keyword;
-        
-        /// <summary>
-        /// searchButton 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.Button searchButton;
-        
-        /// <summary>
-        /// nothingFound 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.Panel nothingFound;
-        
-        /// <summary>
-        /// searchResult 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.Xml searchResult;
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/modals/ShowUmbracoTags.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/modals/ShowUmbracoTags.aspx.cs
deleted file mode 100644
index 3d23d12393..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/modals/ShowUmbracoTags.aspx.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using Umbraco.Core;
-
-namespace umbraco.cms.presentation.settings.modal
-{
-    /// <summary>
-    /// Summary description for ShowUmbracoTags.
-    /// </summary>
-    public partial class ShowUmbracoTags : Umbraco.Web.UI.Pages.UmbracoEnsuredPage
-    {
-
-        public ShowUmbracoTags()
-        {
-            CurrentApp = Constants.Applications.Settings.ToString();
-        }
-
-        public static string alias = "";
-        protected void Page_Load(object sender, EventArgs e)
-        {
-            alias = Request.QueryString["alias"].Replace(" ", "").Trim();
-            // Put user code to initialize the page here
-        }
-
-        /// <summary>
-        /// Pane7 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected Umbraco.Web._Legacy.Controls.Pane Pane7;
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs
deleted file mode 100644
index 5551228665..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-using Umbraco.Core.Services;
-using System;
-using System.IO;
-using System.Web.UI;
-using umbraco.cms.presentation.Trees;
-using Umbraco.Web._Legacy.Controls;
-using Umbraco.Core;
-using Umbraco.Web.UI.Pages;
-
-namespace umbraco.cms.presentation.settings.stylesheet
-{
-    /// <summary>
-    /// Summary description for editstylesheet.
-    /// </summary>
-    public partial class editstylesheet : UmbracoEnsuredPage
-    {
-        protected MenuButton SaveButton;
-
-        private string filename;
-        protected string TreeSyncPath { get; private set; }
-
-        public editstylesheet()
-        {
-            CurrentApp = Constants.Applications.Settings.ToString();
-        }
-
-        protected override void OnInit(EventArgs e)
-        {
-            base.OnInit(e);
-
-            filename = Request.QueryString["id"].Replace('\\', '/').TrimStart('/');
-
-            var editor = Panel1.NewTabPage(Services.TextService.Localize("stylesheet"));
-            editor.Controls.Add(Pane7);
-
-            var props = Panel1.NewTabPage(Services.TextService.Localize("properties"));
-            props.Controls.Add(Pane8);
-
-            SaveButton = Panel1.Menu.NewButton();
-            SaveButton.Text = Services.TextService.Localize("save");
-            SaveButton.ButtonType = MenuButtonType.Primary;
-            SaveButton.ID = "save";
-            SaveButton.CssClass = "client-side";
-        }
-
-        protected void Page_Load(object sender, EventArgs e)
-        {
-            Panel1.Text = Services.TextService.Localize("stylesheet/editstylesheet");
-            pp_name.Text = Services.TextService.Localize("name");
-            pp_path.Text = Services.TextService.Localize("path");
-
-            var stylesheet = Services.FileService.GetStylesheetByName(filename);
-            if (stylesheet == null) // not found
-                throw new FileNotFoundException("Could not find file '" + filename + "'.");
-
-            lttPath.Text = "<a id=\"" + lttPath.ClientID + "\" target=\"_blank\" href=\"" + stylesheet.VirtualPath + "\">" + stylesheet.VirtualPath + "</a>";
-            editorSource.Text = stylesheet.Content;
-            TreeSyncPath = BaseTree.GetTreePathFromFilePath(filename);
-
-            // name derives from path, without the .css extension, clean for xss
-            NameTxt.Text = stylesheet.Path.TrimEnd(".css").CleanForXss('\\', '/');
-
-            if (IsPostBack == false)
-            {
-                ClientTools
-                    .SyncTree(TreeSyncPath, false);
-            }
-        }
-
-        protected override void OnPreRender(EventArgs e)
-        {
-            base.OnPreRender(e);
-            ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference("../webservices/codeEditorSave.asmx"));
-            ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference("../webservices/legacyAjaxCalls.asmx"));
-        }
-
-        /// <summary>
-        /// Panel1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Umbraco.Web._Legacy.Controls.TabView Panel1;
-
-        /// <summary>
-        /// Pane7 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Umbraco.Web._Legacy.Controls.Pane Pane7;
-        protected global::Umbraco.Web._Legacy.Controls.Pane Pane8;
-
-        /// <summary>
-        /// pp_name control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_name;
-
-        /// <summary>
-        /// NameTxt 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.TextBox NameTxt;
-
-        /// <summary>
-        /// pp_path control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_path;
-
-        /// <summary>
-        /// lttPath 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.Literal lttPath;
-
-        /// <summary>
-        /// pp_source control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_source;
-
-        /// <summary>
-        /// editorSource control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Umbraco.Web._Legacy.Controls.CodeArea editorSource;
-
-    }
-}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.cs
deleted file mode 100644
index f87889147d..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-using System;
-using System.Linq;
-using System.Web;
-using System.Web.UI.WebControls;
-using umbraco.cms.presentation.Trees;
-using Umbraco.Core;
-using Umbraco.Web.UI;
-using Umbraco.Core.Services;
-
-namespace umbraco.cms.presentation.settings.stylesheet
-{
-    /// <summary>
-    /// Summary description for EditStyleSheetProperty.
-    /// </summary>
-    public partial class EditStyleSheetProperty : Umbraco.Web.UI.Pages.UmbracoEnsuredPage
-    {
-        public EditStyleSheetProperty()
-        {
-            CurrentApp = Constants.Applications.Settings.ToString();
-
-        }
-
-        private Umbraco.Core.Models.StylesheetProperty _stylesheetproperty;
-        private Umbraco.Core.Models.Stylesheet _sheet;
-
-        /// <summary>
-        /// Raises the <see cref="E:System.Web.UI.Control.Load"></see> event.
-        /// </summary>
-        /// <param name="e">The <see cref="T:System.EventArgs"></see> object that contains the event data.</param>
-        protected override void OnLoad(EventArgs e)
-        {
-            base.OnLoad(e);
-
-            _sheet = Services.FileService.GetStylesheetByName(Request.QueryString["id"]);
-            if (_sheet == null) throw new InvalidOperationException("No stylesheet found with name: " + Request.QueryString["id"]);
-
-            var property = HttpUtility.UrlDecode(Request.QueryString["prop"]);
-            var propName = IsPostBack ? OriginalName.Value : property;
-
-            _stylesheetproperty = _sheet.Properties.FirstOrDefault(x => x.Name.InvariantEquals(propName));
-            if (_stylesheetproperty == null) throw new InvalidOperationException("No stylesheet property found with name: " + property);
-
-            Panel1.Text = Services.TextService.Localize("stylesheet/editstylesheetproperty");
-
-            var bt = Panel1.Menu.NewButton();
-            bt.Click += SaveClick;
-            bt.Text = Services.TextService.Localize("save");
-            bt.ToolTip = Services.TextService.Localize("save");
-            bt.ButtonType = Umbraco.Web._Legacy.Controls.MenuButtonType.Primary;
-            bt.ID = "save";
-        }
-
-
-        protected override void OnPreRender(EventArgs e)
-        {
-            NameTxt.Text = _stylesheetproperty.Name;
-            Content.Text = _stylesheetproperty.Value;
-            AliasTxt.Text = _stylesheetproperty.Alias;
-            OriginalName.Value = _stylesheetproperty.Name;
-
-            prStyles.Attributes["style"] = _stylesheetproperty.Value;
-
-            var path = _sheet.Path.Replace('\\', '/');
-            var nodePath = string.Format(BaseTree.GetTreePathFromFilePath(path) +
-                        ",{0}_{1}", path, HttpUtility.UrlEncode(_stylesheetproperty.Name));
-
-            ClientTools.SyncTree(nodePath, IsPostBack);
-
-            prStyles.Attributes["style"] = _stylesheetproperty.Value;
-
-            base.OnPreRender(e);
-        }
-
-        private void SaveClick(object sender, EventArgs e)
-        {
-            _stylesheetproperty.Value = Content.Text;
-            _stylesheetproperty.Alias = AliasTxt.Text;
-
-            if (_stylesheetproperty.Name != NameTxt.Text)
-            {
-                //to change the name we actually have to remove the property and re-add it as a different one
-                _sheet.AddProperty(new Umbraco.Core.Models.StylesheetProperty(NameTxt.Text, _stylesheetproperty.Alias, _stylesheetproperty.Value));
-                _sheet.RemoveProperty(_stylesheetproperty.Name);
-                //reset our variable
-                _stylesheetproperty = _sheet.Properties.Single(x => x.Name == NameTxt.Text);
-            }
-
-            Services.FileService.SaveStylesheet(_sheet);
-
-            ClientTools.ShowSpeechBubble(SpeechBubbleIcon.Save, Services.TextService.Localize("speechBubbles/editStylesheetPropertySaved"), "");
-        }
-
-
-        override protected void OnInit(EventArgs e)
-        {
-            base.OnInit(e);
-            Content.TextMode = TextBoxMode.MultiLine;
-            Content.Height = 250;
-            Content.Width = 300;
-        }
-
-
-        /// <summary>
-        /// Panel1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Umbraco.Web._Legacy.Controls.UmbracoPanel Panel1;
-
-        /// <summary>
-        /// Pane7 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Umbraco.Web._Legacy.Controls.Pane Pane7;
-
-        protected global::System.Web.UI.WebControls.HiddenField OriginalName;
-
-        /// <summary>
-        /// NameTxt 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.TextBox NameTxt;
-
-        /// <summary>
-        /// AliasTxt 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.TextBox AliasTxt;
-
-        /// <summary>
-        /// Content 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.TextBox Content;
-
-        /// <summary>
-        /// prStyles 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.HtmlGenericControl prStyles;
-    }
-}