diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index 2ea0fd855b..fbb68194b7 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -108,9 +108,6 @@ namespace Umbraco.Core.Models
         [IgnoreDataMember]
         public int VersionId { get; set; }
 
-        [DataMember]
-        public Guid NodeObjectType { get; internal set; }
-
         /// <summary>
         /// Integer Id of the default ContentType
         /// </summary>
diff --git a/src/Umbraco.Core/Models/ContentTypeBase.cs b/src/Umbraco.Core/Models/ContentTypeBase.cs
index 1f3f1a5c13..04bcb7424a 100644
--- a/src/Umbraco.Core/Models/ContentTypeBase.cs
+++ b/src/Umbraco.Core/Models/ContentTypeBase.cs
@@ -113,9 +113,6 @@ namespace Umbraco.Core.Models
             OnPropertyChanged(nameof(PropertyTypes));
         }
 
-        [DataMember]
-        public Guid NodeObjectType { get; internal set; }
-
         /// <summary>
         /// The Alias of the ContentType
         /// </summary>
diff --git a/src/Umbraco.Core/Models/DataType.cs b/src/Umbraco.Core/Models/DataType.cs
index cba53bbd10..c237f6381c 100644
--- a/src/Umbraco.Core/Models/DataType.cs
+++ b/src/Umbraco.Core/Models/DataType.cs
@@ -65,9 +65,6 @@ namespace Umbraco.Core.Models
         [DataMember]
         public string EditorAlias => _editor.Alias;
 
-        [DataMember]
-        public Guid NodeObjectType { get; internal set; }
-
         /// <inheritdoc />
         [DataMember]
         public ValueStorageType DatabaseType
diff --git a/src/Umbraco.Core/Models/Entities/IUmbracoEntity.cs b/src/Umbraco.Core/Models/Entities/IUmbracoEntity.cs
index 13087b5e95..e5f628b098 100644
--- a/src/Umbraco.Core/Models/Entities/IUmbracoEntity.cs
+++ b/src/Umbraco.Core/Models/Entities/IUmbracoEntity.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Umbraco.Core.Models.Entities
 {
@@ -12,7 +11,5 @@ namespace Umbraco.Core.Models.Entities
     /// <para>An IUmbracoEntity can participate in notifications.</para>
     /// </remarks>
     public interface IUmbracoEntity : ITreeEntity, IRememberBeingDirty
-    {
-        Guid NodeObjectType { get; }
-    }
+    { }
 }
diff --git a/src/Umbraco.Core/Models/EntityContainer.cs b/src/Umbraco.Core/Models/EntityContainer.cs
index 71a477a9d6..70f6cbd878 100644
--- a/src/Umbraco.Core/Models/EntityContainer.cs
+++ b/src/Umbraco.Core/Models/EntityContainer.cs
@@ -62,8 +62,6 @@ namespace Umbraco.Core.Models
         /// </summary>
         public Guid ContainerObjectType => ObjectTypeMap[_containedObjectType];
 
-        Guid IUmbracoEntity.NodeObjectType => ContainerObjectType;
-
         /// <summary>
         /// Gets the container object type corresponding to a contained object type.
         /// </summary>
diff --git a/src/Umbraco.Core/Models/SimpleContentType.cs b/src/Umbraco.Core/Models/SimpleContentType.cs
index b4e7688eea..5c81017ec8 100644
--- a/src/Umbraco.Core/Models/SimpleContentType.cs
+++ b/src/Umbraco.Core/Models/SimpleContentType.cs
@@ -44,14 +44,11 @@ namespace Umbraco.Core.Models
             Name = contentType.Name;
             AllowedAsRoot = contentType.AllowedAsRoot;
             IsElement = contentType.IsElement;
-            NodeObjectType = contentType.NodeObjectType;
         }
 
         /// <inheritdoc />
         public string Alias { get; }
 
-        public Guid NodeObjectType { get; }
-
         public int Id { get; }
 
         /// <inheritdoc />
