diff --git a/src/Umbraco.Core/Models/AuditEntry.cs b/src/Umbraco.Core/Models/AuditEntry.cs
index da56c6c318..d12163f394 100644
--- a/src/Umbraco.Core/Models/AuditEntry.cs
+++ b/src/Umbraco.Core/Models/AuditEntry.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
@@ -19,7 +18,7 @@ namespace Umbraco.Core.Models
         private string _affectedDetails;
         private string _eventType;
         private string _eventDetails;
-        
+
         /// <inheritdoc />
         public int PerformingUserId
         {
@@ -49,28 +48,28 @@ namespace Umbraco.Core.Models
         }
 
         /// <inheritdoc />
-        public int AffectedUserId 
+        public int AffectedUserId
         {
             get => _affectedUserId;
             set => SetPropertyValueAndDetectChanges(value, ref _affectedUserId, nameof(AffectedUserId));
         }
 
         /// <inheritdoc />
-        public string AffectedDetails 
+        public string AffectedDetails
         {
             get => _affectedDetails;
             set => SetPropertyValueAndDetectChanges(value, ref _affectedDetails, nameof(AffectedDetails));
         }
 
         /// <inheritdoc />
-        public string EventType 
+        public string EventType
         {
             get => _eventType;
             set => SetPropertyValueAndDetectChanges(value, ref _eventType, nameof(EventType));
         }
 
         /// <inheritdoc />
-        public string EventDetails 
+        public string EventDetails
         {
             get => _eventDetails;
             set => SetPropertyValueAndDetectChanges(value, ref _eventDetails, nameof(EventDetails));
diff --git a/src/Umbraco.Core/Models/Consent.cs b/src/Umbraco.Core/Models/Consent.cs
index cca1db41f1..4f7543fd59 100644
--- a/src/Umbraco.Core/Models/Consent.cs
+++ b/src/Umbraco.Core/Models/Consent.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
@@ -19,7 +18,7 @@ namespace Umbraco.Core.Models
         private string _action;
         private ConsentState _state;
         private string _comment;
-        
+
         /// <inheritdoc />
         public bool Current
         {
diff --git a/src/Umbraco.Core/Models/Content.cs b/src/Umbraco.Core/Models/Content.cs
index 4fda1ff23d..dd4ba13c33 100644
--- a/src/Umbraco.Core/Models/Content.cs
+++ b/src/Umbraco.Core/Models/Content.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Exceptions;
 
diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index 705fa2cfb0..a1fb5da308 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Models.Entities;
diff --git a/src/Umbraco.Core/Models/ContentCultureInfos.cs b/src/Umbraco.Core/Models/ContentCultureInfos.cs
index a0a4a7c472..c8c4bea56a 100644
--- a/src/Umbraco.Core/Models/ContentCultureInfos.cs
+++ b/src/Umbraco.Core/Models/ContentCultureInfos.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Models.Entities;
 
@@ -13,7 +12,7 @@ namespace Umbraco.Core.Models
     {
         private DateTime _date;
         private string _name;
-        
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ContentCultureInfos"/> class.
         /// </summary>
@@ -101,6 +100,5 @@ namespace Umbraco.Core.Models
             Deconstruct(out culture, out name);
             date = Date;
         }
-        
     }
 }
