diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
index 36e85d567a..30526ee2a3 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
@@ -1,74 +1,30 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <settings>
-  <content>
-    <imaging>
-      <!-- what file extension that should cause umbraco to create thumbnails -->
-      <imageFileTypes>jpeg,jpg,gif,bmp,png,tiff,tif</imageFileTypes>
-      <!-- what attributes that are allowed in the editor on an img tag -->
-      <allowedAttributes>src,alt,border,class,style,align,id,name,onclick,usemap</allowedAttributes>
-      <!-- automatically updates dimension, filesize and extension attributes on upload -->
-      <autoFillImageProperties>
-        <uploadField alias="umbracoFile">
-          <widthFieldAlias>umbracoWidth</widthFieldAlias>
-          <heightFieldAlias>umbracoHeight</heightFieldAlias>
-          <lengthFieldAlias>umbracoBytes</lengthFieldAlias>
-          <extensionFieldAlias>umbracoExtension</extensionFieldAlias>
-        </uploadField>
-      </autoFillImageProperties>
-    </imaging>
-    <scripteditor>
-      <!-- Path to script folder - no ending "/" -->
-      <scriptFolderPath>/scripts</scriptFolderPath>
-      <!-- what files can be opened/created in the script editor -->
-      <scriptFileTypes>js,xml</scriptFileTypes>
-      <!-- disable the codemirror editor and use a simple textarea instead -->
-      <scriptDisableEditor>false</scriptDisableEditor>
-    </scripteditor>
 
-    <!-- should umbraco store the uploaded files like /media/xxx/filename.ext or like /media/xxx-filename.ext
-		should be set to false if the aspnet account hasn't got readrights of the driveroot up to the /media directory -->
-    <UploadAllowDirectories>True</UploadAllowDirectories>
+  <!-- 
+    umbracoSettings.config configuration documentation can be found here: 
+    http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/
+    Many of the optional settings are not explicitly listed here 
+    but can be found in the online documentation.
+    -->
+  
+  <content>
+    
     <errors>
-      <!-- the id of the page that should be shown if the page is not found -->
-      <!--<error404>
-                   <errorPage culture="default">1</errorPage>
-                   <errorPage culture="en-US">200</errorPage>
-            </error404>-->
       <error404>1</error404>
+      <!--
+        <error404>
+            <errorPage culture="default">1</errorPage>
+            <errorPage culture="en-US">200</errorPage>
+        </error404>
+       -->      
     </errors>
+    
     <notifications>
       <!-- the email that should be used as from mail when umbraco sends a notification -->
       <email>your@email.here</email>
     </notifications>
 
-    <!-- if true umbraco will ensure that no page under the same parent has an identical name -->
-    <ensureUniqueNaming>True</ensureUniqueNaming>
-
-    <!-- clean editor content with use of tidy -->
-    <TidyEditorContent>False</TidyEditorContent>
-
-    <!-- the encoding type for tidy. Default is UTF8, options are ASCII, Raw, Latin1, UTF8, ISO2022, MacroMan-->
-    <TidyCharEncoding>UTF8</TidyCharEncoding>
-
-    <!-- to enable new content schema, this needs to be false -->
-    <UseLegacyXmlSchema>false</UseLegacyXmlSchema>
-
-    <!-- Whether to force safe aliases (no spaces, no special characters) at businesslogic level on contenttypes and propertytypes -->
-    <!-- HIGHLY recommend to keep this to true to ensure valid and beautiful XML Schemas -->
-    <ForceSafeAliases>true</ForceSafeAliases>
-
-    <!-- Enable / disable xml content cache -->
-    <XmlCacheEnabled>True</XmlCacheEnabled>
-
-    <!-- Update disk cache every time content has changed -->
-    <ContinouslyUpdateXmlDiskCache>True</ContinouslyUpdateXmlDiskCache>
-
-    <!-- Update in-memory cache if xml file is changed -->
-    <XmlContentCheckForDiskChanges>False</XmlContentCheckForDiskChanges>
-
-    <!-- Show the /config/splashes/booting.aspx page while initializing content -->
-    <EnableSplashWhileLoading>False</EnableSplashWhileLoading>
-
     <!-- Show property descriptions in editing view "icon|text|none" -->
     <PropertyContextHelpOption>text</PropertyContextHelpOption>
 
