diff --git a/src/Umbraco.Web.BackOffice/PropertyEditors/NestedContentController.cs b/src/Umbraco.Web.BackOffice/PropertyEditors/NestedContentController.cs
index 25d120d807..b975a0114b 100644
--- a/src/Umbraco.Web.BackOffice/PropertyEditors/NestedContentController.cs
+++ b/src/Umbraco.Web.BackOffice/PropertyEditors/NestedContentController.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Web.BackOffice.Controllers;
 using Umbraco.Cms.Web.Common.Attributes;
@@ -23,9 +24,7 @@ namespace Umbraco.Cms.Web.BackOffice.PropertyEditors
         }
 
         [HttpGet]
-        public IEnumerable<object> GetContentTypes()
-        {
-            return _contentTypeService
+        public IEnumerable<object> GetContentTypes() => _contentTypeService
                 .GetAllElementTypes()
                 .OrderBy(x => x.SortOrder)
                 .Select(x => new
@@ -35,8 +34,7 @@ namespace Umbraco.Cms.Web.BackOffice.PropertyEditors
                     name = x.Name,
                     alias = x.Alias,
                     icon = x.Icon,
-                    tabs = x.CompositionPropertyGroups.Select(y => y.Name).Distinct()
+                    tabs = x.CompositionPropertyGroups.Where(x => x.Type == PropertyGroupType.Group && x.GetParentAlias() is null).Select(y => y.Name).Distinct()
                 });
-        }
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/NestedContentController.cs b/src/Umbraco.Web/PropertyEditors/NestedContentController.cs
deleted file mode 100644
index 71c2217709..0000000000
--- a/src/Umbraco.Web/PropertyEditors/NestedContentController.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Umbraco.Core.Models;
-using Umbraco.Core.Services;
-using Umbraco.Web.Editors;
-using Umbraco.Web.Mvc;
-
-namespace Umbraco.Web.PropertyEditors
-{
-    [PluginController("UmbracoApi")]
-    public class NestedContentController : UmbracoAuthorizedJsonController
-    {
-        [System.Web.Http.HttpGet]
-        public IEnumerable<object> GetContentTypes()
-        {
-            return Services.ContentTypeService
-                .GetAllElementTypes()
-                .OrderBy(x => x.SortOrder)
-                .Select(x => new
-                {
-                    id = x.Id,
-                    guid = x.Key,
-                    name = x.Name,
-                    alias = x.Alias,
-                    icon = x.Icon,
-                    tabs = x.CompositionPropertyGroups.Where(x => x.Type == PropertyGroupType.Group && x.GetParentAlias() == null).Select(y => y.Name).Distinct()
-                });
-        }
-    }
-}