From a529c26189a1b8dcf07447176b858367788de346 Mon Sep 17 00:00:00 2001
From: "shannon@ShandemVaio.home" <unknown@kiln.example.com>
Date: Wed, 27 Jun 2012 23:32:29 +0400
Subject: [PATCH] updated release web.config template, removed old files that
 don't need to be there.

---
 build/Build.proj                              |  13 +-
 src/umbraco.presentation/Web.BLUEBERRY.config | 246 ------------------
 .../Web.PETER-MAC-PC.config                   | 211 ---------------
 src/umbraco.presentation/Web.SLACEBOX.config  | 211 ---------------
 src/umbraco.presentation/Web.SSAODSK01.config | 246 ------------------
 src/umbraco.presentation/Web.SSAOLAP01.config | 246 ------------------
 .../web.Template.Release.config               |   7 +-
 7 files changed, 10 insertions(+), 1170 deletions(-)
 delete mode 100644 src/umbraco.presentation/Web.BLUEBERRY.config
 delete mode 100644 src/umbraco.presentation/Web.PETER-MAC-PC.config
 delete mode 100644 src/umbraco.presentation/Web.SLACEBOX.config
 delete mode 100644 src/umbraco.presentation/Web.SSAODSK01.config
 delete mode 100644 src/umbraco.presentation/Web.SSAOLAP01.config

diff --git a/build/Build.proj b/build/Build.proj
index ce76256894..7e6c14e407 100644
--- a/build/Build.proj
+++ b/build/Build.proj
@@ -31,14 +31,9 @@
   <Target Name="ZipWebApp" DependsOnTargets="OffsetTimestamps" >
     <Time Format="yyyyMMdd-HHmm">
       <Output TaskParameter="FormattedTime" PropertyName="buildDate" />
-    </Time>
-
-    <!--<Message Text=" Here I Am  " />
-    <Exec Command="dir ." />
-    <Message Text=" " />
-    <Message Text="FOLDER = $(WebBuildFolderWildcard)" Importance="high" />-->
-
-    <!--<CreateItem Include="$(WebBuildFolderWildcard)" Exclude="$(WebBuildFolderExclusionWildcard)">
+    </Time>    
+    
+    <CreateItem Include="$(WebBuildFolderWildcard)" Exclude="$(WebBuildFolderExclusionWildcard)">
       <Output TaskParameter="Include" ItemName="WebFilesToZip" />
     </CreateItem>
 
@@ -48,7 +43,7 @@
     <Message Text="Starting to zip to $(buildDate)-$(BuildZipFileName)" Importance="high" />
     <MSBuild.Community.Tasks.Zip Files="@(BinFilesToZip)" ZipFileName="$(buildDate)-$(BuildZipFileNameBin)" WorkingDirectory="$(SolutionBinFolder)" />
     <MSBuild.Community.Tasks.Zip Files="@(WebFilesToZip)" ZipFileName="$(buildDate)-$(BuildZipFileName)" WorkingDirectory="$(WebAppFolder)" />
-    <Message Text="Finished zipping to build\$(BuildFolder)\$(buildDate)-$(BuildZipFileName)" Importance="high" />-->
+    <Message Text="Finished zipping to build\$(BuildFolder)\$(buildDate)-$(BuildZipFileName)" Importance="high" />
   </Target>
   <Target Name="CompileProjects">
 
