From 6f139cd72a9504f870e7cf635ab76df083dec65a Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 9 Jul 2018 18:08:03 +0200
Subject: [PATCH] Misc cleanup of PR

---
 src/Umbraco.Core/Models/ContentTypeSort.cs |  3 +++
 src/Umbraco.Web/UmbracoHelper.cs           | 28 ++--------------------
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/src/Umbraco.Core/Models/ContentTypeSort.cs b/src/Umbraco.Core/Models/ContentTypeSort.cs
index 9afcfbab37..e9442ed4c6 100644
--- a/src/Umbraco.Core/Models/ContentTypeSort.cs
+++ b/src/Umbraco.Core/Models/ContentTypeSort.cs
@@ -8,6 +8,9 @@ namespace Umbraco.Core.Models
     /// </summary>
     public class ContentTypeSort : IValueObject, IDeepCloneable
     {
+        // this parameterless ctor should never be used BUT is required by AutoMapper in EntityMapperProfile
+        internal ContentTypeSort() { }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="T:System.Object"/> class.
         /// </summary>
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 2d86253ee2..411a3fc2e1 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -286,30 +286,6 @@ namespace Umbraco.Web
 
         #region Membership
 
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        [Obsolete("Use the IsProtected method that only specifies path. This can be removed when library.cs is removed.")]
-        public bool IsProtected(int documentId, string path)
-        {
-            return IsProtected(path.EnsureEndsWith("," + documentId));
-        }
-
-        /// <summary>
-        /// Check if a document object is protected by the "Protect Pages" functionality in umbraco
-        /// </summary>
-        /// <param name="path">The full path of the document object to check</param>
-        /// <returns>True if the document object is protected</returns>
-        public bool IsProtected(string path)
-        {
-            return MembershipHelper.IsProtected(path);
-        }
-
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        [Obsolete("Use the MemberHasAccess method that only specifies path. This can be removed when library.cs is removed.")]
-        public bool MemberHasAccess(int nodeId, string path)
-        {
-            return MemberHasAccess(path.EnsureEndsWith("," + nodeId));
-        }
-
         /// <summary>
         /// Check if the current user has access to a document
         /// </summary>
@@ -886,7 +862,7 @@ namespace Umbraco.Web
         {
             return StringUtilities.ReplaceLineBreaksForHtml(text);
         }
-        
+
         /// <summary>
         /// Generates a hash based on the text string passed in.  This method will detect the
         /// security requirements (is FIPS enabled) and return an appropriate hash.
@@ -1051,7 +1027,7 @@ namespace Umbraco.Web
         }
 
         #endregion
-        
+
         /// <summary>
         /// This is used in methods like BeginUmbracoForm and SurfaceAction to generate an encrypted string which gets submitted in a request for which
         /// Umbraco can decrypt during the routing process in order to delegate the request to a specific MVC Controller.