diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index 2925497804..d7d2355411 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -97,18 +97,6 @@
-
-
-
-
-
-
-
diff --git a/src/Umbraco.Web/Security/WebSecurity.cs b/src/Umbraco.Web/Security/WebSecurity.cs
index fbf0093c62..e34a5c9a18 100644
--- a/src/Umbraco.Web/Security/WebSecurity.cs
+++ b/src/Umbraco.Web/Security/WebSecurity.cs
@@ -154,15 +154,7 @@ namespace Umbraco.Web.Security
var user = UserManager.FindByNameAsync(username).Result;
return user != null && UserManager.CheckPasswordAsync(user, password).Result;
}
-
- [EditorBrowsable(EditorBrowsableState.Never)]
- [Obsolete("Back office users shouldn't be resolved from the membership provider, they should be resolved usign the BackOfficeUserManager or the IUserService")]
- public virtual MembershipUser GetBackOfficeMembershipUser(string username, bool setOnline)
- {
- var membershipProvider = Core.Security.MembershipProviderExtensions.GetUsersMembershipProvider();
- return membershipProvider != null ? membershipProvider.GetUser(username, setOnline) : null;
- }
-
+
///
/// Validates the current user to see if they have access to the specified app
///
@@ -197,18 +189,7 @@ namespace Umbraco.Web.Security
var identity = _httpContext.GetCurrentIdentity(false);
return identity?.SessionId;
}
-
- ///
- /// Validates the user context ID.
- ///
- /// This doesn't do anything
- ///
- [Obsolete("This method is no longer used, use the ValidateCurrentUser() method instead")]
- public bool ValidateUserContextId(string currentUmbracoUserContextId)
- {
- return ValidateCurrentUser();
- }
-
+
///
/// Validates the currently logged in user and ensures they are not timed out
///
@@ -292,18 +273,6 @@ namespace Umbraco.Web.Security
return user.HasSectionAccess(section);
}
- [Obsolete("Returns the current user's unique umbraco sesion id - this cannot be set and isn't intended to be used in your code")]
- public string UmbracoUserContextId
- {
- get
- {
- return _httpContext.GetUmbracoAuthTicket() == null ? "" : GetSessionId();
- }
- set
- {
- }
- }
-
///
/// Ensures that a back office user is logged in
///