diff --git a/src/umbraco.presentation/Web.BLUEBERRY.config b/src/umbraco.presentation/Web.BLUEBERRY.config
deleted file mode 100644
index b01f5259ab..0000000000
--- a/src/umbraco.presentation/Web.BLUEBERRY.config
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="urlrewritingnet" restartOnExternalChanges="true" requirePermission="false" type="UrlRewritingNet.Configuration.UrlRewriteSection, UrlRewritingNet.UrlRewriter" />
-    <!--
-      <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
-    
-
-      ASPNETAJAX ** DISABLED BY ALEX NORCLIFFE 2010 06 03 FOR COMPATIBILITY WITH RUNNING UNDER .NET 4
-      USERS CAN ADD THIS THEMSELVES IF THEY WISH TO USE ASP.NET AJAX
-      -->
-    <!--<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-        <section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-        <sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-          <section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere" />
-          <section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-          <section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-          <section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-        </sectionGroup>
-      </sectionGroup>
-    </sectionGroup>-->
-    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="umbraco.presentation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-    </sectionGroup>
-    <section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false" />
-    <section name="Examine" type="Examine.Config.ExamineSettings, Examine" requirePermission="false" />
-    <section name="ExamineLuceneIndexSets" type="UmbracoExamine.Config.ExamineLuceneIndexes, UmbracoExamine" requirePermission="false" />
-    <!-- Added in Umbraco 4.6.2 -->
-    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-    </sectionGroup>
-    <!-- End of added in Umbraco 4.6.2 -->
-  </configSections>
-  <urlrewritingnet configSource="config\UrlRewriting.config" />
-  <!-- <microsoft.scripting configSource="config\scripting.config" />-->
-  <clientDependency configSource="config\ClientDependency.config" />
-  <Examine configSource="config\ExamineSettings.config" />
-  <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
-  <appSettings>
-    <add key="umbracoDbDSN" value="server=.\SQLEXPRESS;database=&quot;Umbraco 4.8&quot;;integrated security=true" />
-    <add key="umbracoConfigurationStatus" value="4.8.0" />
-    <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
-    <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
-    <add key="umbracoContentXML" value="~/App_Data/umbraco.config" />
-    <add key="umbracoStorageDirectory" value="~/App_Data" />
-    <add key="umbracoPath" value="~/umbraco" />
-    <add key="umbracoEnableStat" value="false" />
-    <add key="umbracoHideTopLevelNodeFromPath" value="true" />
-    <add key="umbracoEditXhtmlMode" value="true" />
-    <add key="umbracoUseDirectoryUrls" value="false" />
-    <add key="umbracoDebugMode" value="true" />
-    <add key="umbracoTimeOutInMinutes" value="20" />
-    <add key="umbracoVersionCheckPeriod" value="7" />
-    <add key="umbracoDisableXsltExtensions" value="true" />
-    <add key="umbracoDefaultUILanguage" value="en" />
-    <add key="umbracoProfileUrl" value="profiler" />
-    <add key="umbracoUseSSL" value="false" />
-    <add key="umbracoUseMediumTrust" value="false" />
-    <!-- 
-      Set this to true to enable storing the xml cache locally to the IIS server even if the app files are stored centrally on a SAN/NAS 
-      Alex Norcliffe 2010 02 for 4.1
-    -->
-    <add key="umbracoContentXMLUseLocalTemp" value="false" />
-    <!-- Added in Umbraco 4.6.2 -->
-    <add key="webpages:Enabled" value="false" />
-    <add key="enableSimpleMembership" value="false" />
-    <add key="autoFormsAuthentication" value="false" />
-    <!-- End of added in Umbraco 4.6.2 -->
-  </appSettings>
-  <system.net>
-    <mailSettings>
-      <smtp>
-        <network host="127.0.0.1" userName="username" password="password" />
-      </smtp>
-    </mailSettings>
-  </system.net>
-  <connectionStrings>
-    <remove name="LocalSqlServer" />
-    <!--<add name="LocalSqlServer" connectionString="server=.\sqlexpress;database=aspnetdb;user id=DBUSER;password=DBPASSWORD" providerName="System.Data.SqlClient"/>-->
-  </connectionStrings>
-  <system.web>
-    <httpRuntime requestValidationMode="2.0" />
-    <customErrors mode="Off" />
-    <trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
-    <sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20" />
-    <globalization requestEncoding="UTF-8" responseEncoding="UTF-8" />
-    <xhtmlConformance mode="Strict" />
-    <pages enableEventValidation="false">
-      <!-- ASPNETAJAX -->
-      <controls>
-        <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add tagPrefix="umbraco" namespace="umbraco.presentation.templateControls" assembly="umbraco" />
-        <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      </controls>
-    </pages>
-    <httpModules>
-      <!-- URL REWRTIER -->
-      <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
-      <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
-      <!-- UMBRACO -->
-      <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule, umbraco" />
-      <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule, umbraco" />
-      <!-- ASPNETAJAX -->
-      <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <!-- CLIENT DEPENDENCY -->
-      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
-    </httpModules>
-    <httpHandlers>
-      <remove verb="*" path="*.asmx" />
-      <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
-      <!-- UMBRACO CHANNELS -->
-      <add verb="*" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
-      <add verb="*" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
-      <!-- CLIENT DEPENDENCY -->
-      <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
-      <!-- SPELL CHECKER -->
-      <add verb="GET,HEAD,POST" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
-    </httpHandlers>
-    <compilation defaultLanguage="c#" debug="true" batch="false">
-      <assemblies>
-        <!-- ASPNETAJAX -->
-        <add assembly="System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
-        <add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Extensions.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-        <!--<add assembly="Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" /> -->
-      </assemblies>
-      <!-- Added in Umbraco 4.6.2 -->
-      <buildProviders>
-        <add extension=".cshtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
-        <add extension=".vbhtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
-        <add extension=".razor" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
-      </buildProviders>
-      <!-- End of added in Umbraco 4.6.2 -->
-    </compilation>
-    <authentication mode="Forms">
-      <forms name="yourAuthCookie" loginUrl="login.aspx" protection="All" path="/" />
-    </authentication>
-    <authorization>
-      <allow users="?" />
-    </authorization>
-    <!-- Membership Provider -->
-    <membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
-      <providers>
-        <clear />
-        <add name="UmbracoMembershipProvider" type="umbraco.providers.members.UmbracoMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Another Type" passwordFormat="Hashed" />
-        <add name="UsersMembershipProvider" type="umbraco.providers.UsersMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" />
-      </providers>
-    </membership>
-    <!-- added by NH to support membership providers in access layer -->
-    <roleManager enabled="true" defaultProvider="UmbracoRoleProvider">
-      <providers>
-        <clear />
-        <add name="UmbracoRoleProvider" type="umbraco.providers.members.UmbracoRoleProvider" />
-      </providers>
-    </roleManager>
-    <!-- Sitemap provider-->
-    <siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
-      <providers>
-        <clear />
-        <add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true" />
-      </providers>
-    </siteMap>
-  </system.web>
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-    <modules>
-      <remove name="ScriptModule" />
-      <remove name="UrlRewriteModule" />
-      <remove name="umbracoRequestModule" />
-      <remove name="viewstateMoverModule" />
-      <remove name="umbracoBaseRequestModule" />
-      <remove name="ClientDependencyModule" />
-      <!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
-      <remove name="FormsAuthentication" />
-      <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
-      <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
-      <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
-      <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
-      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
-      <!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
-      <add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule" />
-    </modules>
-    <handlers accessPolicy="Read, Write, Script, Execute">
-      <remove name="WebServiceHandlerFactory-Integrated" />
-      <remove name="ScriptHandlerFactory" />
-      <remove name="ScriptHandlerFactoryAppServices" />
-      <remove name="ScriptResource" />
-      <remove name="Channels" />
-      <remove name="Channels_Word" />
-      <remove name="ClientDependency" />
-      <remove name="SpellChecker" />
-      <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="*" name="Channels" preCondition="integratedMode" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
-      <add verb="*" name="Channels_Word" preCondition="integratedMode" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
-      <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
-      <add verb="GET,HEAD,POST" preCondition="integratedMode" name="SpellChecker" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
-    </handlers>
-    <staticContent>
-      <mimeMap fileExtension=".air" mimeType="application/vnd.adobe.air-application-installer-package+zip" />
-    </staticContent>
-  </system.webServer>
-  <system.codedom>
-    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider,System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
-        <providerOption name="CompilerVersion" value="v3.5" />
-        <providerOption name="WarnAsError" value="false" />
-      </compiler>
-    </compilers>
-  </system.codedom>
-  <runtime>
-    <!--    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
-      </dependentAssembly>
-    </assemblyBinding>
--->
-  </runtime>
-  <!-- Added in Umbraco 4.6.2 -->
-  <system.web.webPages.razor>
-    <!--<host factoryType="umbraco.MacroEngines.RazorUmbracoFactory, umbraco.MacroEngines"/>-->
-    <pages pageBaseType="umbraco.MacroEngines.DynamicNodeContext">
-      <namespaces>
-        <add namespace="Microsoft.Web.Helpers" />
-        <add namespace="umbraco" />
-        <add namespace="Examine" />
-      </namespaces>
-    </pages>
-  </system.web.webPages.razor>
-  <!-- End of added in Umbraco 4.6.2 -->
-</configuration>
\ No newline at end of file
diff --git a/src/umbraco.presentation/Web.PETER-MAC-PC.config b/src/umbraco.presentation/Web.PETER-MAC-PC.config
deleted file mode 100644
index 60e5e04209..0000000000
--- a/src/umbraco.presentation/Web.PETER-MAC-PC.config
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="urlrewritingnet" restartOnExternalChanges="true" requirePermission="false" type="UrlRewritingNet.Configuration.UrlRewriteSection, UrlRewritingNet.UrlRewriter" />
-    <!--
-      <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
-    
-
-      ASPNETAJAX ** DISABLED BY ALEX NORCLIFFE 2010 06 03 FOR COMPATIBILITY WITH RUNNING UNDER .NET 4
-      USERS CAN ADD THIS THEMSELVES IF THEY WISH TO USE ASP.NET AJAX
-      -->
-    <!--<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-        <section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-        <sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-          <section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere" />
-          <section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-          <section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-          <section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-        </sectionGroup>
-      </sectionGroup>
-    </sectionGroup>-->
-    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="umbraco.presentation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-    </sectionGroup>
-    <section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false" />
-    <section name="Examine" type="Examine.Config.ExamineSettings, Examine" requirePermission="false" />
-    <section name="ExamineLuceneIndexSets" type="UmbracoExamine.Config.ExamineLuceneIndexes, UmbracoExamine" requirePermission="false" />
-  </configSections>
-  <urlrewritingnet configSource="config\UrlRewriting.config" />
-  <!-- <microsoft.scripting configSource="config\scripting.config" />-->
-  <clientDependency configSource="config\ClientDependency.config" />
-  <Examine configSource="config\ExamineSettings.config" />
-  <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
-  <appSettings>
-    <add key="umbracoDbDSN" value="server=.\sqlexpress;database=4.6-beta;integrated security=false;user id=sa;pwd=password!" />
-    <add key="umbracoConfigurationStatus" value="4.6.0.beta" />
-    <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
-    <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
-    <add key="umbracoContentXML" value="~/App_Data/umbraco.config" />
-    <add key="umbracoStorageDirectory" value="~/App_Data" />
-    <add key="umbracoPath" value="~/umbraco" />
-    <add key="umbracoEnableStat" value="false" />
-    <add key="umbracoHideTopLevelNodeFromPath" value="true" />
-    <add key="umbracoEditXhtmlMode" value="true" />
-    <add key="umbracoUseDirectoryUrls" value="false" />
-    <add key="umbracoDebugMode" value="true" />
-    <add key="umbracoTimeOutInMinutes" value="20" />
-    <add key="umbracoVersionCheckPeriod" value="7" />
-    <add key="umbracoDisableXsltExtensions" value="true" />
-    <add key="umbracoDefaultUILanguage" value="en" />
-    <add key="umbracoProfileUrl" value="profiler" />
-    <add key="umbracoUseSSL" value="false" />
-    <add key="umbracoUseMediumTrust" value="false" />
-    <!-- 
-      Set this to true to enable storing the xml cache locally to the IIS server even if the app files are stored centrally on a SAN/NAS 
-      Alex Norcliffe 2010 02 for 4.1
-    -->
-    <add key="umbracoContentXMLUseLocalTemp" value="false" />
-  </appSettings>
-  <system.net>
-    <mailSettings>
-      <smtp>
-        <network host="127.0.0.1" userName="username" password="password" />
-      </smtp>
-    </mailSettings>
-  </system.net>
-  <!-- REMOVE FOR BETA -->
-  <!-- added by NH to test foreign membership providers-->
-  <connectionStrings>
-    <remove name="LocalSqlServer" />
-    <!--<add name="LocalSqlServer" connectionString="server=.\sqlexpress;database=aspnetdb;user id=DBUSER;password=DBPASSWORD" providerName="System.Data.SqlClient"/>-->
-  </connectionStrings>
-  <system.web>
-    <!-- <trust level="Medium" originUrl=".*" /> -->
-    <customErrors mode="Off" />
-    <trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
-    <sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20" />
-    <globalization requestEncoding="UTF-8" responseEncoding="UTF-8" />
-    <xhtmlConformance mode="Strict" />
-    <pages enableEventValidation="false">
-      <!-- ASPNETAJAX -->
-      <controls>
-        <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add tagPrefix="umbraco" namespace="umbraco.presentation.templateControls" assembly="umbraco" />
-        <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      </controls>
-    </pages>
-    <httpModules>
-      <!-- URL REWRTIER -->
-      <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
-      <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
-      <!-- UMBRACO -->
-      <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule, umbraco" />
-      <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule, umbraco" />
-      <!-- ASPNETAJAX -->
-      <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <!-- CLIENT DEPENDENCY -->
-      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
-    </httpModules>
-    <httpHandlers>
-      <remove verb="*" path="*.asmx" />
-      <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
-      <!-- UMBRACO CHANNELS -->
-      <add verb="*" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
-      <add verb="*" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
-      <!-- CLIENT DEPENDENCY -->
-      <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
-      <!-- SPELL CHECKER -->
-      <add verb="GET,HEAD,POST" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
-    </httpHandlers>
-    <compilation defaultLanguage="c#" debug="true" batch="false">
-      <assemblies>
-        <!-- ASPNETAJAX -->
-        <add assembly="System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
-        <add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Extensions.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-        <!--<add assembly="Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" /> -->
-      </assemblies>
-    </compilation>
-    <authentication mode="Forms">
-      <forms name="yourAuthCookie" loginUrl="login.aspx" protection="All" path="/" />
-    </authentication>
-    <authorization>
-      <allow users="?" />
-    </authorization>
-    <!-- Membership Provider -->
-    <membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
-      <providers>
-        <clear />
-        <add name="UmbracoMembershipProvider" type="umbraco.providers.members.UmbracoMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Another Type" passwordFormat="Hashed" />
-        <add name="UsersMembershipProvider" type="umbraco.providers.UsersMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" />
-      </providers>
-    </membership>
-    <!-- added by NH to support membership providers in access layer -->
-    <roleManager enabled="true" defaultProvider="UmbracoRoleProvider">
-      <providers>
-        <clear />
-        <add name="UmbracoRoleProvider" type="umbraco.providers.members.UmbracoRoleProvider" />
-      </providers>
-    </roleManager>
-    <!-- Sitemap provider-->
-    <siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
-      <providers>
-        <clear />
-        <add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true" />
-      </providers>
-    </siteMap>
-  </system.web>
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-    <modules>
-      <remove name="ScriptModule" />
-      <remove name="UrlRewriteModule" />
-      <remove name="umbracoRequestModule" />
-      <remove name="viewstateMoverModule" />
-      <remove name="umbracoBaseRequestModule" />
-      <remove name="ClientDependencyModule" />
-      <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
-      <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
-      <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
-      <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
-      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
-    </modules>
-    <handlers accessPolicy="Read, Write, Script, Execute">
-      <remove name="WebServiceHandlerFactory-Integrated" />
-      <remove name="ScriptHandlerFactory" />
-      <remove name="ScriptHandlerFactoryAppServices" />
-      <remove name="ScriptResource" />
-      <remove name="Channels" />
-      <remove name="Channels_Word" />
-      <remove name="ClientDependency" />
-      <remove name="SpellChecker" />
-      <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="*" name="Channels" preCondition="integratedMode" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
-      <add verb="*" name="Channels_Word" preCondition="integratedMode" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
-      <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
-      <add verb="GET,HEAD,POST" preCondition="integratedMode" name="SpellChecker" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
-    </handlers>
-  </system.webServer>
-  <system.codedom>
-    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider,System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
-        <providerOption name="CompilerVersion" value="v3.5" />
-        <providerOption name="WarnAsError" value="false" />
-      </compiler>
-    </compilers>
-  </system.codedom>
-  <runtime>
-    <!--    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
-      </dependentAssembly>
-    </assemblyBinding>
--->
-  </runtime>
-</configuration>
\ No newline at end of file
diff --git a/src/umbraco.presentation/Web.SLACEBOX.config b/src/umbraco.presentation/Web.SLACEBOX.config
deleted file mode 100644
index 2cb97f3c21..0000000000
--- a/src/umbraco.presentation/Web.SLACEBOX.config
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="urlrewritingnet" restartOnExternalChanges="true" requirePermission="false" type="UrlRewritingNet.Configuration.UrlRewriteSection, UrlRewritingNet.UrlRewriter" />
-    <!--
-      <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
-    
-
-      ASPNETAJAX ** DISABLED BY ALEX NORCLIFFE 2010 06 03 FOR COMPATIBILITY WITH RUNNING UNDER .NET 4
-      USERS CAN ADD THIS THEMSELVES IF THEY WISH TO USE ASP.NET AJAX
-      -->
-    <!--<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-        <section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-        <sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-          <section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere" />
-          <section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-          <section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-          <section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-        </sectionGroup>
-      </sectionGroup>
-    </sectionGroup>-->
-    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="umbraco.presentation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-    </sectionGroup>
-    <section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false" />
-    <section name="Examine" type="Examine.Config.ExamineSettings, Examine" requirePermission="false" />
-    <section name="ExamineLuceneIndexSets" type="UmbracoExamine.Config.ExamineLuceneIndexes, UmbracoExamine" requirePermission="false" />
-  </configSections>
-  <urlrewritingnet configSource="config\UrlRewriting.config" />
-  <!-- <microsoft.scripting configSource="config\scripting.config" />-->
-  <clientDependency configSource="config\ClientDependency.config" />
-  <Examine configSource="config\ExamineSettings.config" />
-  <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
-  <appSettings>
-    <add key="umbracoDbDSN" value="server=.\sqlexpress;database=umbraco-nightly;integrated security=true;" />
-    <add key="umbracoConfigurationStatus" value="4.6.0.Alpha" />
-    <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
-    <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
-    <add key="umbracoContentXML" value="~/App_Data/umbraco.config" />
-    <add key="umbracoStorageDirectory" value="~/App_Data" />
-    <add key="umbracoPath" value="~/umbraco" />
-    <add key="umbracoEnableStat" value="false" />
-    <add key="umbracoHideTopLevelNodeFromPath" value="true" />
-    <add key="umbracoEditXhtmlMode" value="true" />
-    <add key="umbracoUseDirectoryUrls" value="false" />
-    <add key="umbracoDebugMode" value="true" />
-    <add key="umbracoTimeOutInMinutes" value="20" />
-    <add key="umbracoVersionCheckPeriod" value="7" />
-    <add key="umbracoDisableXsltExtensions" value="true" />
-    <add key="umbracoDefaultUILanguage" value="en" />
-    <add key="umbracoProfileUrl" value="profiler" />
-    <add key="umbracoUseSSL" value="false" />
-    <add key="umbracoUseMediumTrust" value="false" />
-    <!-- 
-      Set this to true to enable storing the xml cache locally to the IIS server even if the app files are stored centrally on a SAN/NAS 
-      Alex Norcliffe 2010 02 for 4.1
-    -->
-    <add key="umbracoContentXMLUseLocalTemp" value="false" />
-  </appSettings>
-  <system.net>
-    <mailSettings>
-      <smtp>
-        <network host="127.0.0.1" userName="username" password="password" />
-      </smtp>
-    </mailSettings>
-  </system.net>
-  <!-- REMOVE FOR BETA -->
-  <!-- added by NH to test foreign membership providers-->
-  <connectionStrings>
-    <remove name="LocalSqlServer" />
-    <!--<add name="LocalSqlServer" connectionString="server=.\sqlexpress;database=aspnetdb;user id=DBUSER;password=DBPASSWORD" providerName="System.Data.SqlClient"/>-->
-  </connectionStrings>
-  <system.web>
-    <!-- <trust level="Medium" originUrl=".*" /> -->
-    <customErrors mode="Off" />
-    <trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
-    <sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20" />
-    <globalization requestEncoding="UTF-8" responseEncoding="UTF-8" />
-    <xhtmlConformance mode="Strict" />
-    <pages enableEventValidation="false">
-      <!-- ASPNETAJAX -->
-      <controls>
-        <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add tagPrefix="umbraco" namespace="umbraco.presentation.templateControls" assembly="umbraco" />
-        <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      </controls>
-    </pages>
-    <httpModules>
-      <!-- URL REWRTIER -->
-      <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
-      <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
-      <!-- UMBRACO -->
-      <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule, umbraco" />
-      <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule, umbraco" />
-      <!-- ASPNETAJAX -->
-      <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <!-- CLIENT DEPENDENCY -->
-      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
-    </httpModules>
-    <httpHandlers>
-      <remove verb="*" path="*.asmx" />
-      <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
-      <!-- UMBRACO CHANNELS -->
-      <add verb="*" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
-      <add verb="*" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
-      <!-- CLIENT DEPENDENCY -->
-      <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
-      <!-- SPELL CHECKER -->
-      <add verb="GET,HEAD,POST" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
-    </httpHandlers>
-    <compilation defaultLanguage="c#" debug="true" batch="false">
-      <assemblies>
-        <!-- ASPNETAJAX -->
-        <add assembly="System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
-        <add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Extensions.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-        <!--<add assembly="Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" /> -->
-      </assemblies>
-    </compilation>
-    <authentication mode="Forms">
-      <forms name="yourAuthCookie" loginUrl="login.aspx" protection="All" path="/" />
-    </authentication>
-    <authorization>
-      <allow users="?" />
-    </authorization>
-    <!-- Membership Provider -->
-    <membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
-      <providers>
-        <clear />
-        <add name="UmbracoMembershipProvider" type="umbraco.providers.members.UmbracoMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Another Type" passwordFormat="Hashed" />
-        <add name="UsersMembershipProvider" type="umbraco.providers.UsersMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" />
-      </providers>
-    </membership>
-    <!-- added by NH to support membership providers in access layer -->
-    <roleManager enabled="true" defaultProvider="UmbracoRoleProvider">
-      <providers>
-        <clear />
-        <add name="UmbracoRoleProvider" type="umbraco.providers.members.UmbracoRoleProvider" />
-      </providers>
-    </roleManager>
-    <!-- Sitemap provider-->
-    <siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
-      <providers>
-        <clear />
-        <add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true" />
-      </providers>
-    </siteMap>
-  </system.web>
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-    <modules>
-      <remove name="ScriptModule" />
-      <remove name="UrlRewriteModule" />
-      <remove name="umbracoRequestModule" />
-      <remove name="viewstateMoverModule" />
-      <remove name="umbracoBaseRequestModule" />
-      <remove name="ClientDependencyModule" />
-      <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
-      <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
-      <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
-      <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
-      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
-    </modules>
-    <handlers accessPolicy="Read, Write, Script, Execute">
-      <remove name="WebServiceHandlerFactory-Integrated" />
-      <remove name="ScriptHandlerFactory" />
-      <remove name="ScriptHandlerFactoryAppServices" />
-      <remove name="ScriptResource" />
-      <remove name="Channels" />
-      <remove name="Channels_Word" />
-      <remove name="ClientDependency" />
-      <remove name="SpellChecker" />
-      <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="*" name="Channels" preCondition="integratedMode" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
-      <add verb="*" name="Channels_Word" preCondition="integratedMode" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
-      <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
-      <add verb="GET,HEAD,POST" preCondition="integratedMode" name="SpellChecker" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
-    </handlers>
-  </system.webServer>
-  <system.codedom>
-    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider,System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
-        <providerOption name="CompilerVersion" value="v3.5" />
-        <providerOption name="WarnAsError" value="false" />
-      </compiler>
-    </compilers>
-  </system.codedom>
-  <runtime>
-    <!--    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
-      </dependentAssembly>
-    </assemblyBinding>
--->
-  </runtime>
-</configuration>
\ No newline at end of file
diff --git a/src/umbraco.presentation/Web.SSAODSK01.config b/src/umbraco.presentation/Web.SSAODSK01.config
deleted file mode 100644
index c7acda515f..0000000000
--- a/src/umbraco.presentation/Web.SSAODSK01.config
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="urlrewritingnet" restartOnExternalChanges="true" requirePermission="false" type="UrlRewritingNet.Configuration.UrlRewriteSection, UrlRewritingNet.UrlRewriter" />
-    <!--
-      <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
-    
-
-      ASPNETAJAX ** DISABLED BY ALEX NORCLIFFE 2010 06 03 FOR COMPATIBILITY WITH RUNNING UNDER .NET 4
-      USERS CAN ADD THIS THEMSELVES IF THEY WISH TO USE ASP.NET AJAX
-      -->
-    <!--<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-        <section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-        <sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-          <section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere" />
-          <section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-          <section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-          <section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-        </sectionGroup>
-      </sectionGroup>
-    </sectionGroup>-->
-    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="umbraco.presentation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-    </sectionGroup>
-    <section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false" />
-    <section name="Examine" type="Examine.Config.ExamineSettings, Examine" requirePermission="false" />
-    <section name="ExamineLuceneIndexSets" type="UmbracoExamine.Config.ExamineLuceneIndexes, UmbracoExamine" requirePermission="false" />
-    <!-- Added in Umbraco 4.6.2 -->
-    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-    </sectionGroup>
-    <!-- End of added in Umbraco 4.6.2 -->
-  </configSections>
-  <urlrewritingnet configSource="config\UrlRewriting.config" />
-  <!-- <microsoft.scripting configSource="config\scripting.config" />-->
-  <clientDependency configSource="config\ClientDependency.config" />
-  <Examine configSource="config\ExamineSettings.config" />
-  <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
-  <appSettings>
-    <add key="umbracoDbDSN" value="server=ssaodev2;database=udev;user id=dev;password=dev" />
-    <add key="umbracoConfigurationStatus" value="4.7.0" />
-    <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
-    <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
-    <add key="umbracoContentXML" value="~/App_Data/umbraco.config" />
-    <add key="umbracoStorageDirectory" value="~/App_Data" />
-    <add key="umbracoPath" value="~/umbraco" />
-    <add key="umbracoEnableStat" value="false" />
-    <add key="umbracoHideTopLevelNodeFromPath" value="true" />
-    <add key="umbracoEditXhtmlMode" value="true" />
-    <add key="umbracoUseDirectoryUrls" value="false" />
-    <add key="umbracoDebugMode" value="true" />
-    <add key="umbracoTimeOutInMinutes" value="20" />
-    <add key="umbracoVersionCheckPeriod" value="7" />
-    <add key="umbracoDisableXsltExtensions" value="true" />
-    <add key="umbracoDefaultUILanguage" value="en" />
-    <add key="umbracoProfileUrl" value="profiler" />
-    <add key="umbracoUseSSL" value="false" />
-    <add key="umbracoUseMediumTrust" value="false" />
-    <!-- 
-      Set this to true to enable storing the xml cache locally to the IIS server even if the app files are stored centrally on a SAN/NAS 
-      Alex Norcliffe 2010 02 for 4.1
-    -->
-    <add key="umbracoContentXMLUseLocalTemp" value="false" />
-    <!-- Added in Umbraco 4.6.2 -->
-    <add key="webpages:Enabled" value="false" />
-    <add key="enableSimpleMembership" value="false" />
-    <add key="autoFormsAuthentication" value="false" />
-    <!-- End of added in Umbraco 4.6.2 -->
-  </appSettings>
-  <system.net>
-    <mailSettings>
-      <smtp>
-        <network host="127.0.0.1" userName="username" password="password" />
-      </smtp>
-    </mailSettings>
-  </system.net>
-  <connectionStrings>
-    <remove name="LocalSqlServer" />
-    <!--<add name="LocalSqlServer" connectionString="server=.\sqlexpress;database=aspnetdb;user id=DBUSER;password=DBPASSWORD" providerName="System.Data.SqlClient"/>-->
-  </connectionStrings>
-  <system.web>
-    <httpRuntime requestValidationMode="2.0" />
-    <customErrors mode="Off" />
-    <trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
-    <sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20" />
-    <globalization requestEncoding="UTF-8" responseEncoding="UTF-8" />
-    <xhtmlConformance mode="Strict" />
-    <pages enableEventValidation="false">
-      <!-- ASPNETAJAX -->
-      <controls>
-        <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add tagPrefix="umbraco" namespace="umbraco.presentation.templateControls" assembly="umbraco" />
-        <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      </controls>
-    </pages>
-    <httpModules>
-      <!-- URL REWRTIER -->
-      <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
-      <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
-      <!-- UMBRACO -->
-      <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule, umbraco" />
-      <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule, umbraco" />
-      <!-- ASPNETAJAX -->
-      <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <!-- CLIENT DEPENDENCY -->
-      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
-    </httpModules>
-    <httpHandlers>
-      <remove verb="*" path="*.asmx" />
-      <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
-      <!-- UMBRACO CHANNELS -->
-      <add verb="*" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
-      <add verb="*" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
-      <!-- CLIENT DEPENDENCY -->
-      <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
-      <!-- SPELL CHECKER -->
-      <add verb="GET,HEAD,POST" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
-    </httpHandlers>
-    <compilation defaultLanguage="c#" debug="true" batch="false">
-      <assemblies>
-        <!-- ASPNETAJAX -->
-        <add assembly="System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
-        <add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Extensions.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-        <!--<add assembly="Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" /> -->
-      </assemblies>
-      <!-- Added in Umbraco 4.6.2 -->
-      <buildProviders>
-        <add extension=".cshtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
-        <add extension=".vbhtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
-        <add extension=".razor" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
-      </buildProviders>
-      <!-- End of added in Umbraco 4.6.2 -->
-    </compilation>
-    <authentication mode="Forms">
-      <forms name="yourAuthCookie" loginUrl="login.aspx" protection="All" path="/" />
-    </authentication>
-    <authorization>
-      <allow users="?" />
-    </authorization>
-    <!-- Membership Provider -->
-    <membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
-      <providers>
-        <clear />
-        <add name="UmbracoMembershipProvider" type="umbraco.providers.members.UmbracoMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Another Type" passwordFormat="Hashed" />
-        <add name="UsersMembershipProvider" type="umbraco.providers.UsersMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" />
-      </providers>
-    </membership>
-    <!-- added by NH to support membership providers in access layer -->
-    <roleManager enabled="true" defaultProvider="UmbracoRoleProvider">
-      <providers>
-        <clear />
-        <add name="UmbracoRoleProvider" type="umbraco.providers.members.UmbracoRoleProvider" />
-      </providers>
-    </roleManager>
-    <!-- Sitemap provider-->
-    <siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
-      <providers>
-        <clear />
-        <add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true" />
-      </providers>
-    </siteMap>
-  </system.web>
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-    <modules>
-      <remove name="ScriptModule" />
-      <remove name="UrlRewriteModule" />
-      <remove name="umbracoRequestModule" />
-      <remove name="viewstateMoverModule" />
-      <remove name="umbracoBaseRequestModule" />
-      <remove name="ClientDependencyModule" />
-      <!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
-      <remove name="FormsAuthentication" />
-      <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
-      <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
-      <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
-      <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
-      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
-      <!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
-      <add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule" />
-    </modules>
-    <handlers accessPolicy="Read, Write, Script, Execute">
-      <remove name="WebServiceHandlerFactory-Integrated" />
-      <remove name="ScriptHandlerFactory" />
-      <remove name="ScriptHandlerFactoryAppServices" />
-      <remove name="ScriptResource" />
-      <remove name="Channels" />
-      <remove name="Channels_Word" />
-      <remove name="ClientDependency" />
-      <remove name="SpellChecker" />
-      <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="*" name="Channels" preCondition="integratedMode" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
-      <add verb="*" name="Channels_Word" preCondition="integratedMode" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
-      <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
-      <add verb="GET,HEAD,POST" preCondition="integratedMode" name="SpellChecker" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
-    </handlers>
-    <staticContent>
-      <mimeMap fileExtension=".air" mimeType="application/vnd.adobe.air-application-installer-package+zip" />
-    </staticContent>
-  </system.webServer>
-  <system.codedom>
-    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider,System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
-        <providerOption name="CompilerVersion" value="v3.5" />
-        <providerOption name="WarnAsError" value="false" />
-      </compiler>
-    </compilers>
-  </system.codedom>
-  <runtime>
-    <!--    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
-      </dependentAssembly>
-    </assemblyBinding>
--->
-  </runtime>
-  <!-- Added in Umbraco 4.6.2 -->
-  <system.web.webPages.razor>
-    <!--<host factoryType="umbraco.MacroEngines.RazorUmbracoFactory, umbraco.MacroEngines"/>-->
-    <pages pageBaseType="umbraco.MacroEngines.DynamicNodeContext">
-      <namespaces>
-        <add namespace="Microsoft.Web.Helpers" />
-        <add namespace="umbraco" />
-        <add namespace="Examine" />
-      </namespaces>
-    </pages>
-  </system.web.webPages.razor>
-  <!-- End of added in Umbraco 4.6.2 -->
-</configuration>
\ No newline at end of file
diff --git a/src/umbraco.presentation/Web.SSAOLAP01.config b/src/umbraco.presentation/Web.SSAOLAP01.config
deleted file mode 100644
index 40048a89d6..0000000000
--- a/src/umbraco.presentation/Web.SSAOLAP01.config
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="urlrewritingnet" restartOnExternalChanges="true" requirePermission="false" type="UrlRewritingNet.Configuration.UrlRewriteSection, UrlRewritingNet.UrlRewriter" />
-    <!--
-      <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
-    
-
-      ASPNETAJAX ** DISABLED BY ALEX NORCLIFFE 2010 06 03 FOR COMPATIBILITY WITH RUNNING UNDER .NET 4
-      USERS CAN ADD THIS THEMSELVES IF THEY WISH TO USE ASP.NET AJAX
-      -->
-    <!--<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-        <section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-        <sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-          <section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere" />
-          <section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-          <section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-          <section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-        </sectionGroup>
-      </sectionGroup>
-    </sectionGroup>-->
-    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="umbraco.presentation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-    </sectionGroup>
-    <section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false" />
-    <section name="Examine" type="Examine.Config.ExamineSettings, Examine" requirePermission="false" />
-    <section name="ExamineLuceneIndexSets" type="UmbracoExamine.Config.ExamineLuceneIndexes, UmbracoExamine" requirePermission="false" />
-    <!-- Added in Umbraco 4.6.2 -->
-    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-    </sectionGroup>
-    <!-- End of added in Umbraco 4.6.2 -->
-  </configSections>
-  <urlrewritingnet configSource="config\UrlRewriting.config" />
-  <!-- <microsoft.scripting configSource="config\scripting.config" />-->
-  <clientDependency configSource="config\ClientDependency.config" />
-  <Examine configSource="config\ExamineSettings.config" />
-  <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
-  <appSettings>
-    <add key="umbracoDbDSN" value="server=ssaolap01;database=udev;integrated security=false;user id=dev;pwd=dev" />
-    <add key="umbracoConfigurationStatus" value="4.7.0" />
-    <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
-    <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
-    <add key="umbracoContentXML" value="~/App_Data/umbraco.config" />
-    <add key="umbracoStorageDirectory" value="~/App_Data" />
-    <add key="umbracoPath" value="~/umbraco" />
-    <add key="umbracoEnableStat" value="false" />
-    <add key="umbracoHideTopLevelNodeFromPath" value="true" />
-    <add key="umbracoEditXhtmlMode" value="true" />
-    <add key="umbracoUseDirectoryUrls" value="false" />
-    <add key="umbracoDebugMode" value="true" />
-    <add key="umbracoTimeOutInMinutes" value="20" />
-    <add key="umbracoVersionCheckPeriod" value="7" />
-    <add key="umbracoDisableXsltExtensions" value="true" />
-    <add key="umbracoDefaultUILanguage" value="en" />
-    <add key="umbracoProfileUrl" value="profiler" />
-    <add key="umbracoUseSSL" value="false" />
-    <add key="umbracoUseMediumTrust" value="false" />
-    <!-- 
-      Set this to true to enable storing the xml cache locally to the IIS server even if the app files are stored centrally on a SAN/NAS 
-      Alex Norcliffe 2010 02 for 4.1
-    -->
-    <add key="umbracoContentXMLUseLocalTemp" value="false" />
-    <!-- Added in Umbraco 4.6.2 -->
-    <add key="webpages:Enabled" value="false" />
-    <add key="enableSimpleMembership" value="false" />
-    <add key="autoFormsAuthentication" value="false" />
-    <!-- End of added in Umbraco 4.6.2 -->
-  </appSettings>
-  <system.net>
-    <mailSettings>
-      <smtp>
-        <network host="127.0.0.1" userName="username" password="password" />
-      </smtp>
-    </mailSettings>
-  </system.net>
-  <connectionStrings>
-    <remove name="LocalSqlServer" />
-    <!--<add name="LocalSqlServer" connectionString="server=.\sqlexpress;database=aspnetdb;user id=DBUSER;password=DBPASSWORD" providerName="System.Data.SqlClient"/>-->
-  </connectionStrings>
-  <system.web>
-    <httpRuntime requestValidationMode="2.0" />
-    <customErrors mode="Off" />
-    <trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
-    <sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20" />
-    <globalization requestEncoding="UTF-8" responseEncoding="UTF-8" />
-    <xhtmlConformance mode="Strict" />
-    <pages enableEventValidation="false">
-      <!-- ASPNETAJAX -->
-      <controls>
-        <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add tagPrefix="umbraco" namespace="umbraco.presentation.templateControls" assembly="umbraco" />
-        <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      </controls>
-    </pages>
-    <httpModules>
-      <!-- URL REWRTIER -->
-      <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
-      <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
-      <!-- UMBRACO -->
-      <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule, umbraco" />
-      <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule, umbraco" />
-      <!-- ASPNETAJAX -->
-      <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <!-- CLIENT DEPENDENCY -->
-      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
-    </httpModules>
-    <httpHandlers>
-      <remove verb="*" path="*.asmx" />
-      <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
-      <!-- UMBRACO CHANNELS -->
-      <add verb="*" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
-      <add verb="*" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
-      <!-- CLIENT DEPENDENCY -->
-      <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
-      <!-- SPELL CHECKER -->
-      <add verb="GET,HEAD,POST" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
-    </httpHandlers>
-    <compilation defaultLanguage="c#" debug="true" batch="false">
-      <assemblies>
-        <!-- ASPNETAJAX -->
-        <add assembly="System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
-        <add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Extensions.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-        <!--<add assembly="Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" /> -->
-      </assemblies>
-      <!-- Added in Umbraco 4.6.2 -->
-      <buildProviders>
-        <add extension=".cshtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
-        <add extension=".vbhtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
-        <add extension=".razor" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
-      </buildProviders>
-      <!-- End of added in Umbraco 4.6.2 -->
-    </compilation>
-    <authentication mode="Forms">
-      <forms name="yourAuthCookie" loginUrl="login.aspx" protection="All" path="/" />
-    </authentication>
-    <authorization>
-      <allow users="?" />
-    </authorization>
-    <!-- Membership Provider -->
-    <membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
-      <providers>
-        <clear />
-        <add name="UmbracoMembershipProvider" type="umbraco.providers.members.UmbracoMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Another Type" passwordFormat="Hashed" />
-        <add name="UsersMembershipProvider" type="umbraco.providers.UsersMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" />
-      </providers>
-    </membership>
-    <!-- added by NH to support membership providers in access layer -->
-    <roleManager enabled="true" defaultProvider="UmbracoRoleProvider">
-      <providers>
-        <clear />
-        <add name="UmbracoRoleProvider" type="umbraco.providers.members.UmbracoRoleProvider" />
-      </providers>
-    </roleManager>
-    <!-- Sitemap provider-->
-    <siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
-      <providers>
-        <clear />
-        <add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true" />
-      </providers>
-    </siteMap>
-  </system.web>
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-    <modules>
-      <remove name="ScriptModule" />
-      <remove name="UrlRewriteModule" />
-      <remove name="umbracoRequestModule" />
-      <remove name="viewstateMoverModule" />
-      <remove name="umbracoBaseRequestModule" />
-      <remove name="ClientDependencyModule" />
-      <!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
-      <remove name="FormsAuthentication" />
-      <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
-      <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
-      <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
-      <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
-      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
-      <!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
-      <add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule" />
-    </modules>
-    <handlers accessPolicy="Read, Write, Script, Execute">
-      <remove name="WebServiceHandlerFactory-Integrated" />
-      <remove name="ScriptHandlerFactory" />
-      <remove name="ScriptHandlerFactoryAppServices" />
-      <remove name="ScriptResource" />
-      <remove name="Channels" />
-      <remove name="Channels_Word" />
-      <remove name="ClientDependency" />
-      <remove name="SpellChecker" />
-      <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="*" name="Channels" preCondition="integratedMode" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
-      <add verb="*" name="Channels_Word" preCondition="integratedMode" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
-      <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
-      <add verb="GET,HEAD,POST" preCondition="integratedMode" name="SpellChecker" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
-    </handlers>
-    <staticContent>
-      <mimeMap fileExtension=".air" mimeType="application/vnd.adobe.air-application-installer-package+zip" />
-    </staticContent>
-  </system.webServer>
-  <system.codedom>
-    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider,System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
-        <providerOption name="CompilerVersion" value="v3.5" />
-        <providerOption name="WarnAsError" value="false" />
-      </compiler>
-    </compilers>
-  </system.codedom>
-  <runtime>
-    <!--    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
-      </dependentAssembly>
-    </assemblyBinding>
--->
-  </runtime>
-  <!-- Added in Umbraco 4.6.2 -->
-  <system.web.webPages.razor>
-    <!--<host factoryType="umbraco.MacroEngines.RazorUmbracoFactory, umbraco.MacroEngines"/>-->
-    <pages pageBaseType="umbraco.MacroEngines.DynamicNodeContext">
-      <namespaces>
-        <add namespace="Microsoft.Web.Helpers" />
-        <add namespace="umbraco" />
-        <add namespace="Examine" />
-      </namespaces>
-    </pages>
-  </system.web.webPages.razor>
-  <!-- End of added in Umbraco 4.6.2 -->
-</configuration>
\ No newline at end of file
diff --git a/src/umbraco.presentation/web.Template.Release.config b/src/umbraco.presentation/web.Template.Release.config
index bcfa7960e1..0a5c4986c0 100644
--- a/src/umbraco.presentation/web.Template.Release.config
+++ b/src/umbraco.presentation/web.Template.Release.config
@@ -5,7 +5,12 @@
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
 
   <appSettings>
-    <add xdt:Transform="Replace" xdt:Locator="Match(key)" key="umbracoDebugMode" value="false"/>
+    <add xdt:Transform="Replace" xdt:Locator="Match(key)" key="umbracoDbDSN"
+         value=""/>
+    <add xdt:Transform="Replace" xdt:Locator="Match(key)" key="umbracoConfigurationStatus"
+         value=""/>
+    <add xdt:Transform="Replace" xdt:Locator="Match(key)" key="umbracoDebugMode" 
+         value="false"/>
   </appSettings>
   
   <system.web>