diff --git a/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs b/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs
index ba4724aead..19c32864d5 100644
--- a/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs
+++ b/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs
@@ -1,6 +1,8 @@
-using Umbraco.Core;
-using Umbraco.Core.IO;
+using Umbraco.Core.IO;
 using Umbraco.Web.Models.Trees;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi.Filters;
+using Constants = Umbraco.Core.Constants;
 
 namespace Umbraco.Web.Trees
 {
@@ -8,6 +10,9 @@ namespace Umbraco.Web.Trees
     /// Tree for displaying partial view macros in the developer app
     /// </summary>
     [Tree(Constants.Applications.Developer, "partialViewMacros", null, sortOrder: 6)]
+    [UmbracoTreeAuthorize(Constants.Trees.PartialViewMacros)]
+    [PluginController("UmbracoTrees")]
+    [CoreTree]
     public class PartialViewMacrosTreeController : FileSystemTreeController2
     {
         protected override IFileSystem2 FileSystem
diff --git a/src/Umbraco.Web/Trees/PartialViewsTreeController.cs b/src/Umbraco.Web/Trees/PartialViewsTreeController.cs
index bf4ec65a2e..fac173666e 100644
--- a/src/Umbraco.Web/Trees/PartialViewsTreeController.cs
+++ b/src/Umbraco.Web/Trees/PartialViewsTreeController.cs
@@ -1,6 +1,9 @@
-using Umbraco.Core;
+using umbraco;
 using Umbraco.Core.IO;
 using Umbraco.Web.Models.Trees;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi.Filters;
+using Constants = Umbraco.Core.Constants;
 
 namespace Umbraco.Web.Trees
 {
@@ -8,6 +11,9 @@ namespace Umbraco.Web.Trees
     /// Tree for displaying partial views in the settings app
     /// </summary>
     [Tree(Constants.Applications.Settings, "partialViews", null, sortOrder: 2)]
+    [UmbracoTreeAuthorize(Constants.Trees.PartialViews)]
+    [PluginController("UmbracoTrees")]
+    [CoreTree]
     public class PartialViewsTreeController : FileSystemTreeController2
     {
         protected override IFileSystem2 FileSystem
diff --git a/src/Umbraco.Web/Trees/ScriptTreeController.cs b/src/Umbraco.Web/Trees/ScriptTreeController.cs
index cb9954019b..191834afc9 100644
--- a/src/Umbraco.Web/Trees/ScriptTreeController.cs
+++ b/src/Umbraco.Web/Trees/ScriptTreeController.cs
@@ -1,10 +1,17 @@
-using Umbraco.Core;
+using umbraco;
 using Umbraco.Core.IO;
 using Umbraco.Web.Models.Trees;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi.Filters;
+using Constants = Umbraco.Core.Constants;
 
 namespace Umbraco.Web.Trees
 {
+    [UmbracoTreeAuthorize(Constants.Trees.Scripts)]
     [Tree(Constants.Applications.Settings, "scripts", null, sortOrder: 4)]
+    [LegacyBaseTree(typeof(loadScripts))]
+    [PluginController("UmbracoTrees")]
+    [CoreTree]
     public class ScriptTreeController : FileSystemTreeController2
     {
         protected override IFileSystem2 FileSystem
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDLRScripts.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDLRScripts.cs
index a941772b23..7ab99e93a7 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDLRScripts.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDLRScripts.cs
@@ -1,4 +1,6 @@
-using System.Text;
+using System;
+using System.ComponentModel;
+using System.Text;
 using umbraco.cms.presentation.Trees;
 using Umbraco.Core.IO;
 using Umbraco.Core;
@@ -6,9 +8,8 @@ using Umbraco.Core;
 
 namespace umbraco
 {
-    /// <summary>
-    /// Handles loading of python items into the developer application tree
-    /// </summary>
+    [Obsolete("This is no longer used and will be removed in future versions")]
+    [EditorBrowsable(EditorBrowsableState.Never)]
     public class loadDLRScripts : FileSystemTree
     {
         public loadDLRScripts(string application) : base(application) { }
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs
index 563a491ec5..7379c89963 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Data;
 using System.IO;
 using System.Linq;
@@ -31,8 +32,9 @@ using Umbraco.Core;
 
 
 namespace umbraco
-{
-    [Tree(Constants.Applications.Settings, "scripts", "Scripts", "icon-folder", "icon-folder", sortOrder: 2)]
+{
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [Obsolete("This is no longer used and will be removed from the codebase in the future")]
     public class loadScripts : FileSystemTree
     {
         public loadScripts(string application) : base(application) { }