diff --git a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs
index af99b3f843..7169b93cb4 100644
--- a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs
+++ b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs
@@ -1,8 +1,6 @@
-using Umbraco.Core;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Configuration.UmbracoSettings;
 
-namespace Umbraco.Web.Composing.CompositionExtensions
+namespace Umbraco.Core.Composing.CompositionExtensions
 {
     /// <summary>
     /// Compose configurations.
diff --git a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/CoreMappingProfiles.cs b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/CoreMappingProfiles.cs
index 8d7098a0fb..9835d17fb6 100644
--- a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/CoreMappingProfiles.cs
+++ b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/CoreMappingProfiles.cs
@@ -1,8 +1,6 @@
-using Umbraco.Core;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Mapping;
+using Umbraco.Core.Mapping;
 
-namespace Umbraco.Web.Composing.CompositionExtensions
+namespace Umbraco.Core.Composing.CompositionExtensions
 
 {
     public static class CoreMappingProfiles
diff --git a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/FileSystems.cs b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/FileSystems.cs
index caa228d922..353c60d280 100644
--- a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/FileSystems.cs
+++ b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/FileSystems.cs
@@ -1,12 +1,9 @@
-using Umbraco.Core.Composing;
-using Umbraco.Web.Composing;
-using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.IO.MediaPathSchemes;
 using Umbraco.Core.Logging;
-using Umbraco.Core;
 
-namespace Umbraco.Web.Composing.CompositionExtensions
+namespace Umbraco.Core.Composing.CompositionExtensions
 {
     internal static class FileSystems
     {
diff --git a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Repositories.cs b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Repositories.cs
index de2361549f..0939dd0f71 100644
--- a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Repositories.cs
+++ b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Repositories.cs
@@ -1,9 +1,7 @@
-using Umbraco.Core;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.Repositories.Implement;
 
-namespace Umbraco.Web.Composing.CompositionExtensions
+namespace Umbraco.Core.Composing.CompositionExtensions
 {
     /// <summary>
     /// Composes repositories.
diff --git a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Services.cs b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Services.cs
index b923b0ced8..f7c7c91c08 100644
--- a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Services.cs
+++ b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Services.cs
@@ -1,11 +1,8 @@
 using System;
 using System.IO;
 using System.Linq;
-using Umbraco.Core;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Dictionary;
 using Umbraco.Core.Events;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
@@ -13,7 +10,7 @@ using Umbraco.Core.Packaging;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 
-namespace Umbraco.Web.Composing.CompositionExtensions
+namespace Umbraco.Core.Composing.CompositionExtensions
 {
     internal static class Services
     {
diff --git a/src/Umbraco.Infrastructure/Models/Membership/User.cs b/src/Umbraco.Infrastructure/Models/Membership/User.cs
index 30e99af04f..44eada69b6 100644
--- a/src/Umbraco.Infrastructure/Models/Membership/User.cs
+++ b/src/Umbraco.Infrastructure/Models/Membership/User.cs
@@ -321,13 +321,6 @@ namespace Umbraco.Core.Models.Membership
             set => SetPropertyValueAndDetectChanges(value, ref _language, nameof(Language));
         }
 
-        [IgnoreDataMember]
-        public bool DefaultToLiveEditing
-        {
-            get => _defaultToLiveEditing;
-            set => SetPropertyValueAndDetectChanges(value, ref _defaultToLiveEditing, nameof(DefaultToLiveEditing));
-        }
-
         /// <summary>
         /// Gets the groups that user is part of
         /// </summary>
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
index 4f21944a38..dbecd56d18 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
@@ -1,7 +1,7 @@
 using System;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
-using Umbraco.Web.Composing.CompositionExtensions;
+using Umbraco.Core.Composing.CompositionExtensions;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Hosting;
diff --git a/src/Umbraco.Infrastructure/Services/Implement/UserService.cs b/src/Umbraco.Infrastructure/Services/Implement/UserService.cs
index 1d79cfb88b..f09e917e94 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/UserService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/UserService.cs
@@ -115,7 +115,6 @@ namespace Umbraco.Core.Services.Implement
 
                 user = new User(_globalSettings)
                 {
-                    DefaultToLiveEditing = false,
                     Email = email,
                     Language = _globalSettings.DefaultUILanguage,
                     Name = username,
diff --git a/src/Umbraco.Tests/IO/FileSystemsTests.cs b/src/Umbraco.Tests/IO/FileSystemsTests.cs
index 11eb9242aa..8b8b71304a 100644
--- a/src/Umbraco.Tests/IO/FileSystemsTests.cs
+++ b/src/Umbraco.Tests/IO/FileSystemsTests.cs
@@ -13,7 +13,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Services;
 using Umbraco.Tests.Components;
 using Umbraco.Tests.TestHelpers;
-using Umbraco.Web.Composing.CompositionExtensions;
+using Umbraco.Core.Composing.CompositionExtensions;
 using Current = Umbraco.Web.Composing.Current;
 using FileSystems = Umbraco.Core.IO.FileSystems;
 
diff --git a/src/Umbraco.Tests/Models/ContentExtensionsTests.cs b/src/Umbraco.Tests/Models/ContentExtensionsTests.cs
index 5e10ad5552..87bd661015 100644
--- a/src/Umbraco.Tests/Models/ContentExtensionsTests.cs
+++ b/src/Umbraco.Tests/Models/ContentExtensionsTests.cs
@@ -3,7 +3,7 @@ using System.Linq;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
-using Umbraco.Web.Composing.CompositionExtensions;
+using Umbraco.Core.Composing.CompositionExtensions;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
diff --git a/src/Umbraco.Tests/Models/ContentTests.cs b/src/Umbraco.Tests/Models/ContentTests.cs
index 68ab217865..7dec69e3be 100644
--- a/src/Umbraco.Tests/Models/ContentTests.cs
+++ b/src/Umbraco.Tests/Models/ContentTests.cs
@@ -10,16 +10,14 @@ using Umbraco.Core;
 using NUnit.Framework;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
-using Umbraco.Web.Composing.CompositionExtensions;
+using Umbraco.Core.Composing.CompositionExtensions;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Serialization;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
-using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.TestHelpers.Stubs;
 using Umbraco.Tests.Testing;
diff --git a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
index 2b1722832f..b982b78c23 100644
--- a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
+++ b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
@@ -3,7 +3,6 @@ using System.Linq;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
-using Umbraco.Web.Composing.CompositionExtensions;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Services;
 using Umbraco.Core.Logging;
@@ -17,6 +16,7 @@ using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Tests.Testing;
 using Umbraco.Web.PropertyEditors;
 using Current = Umbraco.Web.Composing.Current;
+using Umbraco.Core.Composing.CompositionExtensions;
 
 namespace Umbraco.Tests.Models.Mapping
 {
diff --git a/src/Umbraco.Tests/Models/UserTests.cs b/src/Umbraco.Tests/Models/UserTests.cs
index 067e1e11e7..531112e4b6 100644
--- a/src/Umbraco.Tests/Models/UserTests.cs
+++ b/src/Umbraco.Tests/Models/UserTests.cs
@@ -27,7 +27,6 @@ namespace Umbraco.Tests.Models
                 CreateDate = DateTime.Now,
                 Name = "Test",
                 Comments = "comments",
-                DefaultToLiveEditing = false,
                 Email = "test@test.com",
                 Language = "en",
                 FailedPasswordAttempts = 3,
@@ -69,7 +68,6 @@ namespace Umbraco.Tests.Models
                 CreateDate = DateTime.Now,
                 Name = "Test",
                 Comments = "comments",
-                DefaultToLiveEditing = false,
                 Email = "test@test.com",
                 Language = "en",
                 FailedPasswordAttempts = 3,
diff --git a/src/Umbraco.Tests/Packaging/PackageDataInstallationTests.cs b/src/Umbraco.Tests/Packaging/PackageDataInstallationTests.cs
index b4ee163df0..d089c4aaa2 100644
--- a/src/Umbraco.Tests/Packaging/PackageDataInstallationTests.cs
+++ b/src/Umbraco.Tests/Packaging/PackageDataInstallationTests.cs
@@ -16,8 +16,7 @@ using Umbraco.Core.Services;
 using Umbraco.Tests.Services;
 using Umbraco.Tests.Services.Importing;
 using Umbraco.Tests.Testing;
-using Umbraco.Web.Composing.CompositionExtensions;
-using Umbraco.Core.Configuration;
+using Umbraco.Core.Composing.CompositionExtensions;
 using Umbraco.Core.Strings;
 
 namespace Umbraco.Tests.Packaging
diff --git a/src/Umbraco.Tests/Scoping/ScopeFileSystemsTests.cs b/src/Umbraco.Tests/Scoping/ScopeFileSystemsTests.cs
index 8d55db6b19..6b16f49d7d 100644
--- a/src/Umbraco.Tests/Scoping/ScopeFileSystemsTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopeFileSystemsTests.cs
@@ -8,7 +8,7 @@ using Umbraco.Web.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
-using Umbraco.Web.Composing.CompositionExtensions;
+using Umbraco.Core.Composing.CompositionExtensions;
 using Umbraco.Core.Logging;
 using FileSystems = Umbraco.Core.IO.FileSystems;
 
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 1556d0999f..181f7b2e4c 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Reflection;
-using System.Threading;
 using System.Xml.Linq;
 using Examine;
 using Moq;
@@ -38,12 +37,11 @@ using Umbraco.Web.Actions;
 using Umbraco.Web.ContentApps;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
-using Umbraco.Web.Composing.CompositionExtensions;
+using Umbraco.Core.Composing.CompositionExtensions;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Serialization;
 using Umbraco.Web.Composing.CompositionExtensions;
-using Umbraco.Web.Composing;
 using Umbraco.Web.Hosting;
 using Umbraco.Web.Sections;
 using FileSystems = Umbraco.Core.IO.FileSystems;
diff --git a/src/Umbraco.Web/Security/BackOfficeUserStore.cs b/src/Umbraco.Web/Security/BackOfficeUserStore.cs
index 7325f10d8b..78eeba5eff 100644
--- a/src/Umbraco.Web/Security/BackOfficeUserStore.cs
+++ b/src/Umbraco.Web/Security/BackOfficeUserStore.cs
@@ -81,7 +81,6 @@ namespace Umbraco.Core.Security
 
             var userEntity = new User(_globalSettings, user.Name, user.Email, user.UserName, emptyPasswordValue)
             {
-                DefaultToLiveEditing = false,
                 Language = user.Culture ?? _globalSettings.DefaultUILanguage,
                 StartContentIds = user.StartContentIds ?? new int[] { },
                 StartMediaIds = user.StartMediaIds ?? new int[] { },