diff --git a/build/NuSpecs/tools/Web.config.install.xdt b/build/NuSpecs/tools/Web.config.install.xdt
index e3ba6b27df..2f6fb8f61c 100644
--- a/build/NuSpecs/tools/Web.config.install.xdt
+++ b/build/NuSpecs/tools/Web.config.install.xdt
@@ -2,7 +2,6 @@
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
   <configSections xdt:Transform="InsertIfMissing" />
   <configSections>
-    <section name="FileSystemProviders" xdt:Locator="Match(name)" xdt:Transform="Remove" />
     <section name="ExamineLuceneIndexSets" type="Umbraco.Examine.Config.IndexSets, Umbraco.Examine" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type,requirePermission)" />
 
     <sectionGroup name="applicationSettings" xdt:Locator="Match(name)">
@@ -11,7 +10,6 @@
     <sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
     <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing">
       <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-      <section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
       <section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
       <section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
     </sectionGroup>
@@ -27,13 +25,10 @@
 
   <umbracoConfiguration xdt:Transform="InsertIfMissing">
     <settings configSource="config\umbracoSettings.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
-    <FileSystemProviders configSource="config\FileSystemProviders.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
     <dashBoard configSource="config\Dashboard.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
     <HealthChecks configSource="config\HealthChecks.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
   </umbracoConfiguration>
 
-  <FileSystemProviders xdt:Transform="Remove" />
-
   <system.data xdt:Transform="InsertIfMissing">
     <DbProviderFactories xdt:Transform="InsertIfMissing">
       <remove invariant="System.Data.SqlServerCe.4.0" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
