diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings.cs b/src/Umbraco.Core/Configuration/UmbracoSettings.cs
index 26e1d7db43..b7e3016d16 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings.cs
@@ -333,28 +333,6 @@ namespace Umbraco.Core.Configuration
             }
         }
 
-        /// <summary>
-        /// Gets a value indicating whether umbraco shouldn't add X-Umbraco-Version to the http header.
-        /// </summary>
-        /// <value><c>true</c> if umbraco will not add header; otherwise, <c>false</c>.</value>
-        public static bool RemoveUmbracoVersionHeader
-        {
-            get
-            {
-                try
-                {
-                    bool result;
-                    if (bool.TryParse(GetKey("/settings/requestHandler/removeUmbracoVersionHeader"), out result))
-                        return result;
-                    return false;
-                }
-                catch
-                {
-                    return false;
-                }
-            }
-        }
-
         /// <summary>
         /// This will add a trailing slash (/) to urls when in directory url mode
         /// NOTICE: This will always return false if Directory Urls in not active
diff --git a/src/Umbraco.Core/ICultureDictionary.cs b/src/Umbraco.Core/ICultureDictionary.cs
new file mode 100644
index 0000000000..1131424551
--- /dev/null
+++ b/src/Umbraco.Core/ICultureDictionary.cs
@@ -0,0 +1,13 @@
+using System.Globalization;
+
+namespace Umbraco.Core
+{
+	/// <summary>
+	/// Represents a dictionary based on a specific culture
+	/// </summary>
+	internal interface ICultureDictionary
+	{
+		string this[string key] { get; }
+		CultureInfo Language { get; }
+	}
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/IThumbnailProvider.cs b/src/Umbraco.Core/IThumbnailProvider.cs
index 7a60dad1d3..c63f253509 100644
--- a/src/Umbraco.Core/IThumbnailProvider.cs
+++ b/src/Umbraco.Core/IThumbnailProvider.cs
@@ -5,7 +5,7 @@ using System.Text;
 
 namespace Umbraco.Core
 {
-    internal interface IThumbnailProvider
+	internal interface IThumbnailProvider
     {
         int Priority { get; }
         bool CanProvideThumbnail(string fileUrl);
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 725875506c..ea3bf482c9 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -56,6 +56,7 @@
     <Compile Include="Configuration\FileSystemProvidersSection.cs" />
     <Compile Include="CoreBootManager.cs" />
     <Compile Include="DocumentPropertyExtensions.cs" />
+    <Compile Include="ICultureDictionary.cs" />
     <Compile Include="Models\IDocument.cs" />
     <Compile Include="Models\IDocumentProperty.cs" />
     <Compile Include="ActionsResolver.cs" />
diff --git a/src/Umbraco.Web/Mvc/RenderViewPage.cs b/src/Umbraco.Web/Mvc/RenderViewPage.cs
index 0a67b12c56..9def6caeca 100644
--- a/src/Umbraco.Web/Mvc/RenderViewPage.cs
+++ b/src/Umbraco.Web/Mvc/RenderViewPage.cs
@@ -1,4 +1,5 @@
 using System.Web.Mvc;
+using Umbraco.Core;
 using Umbraco.Web.Routing;
 
 namespace Umbraco.Web.Mvc
@@ -33,15 +34,15 @@ namespace Umbraco.Web.Mvc
 
 		public dynamic CurrentPage { get; private set; }
 
-		//private ICultureDictionary _cultureDictionary;
-		//public string GetDictionary(string key)
-		//{
-		//    if (_cultureDictionary == null)
-		//    {
-		//        _cultureDictionary = new UmbracoCultureDictionary();
-		//    }
-		//    return _cultureDictionary[key];
-		//}
+		private ICultureDictionary _cultureDictionary;
+		public string GetDictionary(string key)
+		{
+			if (_cultureDictionary == null)
+			{
+				_cultureDictionary = new UmbracoCultureDictionary();
+			}
+			return _cultureDictionary[key];
+		}
 
 		//private RazorLibraryCore _library;
 		//public RazorLibraryCore Library
diff --git a/src/Umbraco.Web/UmbracoModule.cs b/src/Umbraco.Web/UmbracoModule.cs
index 006d765617..9ded87e898 100644
--- a/src/Umbraco.Web/UmbracoModule.cs
+++ b/src/Umbraco.Web/UmbracoModule.cs
@@ -39,10 +39,6 @@ namespace Umbraco.Web
 				return;
 			}
 
-			// add Umbraco's signature header
-			if (!UmbracoSettings.RemoveUmbracoVersionHeader)
-				httpContext.Response.AddHeader("X-Umbraco-Version", string.Format("{0}.{1}", GlobalSettings.VersionMajor, GlobalSettings.VersionMinor));
-
 			//create the legacy UmbracoContext
 			global::umbraco.presentation.UmbracoContext.Current = new global::umbraco.presentation.UmbracoContext(httpContext);
 
diff --git a/src/umbraco.businesslogic/UmbracoSettings.cs b/src/umbraco.businesslogic/UmbracoSettings.cs
index b56d1a0670..855028adfb 100644
--- a/src/umbraco.businesslogic/UmbracoSettings.cs
+++ b/src/umbraco.businesslogic/UmbracoSettings.cs
@@ -173,15 +173,6 @@ namespace umbraco
 			get { return Umbraco.Core.Configuration.UmbracoSettings.UseDomainPrefixes; }
         }
 
-        /// <summary>
-        /// Gets a value indicating whether umbraco shouldn't add X-Umbraco-Version to the http header.
-        /// </summary>
-        /// <value><c>true</c> if umbraco will not add header; otherwise, <c>false</c>.</value>
-        public static bool RemoveUmbracoVersionHeader
-        {
-			get { return Umbraco.Core.Configuration.UmbracoSettings.RemoveUmbracoVersionHeader; }
-        }
-
         /// <summary>
         /// This will add a trailing slash (/) to urls when in directory url mode
         /// NOTICE: This will always return false if Directory Urls in not active