diff --git a/src/Umbraco.Core/Models/ContentType.cs b/src/Umbraco.Core/Models/ContentType.cs
index 97534835d1..61fabe6fb0 100644
--- a/src/Umbraco.Core/Models/ContentType.cs
+++ b/src/Umbraco.Core/Models/ContentType.cs
@@ -67,8 +67,8 @@ namespace Umbraco.Core.Models
         [DataMember]
         internal int DefaultTemplateId
         {
-            get { return _defaultTemplate; }
-            set { SetPropertyValueAndDetectChanges(value, ref _defaultTemplate, nameof(DefaultTemplateId)); }
+            get => _defaultTemplate;
+            set => SetPropertyValueAndDetectChanges(value, ref _defaultTemplate, nameof(DefaultTemplateId));
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Models/ContentTypeBase.cs b/src/Umbraco.Core/Models/ContentTypeBase.cs
index 3f45f424da..2aa114a88f 100644
--- a/src/Umbraco.Core/Models/ContentTypeBase.cs
+++ b/src/Umbraco.Core/Models/ContentTypeBase.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Strings;
@@ -18,7 +17,6 @@ namespace Umbraco.Core.Models
     [DebuggerDisplay("Id: {Id}, Name: {Name}, Alias: {Alias}")]
     public abstract class ContentTypeBase : TreeEntityBase, IContentTypeBase
     {
-
         private string _alias;
         private string _description;
         private string _icon = "icon-folder";
diff --git a/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs b/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
index 7a8e91845a..ec6f803107 100644
--- a/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
+++ b/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Exceptions;
 
diff --git a/src/Umbraco.Core/Models/DataType.cs b/src/Umbraco.Core/Models/DataType.cs
index 423895b475..8745e6dbec 100644
--- a/src/Umbraco.Core/Models/DataType.cs
+++ b/src/Umbraco.Core/Models/DataType.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Umbraco.Core.Models.Entities;
diff --git a/src/Umbraco.Core/Models/DictionaryItem.cs b/src/Umbraco.Core/Models/DictionaryItem.cs
index 00c4e1a96c..c23e8f86a4 100644
--- a/src/Umbraco.Core/Models/DictionaryItem.cs
+++ b/src/Umbraco.Core/Models/DictionaryItem.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
diff --git a/src/Umbraco.Core/Models/DictionaryTranslation.cs b/src/Umbraco.Core/Models/DictionaryTranslation.cs
index 51c7ff2800..afb4063b97 100644
--- a/src/Umbraco.Core/Models/DictionaryTranslation.cs
+++ b/src/Umbraco.Core/Models/DictionaryTranslation.cs
@@ -1,8 +1,6 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
-using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
@@ -50,7 +48,6 @@ namespace Umbraco.Core.Models
             Key = uniqueId;
         }
 
-
         /// <summary>
         /// Gets or sets the <see cref="Language"/> for the translation
         /// </summary>
diff --git a/src/Umbraco.Core/Models/Entities/BeingDirty.cs b/src/Umbraco.Core/Models/Entities/BeingDirty.cs
index 4e6d0cf5e3..92b4ab5c4b 100644
--- a/src/Umbraco.Core/Models/Entities/BeingDirty.cs
+++ b/src/Umbraco.Core/Models/Entities/BeingDirty.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Reflection;
 
 namespace Umbraco.Core.Models.Entities
 {
@@ -19,7 +18,7 @@ namespace Umbraco.Core.Models.Entities
         /// <typeparam name="T">The type of the value.</typeparam>
         /// <param name="value">The new value.</param>
         /// <param name="valueRef">A reference to the value to set.</param>
-        /// <param name="propertyName">The property selector.</param>
+        /// <param name="propertyName">The property name.</param>
         /// <param name="comparer">A comparer to compare property values.</param>
         public new void SetPropertyValueAndDetectChanges<T>(T value, ref T valueRef, string propertyName, IEqualityComparer<T> comparer = null)
         {
diff --git a/src/Umbraco.Core/Models/Entities/BeingDirtyBase.cs b/src/Umbraco.Core/Models/Entities/BeingDirtyBase.cs
index d9db433217..a598ba1b3d 100644
--- a/src/Umbraco.Core/Models/Entities/BeingDirtyBase.cs
+++ b/src/Umbraco.Core/Models/Entities/BeingDirtyBase.cs
@@ -3,7 +3,6 @@ using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
 
 namespace Umbraco.Core.Models.Entities
@@ -143,7 +142,7 @@ namespace Umbraco.Core.Models.Entities
         /// <typeparam name="T">The type of the value.</typeparam>
         /// <param name="value">The new value.</param>
         /// <param name="valueRef">A reference to the value to set.</param>
-        /// <param name="propertyName">The property selector.</param>
+        /// <param name="propertyName">The property name.</param>
         /// <param name="comparer">A comparer to compare property values.</param>
         protected void SetPropertyValueAndDetectChanges<T>(T value, ref T valueRef, string propertyName, IEqualityComparer<T> comparer = null)
         {
diff --git a/src/Umbraco.Core/Models/Entities/EntityBase.cs b/src/Umbraco.Core/Models/Entities/EntityBase.cs
index ef90f5e28d..43837fa776 100644
--- a/src/Umbraco.Core/Models/Entities/EntityBase.cs
+++ b/src/Umbraco.Core/Models/Entities/EntityBase.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Diagnostics;
-using System.Reflection;
 using System.Runtime.Serialization;
 
 namespace Umbraco.Core.Models.Entities
diff --git a/src/Umbraco.Core/Models/Entities/TreeEntityBase.cs b/src/Umbraco.Core/Models/Entities/TreeEntityBase.cs
index b8243ed0a9..937d7ab0fc 100644
--- a/src/Umbraco.Core/Models/Entities/TreeEntityBase.cs
+++ b/src/Umbraco.Core/Models/Entities/TreeEntityBase.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 
 namespace Umbraco.Core.Models.Entities
diff --git a/src/Umbraco.Core/Models/File.cs b/src/Umbraco.Core/Models/File.cs
index 494dcbe6fc..845da4d053 100644
--- a/src/Umbraco.Core/Models/File.cs
+++ b/src/Umbraco.Core/Models/File.cs
@@ -1,9 +1,5 @@
 using System;
-using System.IO;
-using System.Reflection;
 using System.Runtime.Serialization;
-using System.Text;
-using Umbraco.Core.IO;
 using Umbraco.Core.Models.Entities;
 
 namespace Umbraco.Core.Models
diff --git a/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs b/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
index 084db81f11..0eb53428d1 100644
--- a/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
+++ b/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
@@ -3,20 +3,14 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Linq;
-using System.Reflection;
-using System.Security.Claims;
-using System.Threading.Tasks;
 using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Security;
 
 namespace Umbraco.Core.Models.Identity
 {
     public class BackOfficeIdentityUser : IdentityUser<int, IIdentityUserLogin, IdentityUserRole<string>, IdentityUserClaim<int>>, IRememberBeingDirty
     {
-
         private string _email;
         private string _userName;
         private int _id;
@@ -419,9 +413,9 @@ namespace Umbraco.Core.Models.Identity
         private static readonly DelegateEqualityComparer<IReadOnlyUserGroup[]> GroupsComparer = new DelegateEqualityComparer<IReadOnlyUserGroup[]>(
             (groups, enumerable) => groups.Select(x => x.Alias).UnsortedSequenceEqual(enumerable.Select(x => x.Alias)),
             groups => groups.GetHashCode());
+
         private static readonly DelegateEqualityComparer<int[]> StartIdsComparer = new DelegateEqualityComparer<int[]>(
             (groups, enumerable) => groups.UnsortedSequenceEqual(enumerable),
             groups => groups.GetHashCode());
-
     }
 }
diff --git a/src/Umbraco.Core/Models/Language.cs b/src/Umbraco.Core/Models/Language.cs
index 3e4d189abb..7d5fda3e06 100644
--- a/src/Umbraco.Core/Models/Language.cs
+++ b/src/Umbraco.Core/Models/Language.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Globalization;
-using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
 using System.Threading;
 using Umbraco.Core.Configuration;
@@ -16,7 +14,6 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     public class Language : EntityBase, ILanguage
     {
-
         private string _isoCode;
         private string _cultureName;
         private bool _isDefaultVariantLanguage;
@@ -27,7 +24,7 @@ namespace Umbraco.Core.Models
         {
             IsoCode = isoCode;
         }
-        
+
         /// <inheritdoc />
         [DataMember]
         public string IsoCode
diff --git a/src/Umbraco.Core/Models/Macro.cs b/src/Umbraco.Core/Models/Macro.cs
index 2f29ddecff..bc71d3dc2b 100644
--- a/src/Umbraco.Core/Models/Macro.cs
+++ b/src/Umbraco.Core/Models/Macro.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Strings;
@@ -99,22 +98,6 @@ namespace Umbraco.Core.Models
         private List<string> _addedProperties;
         private List<string> _removedProperties;
 
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo AliasSelector = ExpressionHelper.GetPropertyInfo<Macro, string>(x => x.Alias);
-            public readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<Macro, string>(x => x.Name);
-            public readonly PropertyInfo UseInEditorSelector = ExpressionHelper.GetPropertyInfo<Macro, bool>(x => x.UseInEditor);
-            public readonly PropertyInfo CacheDurationSelector = ExpressionHelper.GetPropertyInfo<Macro, int>(x => x.CacheDuration);
-            public readonly PropertyInfo CacheByPageSelector = ExpressionHelper.GetPropertyInfo<Macro, bool>(x => x.CacheByPage);
-            public readonly PropertyInfo CacheByMemberSelector = ExpressionHelper.GetPropertyInfo<Macro, bool>(x => x.CacheByMember);
-            public readonly PropertyInfo DontRenderSelector = ExpressionHelper.GetPropertyInfo<Macro, bool>(x => x.DontRender);
-            public readonly PropertyInfo ScriptPathSelector = ExpressionHelper.GetPropertyInfo<Macro, string>(x => x.MacroSource);
-            public readonly PropertyInfo MacroTypeSelector = ExpressionHelper.GetPropertyInfo<Macro, MacroTypes>(x => x.MacroType);
-            public readonly PropertyInfo PropertiesSelector = ExpressionHelper.GetPropertyInfo<Macro, MacroPropertyCollection>(x => x.Properties);
-        }
-
         void PropertiesChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
             OnPropertyChanged(nameof(Properties));
diff --git a/src/Umbraco.Core/Models/MacroProperty.cs b/src/Umbraco.Core/Models/MacroProperty.cs
index 7e269ba635..62ba6a7a7d 100644
--- a/src/Umbraco.Core/Models/MacroProperty.cs
+++ b/src/Umbraco.Core/Models/MacroProperty.cs
@@ -1,8 +1,6 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
-using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Core.Models
 {
diff --git a/src/Umbraco.Core/Models/Member.cs b/src/Umbraco.Core/Models/Member.cs
index 06f94b85aa..78d1cfafd5 100644
--- a/src/Umbraco.Core/Models/Member.cs
+++ b/src/Umbraco.Core/Models/Member.cs
@@ -1,13 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Models.Entities;
 
 namespace Umbraco.Core.Models
 {
@@ -130,7 +126,7 @@ namespace Umbraco.Core.Models
             _rawPasswordValue = rawPasswordValue;
             IsApproved = isApproved;
         }
-        
+
         /// <summary>
         /// Gets or sets the Username
         /// </summary>
diff --git a/src/Umbraco.Core/Models/MemberGroup.cs b/src/Umbraco.Core/Models/MemberGroup.cs
index 69e26c1037..8c06da418d 100644
--- a/src/Umbraco.Core/Models/MemberGroup.cs
+++ b/src/Umbraco.Core/Models/MemberGroup.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
@@ -17,7 +16,6 @@ namespace Umbraco.Core.Models
         private string _name;
         private int _creatorId;
 
-
         /// <inheritdoc />
         [DataMember]
         [DoNotClone]
diff --git a/src/Umbraco.Core/Models/MemberType.cs b/src/Umbraco.Core/Models/MemberType.cs
index 141cb3b63c..a6c1518446 100644
--- a/src/Umbraco.Core/Models/MemberType.cs
+++ b/src/Umbraco.Core/Models/MemberType.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using System.Runtime.Serialization;
 
 namespace Umbraco.Core.Models
diff --git a/src/Umbraco.Core/Models/Membership/UserGroup.cs b/src/Umbraco.Core/Models/Membership/UserGroup.cs
index 0562586af4..31421f990d 100644
--- a/src/Umbraco.Core/Models/Membership/UserGroup.cs
+++ b/src/Umbraco.Core/Models/Membership/UserGroup.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Strings;
diff --git a/src/Umbraco.Core/Models/MigrationEntry.cs b/src/Umbraco.Core/Models/MigrationEntry.cs
index 1149f6c773..1af66d2978 100644
--- a/src/Umbraco.Core/Models/MigrationEntry.cs
+++ b/src/Umbraco.Core/Models/MigrationEntry.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using Semver;
 using Umbraco.Core.Models.Entities;
 
diff --git a/src/Umbraco.Core/Models/Property.cs b/src/Umbraco.Core/Models/Property.cs
index f7f45d7f5c..726ddc1cf5 100644
--- a/src/Umbraco.Core/Models/Property.cs
+++ b/src/Umbraco.Core/Models/Property.cs
@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Collections;
 using Umbraco.Core.Models.Entities;
@@ -25,8 +24,6 @@ namespace Umbraco.Core.Models
         // _vvalues contains the (indexed) variant property values
         private Dictionary<CompositeNStringNStringKey, PropertyValue> _vvalues;
 
-        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
-
         /// <summary>
         /// Initializes a new instance of the <see cref="Property"/> class.
         /// </summary>
@@ -100,29 +97,25 @@ namespace Umbraco.Core.Models
                 => new PropertyValue { _culture = _culture, _segment = _segment, PublishedValue = PublishedValue, EditedValue = EditedValue };
         }
 
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class PropertySelectors
-        {
-            public readonly DelegateEqualityComparer<object> PropertyValueComparer = new DelegateEqualityComparer<object>(
-                (o, o1) =>
-                {
-                    if (o == null && o1 == null) return true;
+        private static readonly DelegateEqualityComparer<object> PropertyValueComparer = new DelegateEqualityComparer<object>(
+            (o, o1) =>
+            {
+                if (o == null && o1 == null) return true;
 
-                    // custom comparer for strings.
-                    // if one is null and another is empty then they are the same
-                    if (o is string || o1 is string)
-                        return ((o as string).IsNullOrWhiteSpace() && (o1 as string).IsNullOrWhiteSpace()) || (o != null && o1 != null && o.Equals(o1));
+                // custom comparer for strings.
+                // if one is null and another is empty then they are the same
+                if (o is string || o1 is string)
+                    return ((o as string).IsNullOrWhiteSpace() && (o1 as string).IsNullOrWhiteSpace()) || (o != null && o1 != null && o.Equals(o1));
 
-                    if (o == null || o1 == null) return false;
+                if (o == null || o1 == null) return false;
 
-                    // custom comparer for enumerable
-                    // ReSharper disable once MergeCastWithTypeCheck
-                    if (o is IEnumerable && o1 is IEnumerable enumerable)
-                        return ((IEnumerable) o).Cast<object>().UnsortedSequenceEqual(enumerable.Cast<object>());
+                // custom comparer for enumerable
+                // ReSharper disable once MergeCastWithTypeCheck
+                if (o is IEnumerable && o1 is IEnumerable enumerable)
+                    return ((IEnumerable)o).Cast<object>().UnsortedSequenceEqual(enumerable.Cast<object>());
 
-                    return o.Equals(o1);
-                }, o => o.GetHashCode());
-        }
+                return o.Equals(o1);
+            }, o => o.GetHashCode());
 
         /// <summary>
         /// Returns the PropertyType, which this Property is based on
@@ -255,7 +248,7 @@ namespace Umbraco.Core.Models
                 throw new NotSupportedException("Property type does not support publishing.");
             var origValue = pvalue.PublishedValue;
             pvalue.PublishedValue = PropertyType.ConvertAssignedValue(pvalue.EditedValue);
-            DetectChanges(pvalue.EditedValue, origValue, nameof(Values), Ps.Value.PropertyValueComparer, false);
+            DetectChanges(pvalue.EditedValue, origValue, nameof(Values), PropertyValueComparer, false);
         }
 
         private void UnpublishValue(PropertyValue pvalue)
@@ -266,7 +259,7 @@ namespace Umbraco.Core.Models
                 throw new NotSupportedException("Property type does not support publishing.");
             var origValue = pvalue.PublishedValue;
             pvalue.PublishedValue = PropertyType.ConvertAssignedValue(null);
-            DetectChanges(pvalue.EditedValue, origValue, nameof(Values), Ps.Value.PropertyValueComparer, false);
+            DetectChanges(pvalue.EditedValue, origValue, nameof(Values), PropertyValueComparer, false);
         }
 
         /// <summary>
@@ -287,7 +280,7 @@ namespace Umbraco.Core.Models
 
             pvalue.EditedValue = setValue;
 
-            DetectChanges(setValue, origValue, nameof(Values), Ps.Value.PropertyValueComparer, change);
+            DetectChanges(setValue, origValue, nameof(Values), PropertyValueComparer, change);
         }
 
         // bypasses all changes detection and is the *only* way to set the published value
diff --git a/src/Umbraco.Core/Models/PropertyGroup.cs b/src/Umbraco.Core/Models/PropertyGroup.cs
index 00bc12f584..2e6da5d837 100644
--- a/src/Umbraco.Core/Models/PropertyGroup.cs
+++ b/src/Umbraco.Core/Models/PropertyGroup.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Specialized;
 using System.Diagnostics;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
@@ -15,7 +14,6 @@ namespace Umbraco.Core.Models
     [DebuggerDisplay("Id: {Id}, Name: {Name}")]
     public class PropertyGroup : EntityBase, IEquatable<PropertyGroup>
     {
-
         private string _name;
         private int _sortOrder;
         private PropertyTypeCollection _propertyTypes;
diff --git a/src/Umbraco.Core/Models/PropertyType.cs b/src/Umbraco.Core/Models/PropertyType.cs
index 486e22b278..1d6a3b4fe9 100644
--- a/src/Umbraco.Core/Models/PropertyType.cs
+++ b/src/Umbraco.Core/Models/PropertyType.cs
@@ -1,11 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
-using System.Text.RegularExpressions;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Strings;
@@ -84,7 +80,7 @@ namespace Umbraco.Core.Models
             _alias = propertyTypeAlias == null ? null : SanitizeAlias(propertyTypeAlias);
             _variations = ContentVariation.Nothing;
         }
-        
+
         /// <summary>
         /// Gets a value indicating whether the content type, owning this property type, is publishing.
         /// </summary>
diff --git a/src/Umbraco.Core/Models/PublicAccessEntry.cs b/src/Umbraco.Core/Models/PublicAccessEntry.cs
index 58dd53a0c5..cfb30de147 100644
--- a/src/Umbraco.Core/Models/PublicAccessEntry.cs
+++ b/src/Umbraco.Core/Models/PublicAccessEntry.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
diff --git a/src/Umbraco.Core/Models/PublicAccessRule.cs b/src/Umbraco.Core/Models/PublicAccessRule.cs
index 99d24221a2..bb6c1cdea2 100644
--- a/src/Umbraco.Core/Models/PublicAccessRule.cs
+++ b/src/Umbraco.Core/Models/PublicAccessRule.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
@@ -23,7 +22,6 @@ namespace Umbraco.Core.Models
         {
         }
 
-        
         public Guid AccessEntryId { get; internal set; }
 
         public string RuleValue
diff --git a/src/Umbraco.Core/Models/RedirectUrl.cs b/src/Umbraco.Core/Models/RedirectUrl.cs
index 84fd631abb..f4eb955c64 100644
--- a/src/Umbraco.Core/Models/RedirectUrl.cs
+++ b/src/Umbraco.Core/Models/RedirectUrl.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
diff --git a/src/Umbraco.Core/Models/Relation.cs b/src/Umbraco.Core/Models/Relation.cs
index 1184561309..f5d13c70c4 100644
--- a/src/Umbraco.Core/Models/Relation.cs
+++ b/src/Umbraco.Core/Models/Relation.cs
@@ -1,8 +1,6 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
-using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
diff --git a/src/Umbraco.Core/Models/RelationType.cs b/src/Umbraco.Core/Models/RelationType.cs
index f2941a152d..259b7bc4ef 100644
--- a/src/Umbraco.Core/Models/RelationType.cs
+++ b/src/Umbraco.Core/Models/RelationType.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Models.Entities;
-using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
diff --git a/src/Umbraco.Core/Models/ServerRegistration.cs b/src/Umbraco.Core/Models/ServerRegistration.cs
index c85a750500..7dae5d5393 100644
--- a/src/Umbraco.Core/Models/ServerRegistration.cs
+++ b/src/Umbraco.Core/Models/ServerRegistration.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Globalization;
-using System.Reflection;
 using Umbraco.Core.Models.Entities;
 
 namespace Umbraco.Core.Models
@@ -14,7 +13,7 @@ namespace Umbraco.Core.Models
         private string _serverIdentity;
         private bool _isActive;
         private bool _isMaster;
-        
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerRegistration"/> class.
         /// </summary>
diff --git a/src/Umbraco.Core/Models/StylesheetProperty.cs b/src/Umbraco.Core/Models/StylesheetProperty.cs
index 27e9a26074..089f89deb6 100644
--- a/src/Umbraco.Core/Models/StylesheetProperty.cs
+++ b/src/Umbraco.Core/Models/StylesheetProperty.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
diff --git a/src/Umbraco.Core/Models/Tag.cs b/src/Umbraco.Core/Models/Tag.cs
index e44e26596b..315904493e 100644
--- a/src/Umbraco.Core/Models/Tag.cs
+++ b/src/Umbraco.Core/Models/Tag.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
@@ -12,8 +11,6 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     public class Tag : EntityBase, ITag
     {
-        private static PropertySelectors _selectors;
-
         private string _group;
         private string _text;
         private int? _languageId;
@@ -35,15 +32,6 @@ namespace Umbraco.Core.Models
             LanguageId = languageId;
         }
 
-        private static PropertySelectors Selectors => _selectors ?? (_selectors = new PropertySelectors());
-
-        private class PropertySelectors
-        {
-            public readonly PropertyInfo Group = ExpressionHelper.GetPropertyInfo<Tag, string>(x => x.Group);
-            public readonly PropertyInfo Text = ExpressionHelper.GetPropertyInfo<Tag, string>(x => x.Text);
-            public readonly PropertyInfo LanguageId = ExpressionHelper.GetPropertyInfo<Tag, int?>(x => x.LanguageId);
-        }
-
         /// <inheritdoc />
         public string Group
         {
diff --git a/src/Umbraco.Core/Models/Template.cs b/src/Umbraco.Core/Models/Template.cs
index e8c983e224..db473972e3 100644
--- a/src/Umbraco.Core/Models/Template.cs
+++ b/src/Umbraco.Core/Models/Template.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Strings;
 
diff --git a/src/Umbraco.Core/Models/UmbracoDomain.cs b/src/Umbraco.Core/Models/UmbracoDomain.cs
index 9aa2aa3c54..093acef5b5 100644
--- a/src/Umbraco.Core/Models/UmbracoDomain.cs
+++ b/src/Umbraco.Core/Models/UmbracoDomain.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
@@ -23,7 +22,7 @@ namespace Umbraco.Core.Models
         private int? _contentId;
         private int? _languageId;
         private string _domainName;
-        
+
         [DataMember]
         public int? LanguageId
         {