diff --git a/src/Umbraco.Core/Persistence/Factories/ContentBaseFactory.cs b/src/Umbraco.Core/Persistence/Factories/ContentBaseFactory.cs
index 25cc6bc358..434e0393cd 100644
--- a/src/Umbraco.Core/Persistence/Factories/ContentBaseFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/ContentBaseFactory.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Core.Persistence.Factories
                 content.VersionId = contentVersionDto.Id;
 
                 content.Name = contentVersionDto.Text;
-                content.NodeObjectType = nodeDto.NodeObjectType ?? Guid.Empty;
+
                 content.Path = nodeDto.Path;
                 content.Level = nodeDto.Level;
                 content.ParentId = nodeDto.ParentId;
diff --git a/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs b/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs
index 46489aa69e..54cfee0ffa 100644
--- a/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/ContentTypeFactory.cs
@@ -107,7 +107,6 @@ namespace Umbraco.Core.Persistence.Factories
         {
             entity.Id = dto.NodeDto.NodeId;
             entity.Key = dto.NodeDto.UniqueId;
-            entity.NodeObjectType = dto.NodeDto.NodeObjectType ?? Guid.Empty;
             entity.Alias = dto.Alias;
             entity.Name = dto.NodeDto.Text;
             entity.Icon = dto.Icon;
diff --git a/src/Umbraco.Core/Persistence/Factories/DataTypeFactory.cs b/src/Umbraco.Core/Persistence/Factories/DataTypeFactory.cs
index 5d92234ca8..f189d38d05 100644
--- a/src/Umbraco.Core/Persistence/Factories/DataTypeFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/DataTypeFactory.cs
@@ -28,7 +28,6 @@ namespace Umbraco.Core.Persistence.Factories
                 dataType.DisableChangeTracking();
 
                 dataType.CreateDate = dto.NodeDto.CreateDate;
-                dataType.NodeObjectType = dto.NodeDto.NodeObjectType ?? Guid.Empty;
                 dataType.DatabaseType = dto.DbType.EnumParse<ValueStorageType>(true);
                 dataType.Id = dto.NodeId;
                 dataType.Key = dto.NodeDto.UniqueId;
diff --git a/src/Umbraco.Core/Persistence/Mappers/UmbracoEntityMapper.cs b/src/Umbraco.Core/Persistence/Mappers/UmbracoEntityMapper.cs
index 96f664cc25..16e2e8bcd5 100644
--- a/src/Umbraco.Core/Persistence/Mappers/UmbracoEntityMapper.cs
+++ b/src/Umbraco.Core/Persistence/Mappers/UmbracoEntityMapper.cs
@@ -24,7 +24,6 @@ namespace Umbraco.Core.Persistence.Mappers
             DefineMap<IUmbracoEntity, NodeDto>(nameof(IUmbracoEntity.Trashed), nameof(NodeDto.Trashed));
             DefineMap<IUmbracoEntity, NodeDto>(nameof(IUmbracoEntity.Key), nameof(NodeDto.UniqueId));
             DefineMap<IUmbracoEntity, NodeDto>(nameof(IUmbracoEntity.CreatorId), nameof(NodeDto.UserId));
-            DefineMap<IUmbracoEntity, NodeDto>(nameof(IUmbracoEntity.NodeObjectType), nameof(NodeDto.NodeObjectType));
         }
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
index 9b05e95a17..8aa912dc0d 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
@@ -76,7 +76,6 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         public IEnumerable<IEntitySlim> GetPagedResultsByQuery(IQuery<IUmbracoEntity> query, Guid objectType, long pageIndex, int pageSize, out long totalRecords,
             IQuery<IUmbracoEntity> filter, Ordering ordering)
         {
-            query = query.Where(x => x.NodeObjectType == objectType);
             return GetPagedResultsByQuery(query, new[] { objectType }, pageIndex, pageSize, out totalRecords, filter, ordering);
         }