diff --git a/src/Umbraco.Web.UI/config/trees.Release.config b/src/Umbraco.Web.UI/config/trees.Release.config
index 460d8d47d7..2124c72560 100644
--- a/src/Umbraco.Web.UI/config/trees.Release.config
+++ b/src/Umbraco.Web.UI/config/trees.Release.config
@@ -22,7 +22,6 @@
   <add application="developer" alias="packager" title="Packages" type="umbraco.loadPackager, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" />
   <add application="developer" alias="packagerPackages" title="Packager Packages" type="umbraco.loadPackages, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" initialize="false" sortOrder="3" />
   <add application="developer" alias="relationTypes" title="Relation Types" type="umbraco.loadRelationTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
-  <add application="developer" alias="python" title="Scripting Files" type="umbraco.loadPython, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
   <add application="developer" alias="xslt" title="XSLT Files" type="umbraco.loadXslt, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="5" />
   <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTree, umbraco" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder" />
   <!--Users-->
diff --git a/src/Umbraco.Web.UI/config/trees.config b/src/Umbraco.Web.UI/config/trees.config
index 460d8d47d7..2124c72560 100644
--- a/src/Umbraco.Web.UI/config/trees.config
+++ b/src/Umbraco.Web.UI/config/trees.config
@@ -22,7 +22,6 @@
   <add application="developer" alias="packager" title="Packages" type="umbraco.loadPackager, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" />
   <add application="developer" alias="packagerPackages" title="Packager Packages" type="umbraco.loadPackages, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" initialize="false" sortOrder="3" />
   <add application="developer" alias="relationTypes" title="Relation Types" type="umbraco.loadRelationTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
-  <add application="developer" alias="python" title="Scripting Files" type="umbraco.loadPython, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
   <add application="developer" alias="xslt" title="XSLT Files" type="umbraco.loadXslt, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="5" />
   <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTree, umbraco" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder" />
   <!--Users-->
diff --git a/src/Umbraco.Web/Trees/ApplicationTreeRegistrar.cs b/src/Umbraco.Web/Trees/ApplicationTreeRegistrar.cs
index 8dff05ab1c..1ed7e0a6b1 100644
--- a/src/Umbraco.Web/Trees/ApplicationTreeRegistrar.cs
+++ b/src/Umbraco.Web/Trees/ApplicationTreeRegistrar.cs
@@ -48,10 +48,14 @@ namespace Umbraco.Web.Trees
 
             var legacyItems = legacyTreeTypes
                 .Select(x =>
-                        new Tuple<Type, global::umbraco.businesslogic.TreeAttribute>(
+                        new Tuple<Type, global::umbraco.businesslogic.TreeAttribute, ObsoleteAttribute>(
                             x, 
-                            x.GetCustomAttributes<global::umbraco.businesslogic.TreeAttribute>(false).SingleOrDefault()))
+                            x.GetCustomAttributes<global::umbraco.businesslogic.TreeAttribute>(false).SingleOrDefault(),
+                            x.GetCustomAttributes<ObsoleteAttribute>(false).SingleOrDefault()))
+                //ensure that the legacy tree attribute exists
                 .Where(x => x.Item2 != null)
+                //ensure that it's not obsoleted, any obsoleted tree will not be auto added to the config
+                .Where(x => x.Item3 == null)
                 .Where(x => applicationContext.Services.ApplicationTreeService.GetByAlias(x.Item2.Alias) == null
                     //make sure the legacy tree isn't added on top of the controller tree!        
                             && added.InvariantContains(x.Item2.Alias) == false)
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPython.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPython.cs
index 168f17b60a..9f7f36af1d 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPython.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPython.cs
@@ -32,6 +32,7 @@ namespace umbraco
 	/// <summary>
 	/// Handles loading of python items into the developer application tree
 	/// </summary>
+	[Obsolete("This tree is no longer shipped by default, it will be removed in the future")]
     [Tree(Constants.Applications.Developer, "python", "Python Files", sortOrder: 4)]
     public class loadPython : loadDLRScripts
 	{