@@ -79,11 +35,6 @@
     <!-- In seconds. 0 will disable cache -->
     <UmbracoLibraryCacheDuration>1800</UmbracoLibraryCacheDuration>
 
-    <!-- Url Resolving ensures that all links works if you run Umbraco in virtual directories -->
-    <!-- Setting this to true can increase render time for pages with a large number of links -->
-    <!-- If running Umbraco in virtual directory this *must* be set to true! -->
-    <ResolveUrlsFromTextString>false</ResolveUrlsFromTextString>
-
     <!-- How Umbraco should handle errors during macro execution. Can be one of the following values:
          - inline - show an inline error within the macro but allow the page to continue rendering. Historial Umbraco behaviour.
          - silent - Silently suppress the error and do not render the offending macro.
@@ -92,20 +43,6 @@
          Note the error can also be handled by the umbraco.macro.Error event, where you can log/alarm with your own code and change the behaviour per event. -->
     <MacroErrors>inline</MacroErrors>
 
-    <!-- How Umbraco should show icons in the document type editor. Historically, the list has included all the files in
-             /Umbraco/Images/Umbraco plus a CSS sprite defined in Umbraco_Client/Tree/treeIcons.css, unfortunately these 
-             contain many duplicates. The DocumentTypeIconList setting allows you to favor one list over the other.
-             
-             Can be one of the following values:
-             - ShowDuplicates       - Show duplicates in files and sprites. Historial Umbraco behaviour.
-             - HideSpriteDuplicates - If a file exists on disk with the same name as one in the sprite
-                                      then the file on disk overrules the one in the sprite, the 
-                                      sprite icon will not be shown
-             - HideFileDuplicates   - If a file exists on disk with the same name as one in the sprite
-                                      then the file in the sprite overrules the one on disk, the file
-                                      on disk will be shown (recommended) -->
-    <DocumentTypeIconList>ShowDuplicates</DocumentTypeIconList>
-
     <!-- These file types will not be allowed to be uploaded via the upload control for media and content -->
     <disallowedUploadFiles>ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd</disallowedUploadFiles>
 
