remove dependency on ClaimsPrincipal.Current