diff --git a/src/Umbraco.Core/Configuration/FileSystemProviderElement.cs b/src/Umbraco.Core/Configuration/FileSystemProviderElement.cs
deleted file mode 100644
index 1085439b9e..0000000000
--- a/src/Umbraco.Core/Configuration/FileSystemProviderElement.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Linq;
-using System.Text;
-
-namespace Umbraco.Core.Configuration
-{
-    public class FileSystemProviderElement : ConfigurationElement, IFileSystemProviderElement
-    {
-        private const string ALIAS_KEY = "alias";
-        private const string TYPE_KEY = "type";
-        private const string PARAMETERS_KEY = "Parameters";
-
-        [ConfigurationProperty(ALIAS_KEY, IsKey = true, IsRequired = true)]
-        public string Alias
-        {
-            get
-            {
-                return ((string)(base[ALIAS_KEY]));
-            }
-        }
-
-        [ConfigurationProperty(TYPE_KEY, IsKey = false, IsRequired = true)]
-        public string Type
-        {
-            get
-            {
-                return ((string)(base[TYPE_KEY]));
-            }
-        }
-
-        [ConfigurationProperty(PARAMETERS_KEY, IsDefaultCollection = true, IsRequired = false)]
-        public KeyValueConfigurationCollection Parameters
-        {
-            get
-            {
-                return ((KeyValueConfigurationCollection)(base[PARAMETERS_KEY]));
-            }
-        }
-
-        string IFileSystemProviderElement.Alias
-        {
-            get { return Alias; }
-        }
-
-        string IFileSystemProviderElement.Type
-        {
-            get { return Type; }
-        }
-
-        private IDictionary<string, string> _params;
-        IDictionary<string, string> IFileSystemProviderElement.Parameters
-        {
-            get
-            {
-                if (_params != null) return _params;
-                _params = new Dictionary<string, string>();
-                foreach (KeyValueConfigurationElement element in Parameters)
-                {
-                    _params.Add(element.Key, element.Value);
-                }
-                return _params;
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/FileSystemProviderElementCollection.cs b/src/Umbraco.Core/Configuration/FileSystemProviderElementCollection.cs
deleted file mode 100644
index 8d1fdb017e..0000000000
--- a/src/Umbraco.Core/Configuration/FileSystemProviderElementCollection.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Linq;
-using System.Text;
-
-namespace Umbraco.Core.Configuration
-{
-    [ConfigurationCollection(typeof(FileSystemProviderElement), AddItemName = "Provider")]
-    public class FileSystemProviderElementCollection : ConfigurationElementCollection, IEnumerable<IFileSystemProviderElement>
-    {
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new FileSystemProviderElement();
-        }
-
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return ((FileSystemProviderElement)(element)).Alias;
-        }
-
-        public new FileSystemProviderElement this[string key]
-        {
-            get
-            {
-                return (FileSystemProviderElement)BaseGet(key);
-            }
-        }
-
-        IEnumerator<IFileSystemProviderElement> IEnumerable<IFileSystemProviderElement>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as IFileSystemProviderElement;
-            }
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/FileSystemProvidersSection.cs b/src/Umbraco.Core/Configuration/FileSystemProvidersSection.cs
deleted file mode 100644
index 7c6c552ddd..0000000000
--- a/src/Umbraco.Core/Configuration/FileSystemProvidersSection.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Linq;
-using System.Text;
-
-namespace Umbraco.Core.Configuration
-{
-    public class FileSystemProvidersSection : ConfigurationSection, IFileSystemProvidersSection
-    {
-
-        [ConfigurationProperty("", IsDefaultCollection = true, IsRequired = true)]
-        public FileSystemProviderElementCollection Providers
-        {
-            get { return ((FileSystemProviderElementCollection)(base[""])); }
-        }
-
-        private IDictionary<string, IFileSystemProviderElement> _providers;
-
-        IDictionary<string, IFileSystemProviderElement> IFileSystemProvidersSection.Providers
-        {
-            get
-            {
-                if (_providers != null) return _providers;
-                _providers = Providers.ToDictionary(x => x.Alias, x => x);
-                return _providers;
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/IFileSystemProviderElement.cs b/src/Umbraco.Core/Configuration/IFileSystemProviderElement.cs
deleted file mode 100644
index 438e6f2b81..0000000000
--- a/src/Umbraco.Core/Configuration/IFileSystemProviderElement.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration
-{
-    public interface IFileSystemProviderElement
-    {
-        string Alias { get; }
-        string Type { get; }
-        IDictionary<string, string> Parameters { get; }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/IFileSystemProvidersSection.cs b/src/Umbraco.Core/Configuration/IFileSystemProvidersSection.cs
deleted file mode 100644
index f87ba383a9..0000000000
--- a/src/Umbraco.Core/Configuration/IFileSystemProvidersSection.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration
-{
-    public interface IFileSystemProvidersSection
-    {
-        IDictionary<string, IFileSystemProviderElement> Providers { get; }
-    }
-}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 4662ca0403..366326cd8b 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -211,9 +211,6 @@
     <Compile Include="ConfigsExtensions.cs" />
     <Compile Include="Configuration\Configs.cs" />
     <Compile Include="Configuration\CoreDebug.cs" />
-    <Compile Include="Configuration\FileSystemProviderElement.cs" />
-    <Compile Include="Configuration\FileSystemProviderElementCollection.cs" />
-    <Compile Include="Configuration\FileSystemProvidersSection.cs" />
     <Compile Include="Configuration\GlobalSettings.cs" />
     <Compile Include="Configuration\GlobalSettingsExtensions.cs" />
     <Compile Include="Configuration\Grid\GridConfig.cs" />
@@ -235,8 +232,6 @@
     <Compile Include="Configuration\HealthChecks\NotificationMethodsElementCollection.cs" />
     <Compile Include="Configuration\HealthChecks\NotificationMethodSettingsElement.cs" />
     <Compile Include="Configuration\HealthChecks\NotificationMethodSettingsElementCollection.cs" />
-    <Compile Include="Configuration\IFileSystemProviderElement.cs" />
-    <Compile Include="Configuration\IFileSystemProvidersSection.cs" />
     <Compile Include="Configuration\IGlobalSettings.cs" />
     <Compile Include="Configuration\InnerTextConfigurationElement.cs" />
     <Compile Include="Configuration\LocalTempStorage.cs" />
diff --git a/src/Umbraco.Tests/App.config b/src/Umbraco.Tests/App.config
index fdb18c598d..4c5bb57aa2 100644
--- a/src/Umbraco.Tests/App.config
+++ b/src/Umbraco.Tests/App.config
@@ -1,58 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-
-    <sectionGroup name="umbracoConfiguration">
-      <section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false"/>
-    </sectionGroup>
-
   </configSections>
 
-  <umbracoConfiguration>
-    <FileSystemProviders>
-      <Provider alias="media" type="Umbraco.Core.IO.PhysicalFileSystem, Umbraco.Core">
-        <Parameters>
-          <add key="rootPath" value="Media\"/>
-          <add key="rootUrl" value="/Media/"/>
-        </Parameters>
-      </Provider>
-      <!-- Macros -->
-      <Provider alias="macros" type="Umbraco.Core.IO.PhysicalFileSystem, Umbraco.Core">
-        <Parameters>
-          <add key="rootPath" value="App_Data\Macros"/>
-          <add key="rootUrl" value="/Macros/"/>
-        </Parameters>
-      </Provider>
-      <!-- Scripts -->
-      <Provider alias="scripts" type="Umbraco.Core.IO.PhysicalFileSystem, Umbraco.Core">
-        <Parameters>
-          <add key="rootPath" value="scripts\"/>
-          <add key="rootUrl" value="/scripts/"/>
-        </Parameters>
-      </Provider>
-      <!-- Stylesheets -->
-      <Provider alias="stylesheets" type="Umbraco.Core.IO.PhysicalFileSystem, Umbraco.Core">
-        <Parameters>
-          <add key="rootPath" value="css\"/>
-          <add key="rootUrl" value="/css/"/>
-        </Parameters>
-      </Provider>
-      <!-- Templates -->
-      <Provider alias="masterpages" type="Umbraco.Core.IO.PhysicalFileSystem, Umbraco.Core">
-        <Parameters>
-          <add key="rootPath" value="masterpages\"/>
-          <add key="rootUrl" value="/masterpages/"/>
-        </Parameters>
-      </Provider>
-      <Provider alias="views" type="Umbraco.Core.IO.PhysicalFileSystem, Umbraco.Core">
-        <Parameters>
-          <add key="rootPath" value="views\"/>
-          <add key="rootUrl" value="/views/"/>
-        </Parameters>
-      </Provider>
-    </FileSystemProviders>
-  </umbracoConfiguration>
-
   <appSettings>
     <add key="umbracoConfigurationStatus" value="6.0.0"/>
     <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd,~/.well-known" />
diff --git a/src/Umbraco.Tests/Configurations/FileSystemProviderTests.cs b/src/Umbraco.Tests/Configurations/FileSystemProviderTests.cs
deleted file mode 100644
index c65980e763..0000000000
--- a/src/Umbraco.Tests/Configurations/FileSystemProviderTests.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Configuration;
-using System.Linq;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.UmbracoSettings;
-
-namespace Umbraco.Tests.Configurations
-{
-
-    [TestFixture]
-    public class FileSystemProviderTests
-    {
-        [Test]
-        public void Can_Get_Media_Provider()
-        {
-            var config = (FileSystemProvidersSection)ConfigurationManager.GetSection("umbracoConfiguration/FileSystemProviders");
-            var providerConfig = config.Providers["media"];
-
-            Assert.That(providerConfig, Is.Not.Null);
-            Assert.That(providerConfig.Parameters.AllKeys.Any(), Is.True);
-        }
-    }
-}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 0da14aaef2..03d0d4f8cb 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -294,7 +294,6 @@
     <Compile Include="Cache\HttpRequestAppCacheTests.cs" />
     <Compile Include="Cache\WebCachingAppCacheTests.cs" />
     <Compile Include="Cache\RuntimeAppCacheTests.cs" />
-    <Compile Include="Configurations\FileSystemProviderTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\ContentElementDefaultTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\ContentElementTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\LoggingElementDefaultTests.cs" />
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index ceca081b37..600bfc9775 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -177,9 +177,6 @@
     <Content Include="Config\imageprocessor\cache.config">
       <SubType>Designer</SubType>
     </Content>
-    <None Include="Config\FileSystemProviders.Release.config">
-      <DependentUpon>FileSystemProviders.config</DependentUpon>
-    </None>
     <None Include="Config\EmbeddedMedia.Release.config">
       <DependentUpon>EmbeddedMedia.config</DependentUpon>
     </None>
@@ -302,7 +299,6 @@
     <Content Include="Config\umbracoSettings.config">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Config\FileSystemProviders.config" />
     <Content Include="Config\EmbeddedMedia.config" />
     <Content Include="Config\BackOfficeTours\getting-started.json" />
   </ItemGroup>
diff --git a/src/Umbraco.Web.UI/config/FileSystemProviders.Release.config b/src/Umbraco.Web.UI/config/FileSystemProviders.Release.config
deleted file mode 100644
index 1f038f61c5..0000000000
--- a/src/Umbraco.Web.UI/config/FileSystemProviders.Release.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<FileSystemProviders>
-  
-  <!-- Media -->
-  <Provider alias="media" type="Umbraco.Core.IO.PhysicalFileSystem, Umbraco.Core">
-    <Parameters>
-      <add key="virtualRoot" value="~/media/" />
-    </Parameters>
-  </Provider>
-   
-</FileSystemProviders>
diff --git a/src/Umbraco.Web.UI/config/FileSystemProviders.config b/src/Umbraco.Web.UI/config/FileSystemProviders.config
deleted file mode 100644
index 1f038f61c5..0000000000
--- a/src/Umbraco.Web.UI/config/FileSystemProviders.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<FileSystemProviders>
-  
-  <!-- Media -->
-  <Provider alias="media" type="Umbraco.Core.IO.PhysicalFileSystem, Umbraco.Core">
-    <Parameters>
-      <add key="virtualRoot" value="~/media/" />
-    </Parameters>
-  </Provider>
-   
-</FileSystemProviders>
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index f781d234fe..2eb3551797 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -12,7 +12,6 @@
 
         <sectionGroup name="umbracoConfiguration">
             <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" />
-            <section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" />
             <section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false" />
         </sectionGroup>
 
@@ -25,7 +24,6 @@
 
     <umbracoConfiguration>
         <settings configSource="config\umbracoSettings.config" />
-        <FileSystemProviders configSource="config\FileSystemProviders.config" />
         <HealthChecks configSource="config\HealthChecks.config" />
     </umbracoConfiguration>