@@ -116,7 +53,6 @@
   <security>
     <!-- set to true to auto update login interval (and there by disabling the lock screen -->
     <keepUserLoggedIn>true</keepUserLoggedIn>
-
     <!-- change in 4.8: Disabled users are now showed dimmed and last in the tree. If you prefer not to display them set this to true -->
     <hideDisabledUsersInBackoffice>false</hideDisabledUsersInBackoffice>
   </security>
@@ -125,96 +61,14 @@
     <!-- this will ensure that urls are unique when running with multiple root nodes -->
     <useDomainPrefixes>false</useDomainPrefixes>
     <!-- this will add a trailing slash (/) to urls when in directory url mode -->
-    <addTrailingSlash>true</addTrailingSlash>
-    <urlReplacing removeDoubleDashes="true">
-      <char org=" ">-</char>
-      <char org="&quot;"></char>
-      <char org="'"></char>
-      <char org="%"></char>
-      <char org="."></char>
-      <char org=";"></char>
-      <char org="/"></char>
-      <char org="\"></char>
-      <char org=":"></char>
-      <char org="#"></char>
-      <char org="+">plus</char>
-      <char org="*">star</char>
-      <char org="&amp;"></char>
-      <char org="?"></char>
-      <char org="æ">ae</char>
-      <char org="ø">oe</char>
-      <char org="å">aa</char>
-      <char org="ä">ae</char>
-      <char org="ö">oe</char>
-      <char org="ü">ue</char>
-      <char org="ß">ss</char>
-      <char org="Ä">ae</char>
-      <char org="Ö">oe</char>
-      <char org="|">-</char>
-      <char org="&lt;"></char>
-      <char org="&gt;"></char>
-    </urlReplacing>
+    <addTrailingSlash>true</addTrailingSlash>   
   </requestHandler>
 
   <templates>
-    <!-- If you want to switch to Mvc then do NOT change useAspNetMasterPages to false -->
-    <!-- This (old!) setting is still used to control how macros are inserted into your pages -->
-    <useAspNetMasterPages>true</useAspNetMasterPages>
-
     <!-- To switch the default rendering engine to MVC, change this value from WebForms to Mvc -->
-    <!-- Do not set useAspNetMasterPages to false, it is not relevant to MVC usage -->
-    <defaultRenderingEngine>WebForms</defaultRenderingEngine>
+    <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>
-
-  <scripting>
-    <razor>
-      <!-- razor DynamicNode typecasting detects XML and returns DynamicXml - Root elements that won't convert to DynamicXml -->
-      <notDynamicXmlDocumentElements>
-        <element>p</element>
-        <element>div</element>
-        <element>ul</element>
-        <element>span</element>
-      </notDynamicXmlDocumentElements>
-      <dataTypeModelStaticMappings>
-        <!--
-            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
-            <mapping nodeTypeAlias="textPage" propertyTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
-            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000" nodeTypeAlias="textPage" propertyTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
-            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000" nodeTypeAlias="textPage">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
-            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000" propertyTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
-            <mapping propertyTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
-            -->
-      </dataTypeModelStaticMappings>
-    </razor>
-  </scripting>
-
-  <!-- This moves the asp.net viewstate data to the end of the html document instead of having it in the beginning-->
-  <viewstateMoverModule enable="false" />
-
-  <!-- 
-		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.
-		-->
-  <logging>
-    <enableLogging>true</enableLogging>
-    <enableAsyncLogging>true</enableAsyncLogging>
-    <disabledLogTypes>
-      <!-- <logTypeAlias>[alias-of-log-type-in-lowercase]</logTypeAlias> -->
-    </disabledLogTypes>
-    <!-- You can add your own logging tool by implementing the umbraco.BusinessLogic.Interfaces.ILog interface and add the reference here -->
-    <!-- The external logger can also act as the audit trail storage by setting the logAuditTrail attribute to true -->
-    <!--<externalLogger assembly="~/bin/assemblyFileName.dll" type="fully.qualified.namespace.and.type" logAuditTrail="false" /> -->
-  </logging>
-
   <scheduledTasks>
     <!-- add tasks that should be called with an interval (seconds) -->
     <!--    <task log="true" alias="test60" interval="60" url="http://localhost/umbraco/test.aspx"/>-->
@@ -233,26 +87,6 @@
     </servers>
   </distributedCall>
 
-  <!-- Configuration for repositories -->
-  <!-- Add or remove repositories here. You will need the repository's unique key to be able to connect to it.-->
-  <repositories>
-    <repository name="Umbraco package Repository" guid="65194810-1f85-11dd-bd0b-0800200c9a66" />
-  </repositories>
-
-  <providers>
-    <users>
-      <!-- if you wish to use your own membershipprovider for authenticating to the umbraco back office -->
-      <!-- specify it here (remember to add it to the web.config as well) -->
-      <DefaultBackofficeProvider>UsersMembershipProvider</DefaultBackofficeProvider>
-    </users>
-  </providers>
-
-  <!-- Maps language, usertype, application and application_url to help pages -->
-  <help defaultUrl="http://our.umbraco.org/wiki/umbraco-help/{0}/{1}">
-    <!-- Add links that should open custom help pages -->
-    <!--<link application="content" applicationUrl="dashboard.aspx"  language="en" userType="Administrators" helpUrl="http://www.xyz.no?{0}/{1}/{2}/{3}" /> -->
-  </help>
-
   <!-- 
     web.routing
       @trySkipIisCustomErrors