diff --git a/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs b/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
index 93a77d5cac..3160175af8 100644
--- a/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
+++ b/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
@@ -89,7 +89,7 @@ namespace Umbraco.Core.Models
         /// <returns>True if ContentType was removed, otherwise returns False</returns>
         public bool RemoveContentType(string alias)
         {
-            if (!ContentTypeCompositionExists(alias))
+            if (ContentTypeCompositionExists(alias))
             {
                 var contentTypeComposition = ContentTypeComposition.First(x => x.Alias == alias);
                 return _contentTypeComposition.Remove(contentTypeComposition);
diff --git a/src/Umbraco.Core/Models/Membership/IUser.cs b/src/Umbraco.Core/Models/Membership/IUser.cs
index 2bf305da26..6b62889eb3 100644
--- a/src/Umbraco.Core/Models/Membership/IUser.cs
+++ b/src/Umbraco.Core/Models/Membership/IUser.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Models.Membership
         int SessionTimeout { get; set; }
         int StartContentId { get; set; }
         int StartMediaId { get; set; }
-        string Lanuguage { get; set; }
+        string Language { get; set; }
         bool DefaultToLiveEditing { get; set; }
         IEnumerable<string> Applications { get; set; }
         bool NoConsole { get; set; }
diff --git a/src/Umbraco.Core/Models/Membership/User.cs b/src/Umbraco.Core/Models/Membership/User.cs
index 36b6330c68..f815bac147 100644
--- a/src/Umbraco.Core/Models/Membership/User.cs
+++ b/src/Umbraco.Core/Models/Membership/User.cs
@@ -88,7 +88,7 @@ namespace Umbraco.Core.Models.Membership
         #region Implementation of IUser
 
         [DataMember]
-        public string Lanuguage { get; set; }
+        public string Language { get; set; }
         [DataMember]
         public string Permissions { get; set; }
         [DataMember]
diff --git a/src/Umbraco.Core/Persistence/Factories/UserFactory.cs b/src/Umbraco.Core/Persistence/Factories/UserFactory.cs
index 207c08bdd2..8f1ab387ca 100644
--- a/src/Umbraco.Core/Persistence/Factories/UserFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/UserFactory.cs
@@ -29,7 +29,7 @@ namespace Umbraco.Core.Persistence.Factories
                            IsLockedOut = dto.Disabled,
                            IsApproved = dto.Disabled == false,
                            Email = dto.Email,
-                           Lanuguage = dto.UserLanguage,
+                           Language = dto.UserLanguage,
                            DefaultToLiveEditing = dto.DefaultToLiveEditing,
                            NoConsole = dto.NoConsole,
                            Permissions = dto.DefaultPermissions
@@ -48,7 +48,7 @@ namespace Umbraco.Core.Persistence.Factories
                               Login = entity.Username,
                               NoConsole = entity.NoConsole,
                               Password = entity.Password,
-                              UserLanguage = entity.Lanuguage,
+                              UserLanguage = entity.Language,
                               UserName = entity.Name,
                               Type = short.Parse(entity.UserType.Id.ToString()),
                               DefaultPermissions = entity.Permissions
diff --git a/src/Umbraco.Core/Persistence/Mappers/UserMapper.cs b/src/Umbraco.Core/Persistence/Mappers/UserMapper.cs
index ad7690b769..04393bd37c 100644
--- a/src/Umbraco.Core/Persistence/Mappers/UserMapper.cs
+++ b/src/Umbraco.Core/Persistence/Mappers/UserMapper.cs
@@ -33,7 +33,7 @@ namespace Umbraco.Core.Persistence.Mappers
             CacheMap<User, UserDto>(src => src.IsApproved, dto => dto.Disabled);
             CacheMap<User, UserDto>(src => src.NoConsole, dto => dto.NoConsole);
             CacheMap<User, UserDto>(src => src.UserType, dto => dto.Type);
-            CacheMap<User, UserDto>(src => src.Lanuguage, dto => dto.UserLanguage);
+            CacheMap<User, UserDto>(src => src.Language, dto => dto.UserLanguage);
         }
 
         internal override string Map(string propertyName)
diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
index a352089318..de1953dce0 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
@@ -157,6 +157,11 @@ namespace Umbraco.Core.Persistence.Repositories
                 Database.Insert(new ContentType2ContentTypeDto { ParentId = composition.Id, ChildId = entity.Id });
             }
 
+            //TODO U4-1690 - test what happens with property types and groups from content type compositions when a content type is removed
+            //1. Find content based on the current content type: entity.Id
+            //2. Find all property types (and groups?) on the content type that was removed - tracked id
+            //3. Remove properties based on property types from the removed content type where the content ids correspond to those found in step one
+
             //Delete the allowed content type entries before adding the updated collection
             Database.Delete<ContentTypeAllowedContentTypeDto>("WHERE Id = @Id", new { Id = entity.Id });
             //Insert collection of allowed content types
diff --git a/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs b/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
index edb5e7b75d..90bb835e8c 100644
--- a/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
@@ -26,13 +26,13 @@ namespace Umbraco.Core.Persistence.Repositories
         public TemplateRepository(IDatabaseUnitOfWork work)
             : base(work)
         {
-            EnsureDepedencies();
+            EnsureDependencies();
         }
 
         public TemplateRepository(IDatabaseUnitOfWork work, IRepositoryCacheProvider cache)
             : base(work, cache)
         {
-            EnsureDepedencies();
+            EnsureDependencies();
         }
 
         internal TemplateRepository(IDatabaseUnitOfWork work, IRepositoryCacheProvider cache, IFileSystem masterpageFileSystem, IFileSystem viewFileSystem)
@@ -42,7 +42,7 @@ namespace Umbraco.Core.Persistence.Repositories
             _viewsFileSystem = viewFileSystem;
         }
 
-        private void EnsureDepedencies()
+        private void EnsureDependencies()
         {
             _masterpagesFileSystem = new PhysicalFileSystem(SystemDirectories.Masterpages);
             _viewsFileSystem = new PhysicalFileSystem(SystemDirectories.MvcViews);