diff --git a/src/AspNetIdentity/IdentityServerBuilderExtensions.cs b/src/AspNetIdentity/IdentityServerBuilderExtensions.cs
index 73e979505..d680161ff 100644
--- a/src/AspNetIdentity/IdentityServerBuilderExtensions.cs
+++ b/src/AspNetIdentity/IdentityServerBuilderExtensions.cs
@@ -29,7 +29,6 @@ public static class IdentityServerBuilderExtensions
     /// </summary>
     /// <typeparam name="TUser">The type of the user.</typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddAspNetIdentity<TUser>(this IIdentityServerBuilder builder)
         where TUser : class
     {
diff --git a/src/AspNetIdentity/ProfileService.cs b/src/AspNetIdentity/ProfileService.cs
index 593c686b5..57da5caaa 100644
--- a/src/AspNetIdentity/ProfileService.cs
+++ b/src/AspNetIdentity/ProfileService.cs
@@ -67,7 +67,6 @@ public ProfileService(UserManager<TUser> userManager,
     /// This method is called whenever claims about the user are requested (e.g. during token creation or via the userinfo endpoint)
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     public virtual async Task GetProfileDataAsync(ProfileDataRequestContext context)
     {
         var sub = context.Subject?.GetSubjectId();
@@ -81,7 +80,6 @@ public virtual async Task GetProfileDataAsync(ProfileDataRequestContext context)
     /// </summary>
     /// <param name="context"></param>
     /// <param name="subjectId"></param>
-    /// <returns></returns>
     protected virtual async Task GetProfileDataAsync(ProfileDataRequestContext context, string subjectId)
     {
         var user = await FindUserAsync(subjectId);
@@ -96,7 +94,6 @@ protected virtual async Task GetProfileDataAsync(ProfileDataRequestContext conte
     /// </summary>
     /// <param name="context"></param>
     /// <param name="user"></param>
-    /// <returns></returns>
     protected virtual async Task GetProfileDataAsync(ProfileDataRequestContext context, TUser user)
     {
         var principal = await GetUserClaimsAsync(user);
@@ -107,7 +104,6 @@ protected virtual async Task GetProfileDataAsync(ProfileDataRequestContext conte
     /// Gets the claims for a user.
     /// </summary>
     /// <param name="user"></param>
-    /// <returns></returns>
     protected virtual async Task<ClaimsPrincipal> GetUserClaimsAsync(TUser user)
     {
         var principal = await ClaimsFactory.CreateAsync(user);
@@ -121,7 +117,6 @@ protected virtual async Task<ClaimsPrincipal> GetUserClaimsAsync(TUser user)
     /// (e.g. during token issuance or validation).
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     public virtual async Task IsActiveAsync(IsActiveContext context)
     {
         var sub = context.Subject?.GetSubjectId();
@@ -135,7 +130,6 @@ public virtual async Task IsActiveAsync(IsActiveContext context)
     /// </summary>
     /// <param name="context"></param>
     /// <param name="subjectId"></param>
-    /// <returns></returns>
     protected virtual async Task IsActiveAsync(IsActiveContext context, string subjectId)
     {
         var user = await FindUserAsync(subjectId);
@@ -154,7 +148,6 @@ protected virtual async Task IsActiveAsync(IsActiveContext context, string subje
     /// </summary>
     /// <param name="context"></param>
     /// <param name="user"></param>
-    /// <returns></returns>
     protected virtual async Task IsActiveAsync(IsActiveContext context, TUser user)
     {
         context.IsActive = await IsUserActiveAsync(user);
@@ -164,7 +157,6 @@ protected virtual async Task IsActiveAsync(IsActiveContext context, TUser user)
     /// Returns if the user is active.
     /// </summary>
     /// <param name="user"></param>
-    /// <returns></returns>
     public virtual Task<bool> IsUserActiveAsync(TUser user)
     {
         return Task.FromResult(true);
@@ -174,7 +166,6 @@ public virtual Task<bool> IsUserActiveAsync(TUser user)
     /// Loads the user by the subject id.
     /// </summary>
     /// <param name="subjectId"></param>
-    /// <returns></returns>
     protected virtual async Task<TUser> FindUserAsync(string subjectId)
     {
         var user = await UserManager.FindByIdAsync(subjectId);
diff --git a/src/AspNetIdentity/ResourceOwnerPasswordValidator.cs b/src/AspNetIdentity/ResourceOwnerPasswordValidator.cs
index 4f7ea99e8..45d730b6f 100644
--- a/src/AspNetIdentity/ResourceOwnerPasswordValidator.cs
+++ b/src/AspNetIdentity/ResourceOwnerPasswordValidator.cs
@@ -43,7 +43,6 @@ public ResourceOwnerPasswordValidator(
     /// Validates the resource owner password credential
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     public virtual async Task ValidateAsync(ResourceOwnerPasswordValidationContext context)
     {
         var user = await _userManager.FindByNameAsync(context.UserName);
diff --git a/src/AspNetIdentity/SecurityStampValidatorCallback.cs b/src/AspNetIdentity/SecurityStampValidatorCallback.cs
index 56926d336..bf13c2b87 100644
--- a/src/AspNetIdentity/SecurityStampValidatorCallback.cs
+++ b/src/AspNetIdentity/SecurityStampValidatorCallback.cs
@@ -18,7 +18,6 @@ public class SecurityStampValidatorCallback
     /// This is needed to preserve claims such as idp, auth_time, amr.
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     public static Task UpdatePrincipal(SecurityStampRefreshingPrincipalContext context)
     {
         var newClaimTypes = context.NewPrincipal.Claims.Select(x => x.Type).ToArray();
diff --git a/src/Configuration/RequestProcessing/DynamicClientRegistrationRequestProcessor.cs b/src/Configuration/RequestProcessing/DynamicClientRegistrationRequestProcessor.cs
index 53f1d41b1..4923fd4f6 100644
--- a/src/Configuration/RequestProcessing/DynamicClientRegistrationRequestProcessor.cs
+++ b/src/Configuration/RequestProcessing/DynamicClientRegistrationRequestProcessor.cs
@@ -133,7 +133,6 @@ protected virtual async Task<IStepResult> AddClientSecret(
     /// <param name="context">The dynamic client registration context, which
     /// includes the client model, the DCR request, and other contextual
     /// information.</param>
-    /// <returns></returns>
     protected virtual Task<IStepResult> AddClientId(
         DynamicClientRegistrationContext context)
     {
diff --git a/src/EntityFramework.Storage/Configuration/ServiceCollectionExtensions.cs b/src/EntityFramework.Storage/Configuration/ServiceCollectionExtensions.cs
index f8e596a7c..694eb7d6c 100644
--- a/src/EntityFramework.Storage/Configuration/ServiceCollectionExtensions.cs
+++ b/src/EntityFramework.Storage/Configuration/ServiceCollectionExtensions.cs
@@ -23,7 +23,6 @@ public static class IdentityServerEntityFrameworkBuilderExtensions
     /// </summary>
     /// <param name="services"></param>
     /// <param name="storeOptionsAction">The store options action.</param>
-    /// <returns></returns>
     public static IServiceCollection AddConfigurationDbContext(this IServiceCollection services,
         Action<ConfigurationStoreOptions>? storeOptionsAction = null)
     {
@@ -36,7 +35,6 @@ public static IServiceCollection AddConfigurationDbContext(this IServiceCollecti
     /// <typeparam name="TContext">The IConfigurationDbContext to use.</typeparam>
     /// <param name="services"></param>
     /// <param name="storeOptionsAction">The store options action.</param>
-    /// <returns></returns>
     public static IServiceCollection AddConfigurationDbContext<TContext>(this IServiceCollection services,
         Action<ConfigurationStoreOptions>? storeOptionsAction = null)
         where TContext : DbContext, IConfigurationDbContext
@@ -97,7 +95,6 @@ public static IServiceCollection AddConfigurationDbContext<TContext>(this IServi
     /// </summary>
     /// <param name="services"></param>
     /// <param name="storeOptionsAction">The store options action.</param>
-    /// <returns></returns>
     public static IServiceCollection AddOperationalDbContext(this IServiceCollection services,
         Action<OperationalStoreOptions>? storeOptionsAction = null)
     {
@@ -110,7 +107,6 @@ public static IServiceCollection AddOperationalDbContext(this IServiceCollection
     /// <typeparam name="TContext">The IPersistedGrantDbContext to use.</typeparam>
     /// <param name="services"></param>
     /// <param name="storeOptionsAction">The store options action.</param>
-    /// <returns></returns>
     public static IServiceCollection AddOperationalDbContext<TContext>(this IServiceCollection services,
         Action<OperationalStoreOptions>? storeOptionsAction = null)
         where TContext : DbContext, IPersistedGrantDbContext
@@ -174,7 +170,6 @@ public static IServiceCollection AddOperationalDbContext<TContext>(this IService
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="services"></param>
-    /// <returns></returns>
     public static IServiceCollection AddOperationalStoreNotification<T>(this IServiceCollection services)
         where T : class, IOperationalStoreNotification
     {
diff --git a/src/EntityFramework.Storage/Interfaces/IPersistedGrantDbContext.cs b/src/EntityFramework.Storage/Interfaces/IPersistedGrantDbContext.cs
index 6f05f4971..72e6d1ed2 100644
--- a/src/EntityFramework.Storage/Interfaces/IPersistedGrantDbContext.cs
+++ b/src/EntityFramework.Storage/Interfaces/IPersistedGrantDbContext.cs
@@ -61,7 +61,6 @@ public interface IPersistedGrantDbContext : IDisposable
     /// <summary>
     /// Saves the changes.
     /// </summary>
-    /// <returns></returns>
     Task<int> SaveChangesAsync(CancellationToken cancellationToken);
 
     // this is here only because of this: https://github.com/DuendeSoftware/IdentityServer/issues/472
@@ -70,6 +69,5 @@ public interface IPersistedGrantDbContext : IDisposable
     /// <summary>
     /// Saves the changes.
     /// </summary>
-    /// <returns></returns>
     Task<int> SaveChangesAsync() => SaveChangesAsync(CancellationToken.None);
 }
diff --git a/src/EntityFramework.Storage/Mappers/ApiResourceMappers.cs b/src/EntityFramework.Storage/Mappers/ApiResourceMappers.cs
index 9a6a38a5c..521350f12 100644
--- a/src/EntityFramework.Storage/Mappers/ApiResourceMappers.cs
+++ b/src/EntityFramework.Storage/Mappers/ApiResourceMappers.cs
@@ -16,7 +16,6 @@ public static class ApiResourceMappers
     /// Maps an entity to a model.
     /// </summary>
     /// <param name="entity">The entity.</param>
-    /// <returns></returns>
     public static Models.ApiResource ToModel(this Entities.ApiResource entity)
     {
         return entity == null ? null :
@@ -47,7 +46,6 @@ public static Models.ApiResource ToModel(this Entities.ApiResource entity)
     /// Maps a model to an entity.
     /// </summary>
     /// <param name="model">The model.</param>
-    /// <returns></returns>
     public static Entities.ApiResource ToEntity(this Models.ApiResource model)
     {
         return model == null ? null :
diff --git a/src/EntityFramework.Storage/Mappers/ClientMappers.cs b/src/EntityFramework.Storage/Mappers/ClientMappers.cs
index a98dbd04b..974a60a5c 100644
--- a/src/EntityFramework.Storage/Mappers/ClientMappers.cs
+++ b/src/EntityFramework.Storage/Mappers/ClientMappers.cs
@@ -19,7 +19,6 @@ public static class ClientMappers
     /// Maps an entity to a model.
     /// </summary>
     /// <param name="entity">The entity.</param>
-    /// <returns></returns>
     public static Models.Client ToModel(this Entities.Client entity)
     {
         return new Models.Client
@@ -99,7 +98,6 @@ public static Models.Client ToModel(this Entities.Client entity)
     /// Maps a model to an entity.
     /// </summary>
     /// <param name="model">The model.</param>
-    /// <returns></returns>
     public static Entities.Client ToEntity(this Models.Client model)
     {
         return new Entities.Client
diff --git a/src/EntityFramework.Storage/Mappers/IdentityProviderMappers.cs b/src/EntityFramework.Storage/Mappers/IdentityProviderMappers.cs
index da8bc8305..31b5748ae 100644
--- a/src/EntityFramework.Storage/Mappers/IdentityProviderMappers.cs
+++ b/src/EntityFramework.Storage/Mappers/IdentityProviderMappers.cs
@@ -13,7 +13,6 @@ public static class IdentityProviderMappers
     /// Maps an entity to a model.
     /// </summary>
     /// <param name="entity">The entity.</param>
-    /// <returns></returns>
     public static Models.IdentityProvider ToModel(this Entities.IdentityProvider entity)
     {
         return entity == null ? null :
@@ -31,7 +30,6 @@ public static Models.IdentityProvider ToModel(this Entities.IdentityProvider ent
     /// Maps a model to an entity.
     /// </summary>
     /// <param name="model">The model.</param>
-    /// <returns></returns>
     public static Entities.IdentityProvider ToEntity(this Models.IdentityProvider model)
     {
         return model == null ? null : 
diff --git a/src/EntityFramework.Storage/Mappers/IdentityResourceMappers.cs b/src/EntityFramework.Storage/Mappers/IdentityResourceMappers.cs
index bffd0e75f..2828068e7 100644
--- a/src/EntityFramework.Storage/Mappers/IdentityResourceMappers.cs
+++ b/src/EntityFramework.Storage/Mappers/IdentityResourceMappers.cs
@@ -16,7 +16,6 @@ public static class IdentityResourceMappers
     /// Maps an entity to a model.
     /// </summary>
     /// <param name="entity">The entity.</param>
-    /// <returns></returns>
     public static Models.IdentityResource ToModel(this Entities.IdentityResource entity)
     {
         return entity == null ? null : 
@@ -39,7 +38,6 @@ public static Models.IdentityResource ToModel(this Entities.IdentityResource ent
     /// Maps a model to an entity.
     /// </summary>
     /// <param name="model">The model.</param>
-    /// <returns></returns>
     public static Entities.IdentityResource ToEntity(this Models.IdentityResource model)
     {
         return model == null ? null :
diff --git a/src/EntityFramework.Storage/Mappers/PersistedGrantMappers.cs b/src/EntityFramework.Storage/Mappers/PersistedGrantMappers.cs
index 8ba59c24d..38a682292 100644
--- a/src/EntityFramework.Storage/Mappers/PersistedGrantMappers.cs
+++ b/src/EntityFramework.Storage/Mappers/PersistedGrantMappers.cs
@@ -15,7 +15,6 @@ public static class PersistedGrantMappers
     /// Maps an entity to a model.
     /// </summary>
     /// <param name="entity">The entity.</param>
-    /// <returns></returns>
     public static PersistedGrant ToModel(this Entities.PersistedGrant entity)
     {
         return entity == null ? null :
@@ -38,7 +37,6 @@ public static PersistedGrant ToModel(this Entities.PersistedGrant entity)
     /// Maps a model to an entity.
     /// </summary>
     /// <param name="model">The model.</param>
-    /// <returns></returns>
     public static Entities.PersistedGrant ToEntity(this Models.PersistedGrant model)
     {
         return model == null ? null :
diff --git a/src/EntityFramework.Storage/Mappers/PushedAuthorizationRequestMappers.cs b/src/EntityFramework.Storage/Mappers/PushedAuthorizationRequestMappers.cs
index a6f3736e4..397e48af1 100644
--- a/src/EntityFramework.Storage/Mappers/PushedAuthorizationRequestMappers.cs
+++ b/src/EntityFramework.Storage/Mappers/PushedAuthorizationRequestMappers.cs
@@ -15,7 +15,6 @@ public static class PushedAuthorizationRequestMappers
     /// Maps an entity to a model.
     /// </summary>
     /// <param name="entity">The entity.</param>
-    /// <returns></returns>
     public static Models.PushedAuthorizationRequest ToModel(this PushedAuthorizationRequest entity)
     {
         return entity == null ? null :
@@ -31,7 +30,6 @@ public static Models.PushedAuthorizationRequest ToModel(this PushedAuthorization
     /// Maps a model to an entity.
     /// </summary>
     /// <param name="model">The model.</param>
-    /// <returns></returns>
     public static Entities.PushedAuthorizationRequest ToEntity(this Models.PushedAuthorizationRequest model)
     {
         return model == null ? null : 
diff --git a/src/EntityFramework.Storage/Mappers/ScopeMappers.cs b/src/EntityFramework.Storage/Mappers/ScopeMappers.cs
index 2abc27006..fa294a4fb 100644
--- a/src/EntityFramework.Storage/Mappers/ScopeMappers.cs
+++ b/src/EntityFramework.Storage/Mappers/ScopeMappers.cs
@@ -17,7 +17,6 @@ public static class ScopeMappers
     /// Maps an entity to a model.
     /// </summary>
     /// <param name="entity">The entity.</param>
-    /// <returns></returns>
     public static Models.ApiScope ToModel(this ApiScope entity)
     {
         return entity == null ? null : 
@@ -40,7 +39,6 @@ public static Models.ApiScope ToModel(this ApiScope entity)
     /// Maps a model to an entity.
     /// </summary>
     /// <param name="model">The model.</param>
-    /// <returns></returns>
     public static Entities.ApiScope ToEntity(this Models.ApiScope model)
     {
         return model == null ? null : 
diff --git a/src/EntityFramework.Storage/Stores/DeviceFlowStore.cs b/src/EntityFramework.Storage/Stores/DeviceFlowStore.cs
index 34bb1f379..2bb88b8e4 100644
--- a/src/EntityFramework.Storage/Stores/DeviceFlowStore.cs
+++ b/src/EntityFramework.Storage/Stores/DeviceFlowStore.cs
@@ -68,7 +68,6 @@ public DeviceFlowStore(
     /// <param name="deviceCode">The device code.</param>
     /// <param name="userCode">The user code.</param>
     /// <param name="data">The data.</param>
-    /// <returns></returns>
     public virtual async Task StoreDeviceAuthorizationAsync(string deviceCode, string userCode, DeviceCode data)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("DeviceFlowStore.StoreDeviceAuthorization");
@@ -82,7 +81,6 @@ public virtual async Task StoreDeviceAuthorizationAsync(string deviceCode, strin
     /// Finds device authorization by user code.
     /// </summary>
     /// <param name="userCode">The user code.</param>
-    /// <returns></returns>
     public virtual async Task<DeviceCode> FindByUserCodeAsync(string userCode)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("DeviceFlowStore.FindByUserCode");
@@ -101,7 +99,6 @@ public virtual async Task<DeviceCode> FindByUserCodeAsync(string userCode)
     /// Finds device authorization by device code.
     /// </summary>
     /// <param name="deviceCode">The device code.</param>
-    /// <returns></returns>
     public virtual async Task<DeviceCode> FindByDeviceCodeAsync(string deviceCode)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("DeviceFlowStore.FindByDeviceCode");
@@ -121,7 +118,6 @@ public virtual async Task<DeviceCode> FindByDeviceCodeAsync(string deviceCode)
     /// </summary>
     /// <param name="userCode">The user code.</param>
     /// <param name="data">The data.</param>
-    /// <returns></returns>
     public virtual async Task UpdateByUserCodeAsync(string userCode, DeviceCode data)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("DeviceFlowStore.UpdateByUserCode");
@@ -156,7 +152,6 @@ public virtual async Task UpdateByUserCodeAsync(string userCode, DeviceCode data
     /// Removes the device authorization, searching by device code.
     /// </summary>
     /// <param name="deviceCode">The device code.</param>
-    /// <returns></returns>
     public virtual async Task RemoveByDeviceCodeAsync(string deviceCode)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("DeviceFlowStore.RemoveByDeviceCode");
@@ -192,7 +187,6 @@ public virtual async Task RemoveByDeviceCodeAsync(string deviceCode)
     /// <param name="model"></param>
     /// <param name="deviceCode"></param>
     /// <param name="userCode"></param>
-    /// <returns></returns>
     protected DeviceFlowCodes ToEntity(DeviceCode model, string deviceCode, string userCode)
     {
         if (model == null || deviceCode == null || userCode == null) return null;
@@ -215,7 +209,6 @@ protected DeviceFlowCodes ToEntity(DeviceCode model, string deviceCode, string u
     /// Converts a serialized DeviceCode to a model.
     /// </summary>
     /// <param name="entity"></param>
-    /// <returns></returns>
     protected DeviceCode ToModel(string entity)
     {
         if (entity == null) return null;
diff --git a/src/EntityFramework.Storage/Stores/IdentityProviderStore.cs b/src/EntityFramework.Storage/Stores/IdentityProviderStore.cs
index b87a139c9..c5b0a9d1d 100644
--- a/src/EntityFramework.Storage/Stores/IdentityProviderStore.cs
+++ b/src/EntityFramework.Storage/Stores/IdentityProviderStore.cs
@@ -89,7 +89,6 @@ public async Task<IdentityProvider> GetBySchemeAsync(string scheme)
     /// Maps from the identity provider entity to identity provider model.
     /// </summary>
     /// <param name="idp"></param>
-    /// <returns></returns>
     protected virtual IdentityProvider MapIdp(Entities.IdentityProvider idp)
     {
         if (idp.Type == "oidc")
diff --git a/src/EntityFramework.Storage/Stores/ResourceStore.cs b/src/EntityFramework.Storage/Stores/ResourceStore.cs
index a8a81ceb0..373f1de50 100644
--- a/src/EntityFramework.Storage/Stores/ResourceStore.cs
+++ b/src/EntityFramework.Storage/Stores/ResourceStore.cs
@@ -56,7 +56,6 @@ public ResourceStore(IConfigurationDbContext context, ILogger<ResourceStore> log
     /// Finds the API resources by name.
     /// </summary>
     /// <param name="apiResourceNames">The names.</param>
-    /// <returns></returns>
     public virtual async Task<IEnumerable<ApiResource>> FindApiResourcesByNameAsync(IEnumerable<string> apiResourceNames)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("ResourceStore.FindApiResourcesByName");
@@ -96,7 +95,6 @@ where apiResourceNames.Contains(apiResource.Name)
     /// Gets API resources by scope name.
     /// </summary>
     /// <param name="scopeNames"></param>
-    /// <returns></returns>
     public virtual async Task<IEnumerable<ApiResource>> FindApiResourcesByScopeNameAsync(IEnumerable<string> scopeNames)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("ResourceStore.FindApiResourcesByScopeName");
@@ -129,7 +127,6 @@ where api.Scopes.Any(x => names.Contains(x.Scope))
     /// Gets identity resources by scope name.
     /// </summary>
     /// <param name="scopeNames"></param>
-    /// <returns></returns>
     public virtual async Task<IEnumerable<IdentityResource>> FindIdentityResourcesByScopeNameAsync(IEnumerable<string> scopeNames)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("ResourceStore.FindIdentityResourcesByScopeName");
@@ -159,7 +156,6 @@ where scopes.Contains(identityResource.Name)
     /// Gets scopes by scope name.
     /// </summary>
     /// <param name="scopeNames"></param>
-    /// <returns></returns>
     public virtual async Task<IEnumerable<ApiScope>> FindApiScopesByNameAsync(IEnumerable<string> scopeNames)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("ResourceStore.FindApiScopesByName");
@@ -188,7 +184,6 @@ where scopes.Contains(scope.Name)
     /// <summary>
     /// Gets all resources.
     /// </summary>
-    /// <returns></returns>
     public virtual async Task<Resources> GetAllResourcesAsync()
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("ResourceStore.GetAllResources");
diff --git a/src/EntityFramework.Storage/Stores/SigningKeyStore.cs b/src/EntityFramework.Storage/Stores/SigningKeyStore.cs
index 87f04828c..eac2e2ba5 100644
--- a/src/EntityFramework.Storage/Stores/SigningKeyStore.cs
+++ b/src/EntityFramework.Storage/Stores/SigningKeyStore.cs
@@ -56,7 +56,6 @@ public SigningKeyStore(IPersistedGrantDbContext context, ILogger<SigningKeyStore
     /// <summary>
     /// Loads all keys from store.
     /// </summary>
-    /// <returns></returns>
     public async Task<IEnumerable<SerializedKey>> LoadKeysAsync()
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("SigningKeyStore.LoadKeys");
@@ -80,7 +79,6 @@ public async Task<IEnumerable<SerializedKey>> LoadKeysAsync()
     /// Persists new key in store.
     /// </summary>
     /// <param name="key"></param>
-    /// <returns></returns>
     public Task StoreKeyAsync(SerializedKey key)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("SigningKeyStore.StoreKey");
@@ -104,7 +102,6 @@ public Task StoreKeyAsync(SerializedKey key)
     /// Deletes key from storage.
     /// </summary>
     /// <param name="id"></param>
-    /// <returns></returns>
     public async Task DeleteKeyAsync(string id)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("SigningKeyStore.DeleteKey");
diff --git a/src/EntityFramework.Storage/TokenCleanup/IOperationalStoreNotification.cs b/src/EntityFramework.Storage/TokenCleanup/IOperationalStoreNotification.cs
index aae21483e..c86025c3b 100644
--- a/src/EntityFramework.Storage/TokenCleanup/IOperationalStoreNotification.cs
+++ b/src/EntityFramework.Storage/TokenCleanup/IOperationalStoreNotification.cs
@@ -21,7 +21,6 @@ public interface IOperationalStoreNotification
     /// </summary>
     /// <param name="persistedGrants"></param>
     /// <param name="cancellationToken"></param>
-    /// <returns></returns>
     Task PersistedGrantsRemovedAsync(IEnumerable<PersistedGrant> persistedGrants, CancellationToken cancellationToken = default);
 
     /// <summary>
@@ -29,6 +28,5 @@ public interface IOperationalStoreNotification
     /// </summary>
     /// <param name="deviceCodes"></param>
     /// <param name="cancellationToken"></param>
-    /// <returns></returns>
     Task DeviceCodesRemovedAsync(IEnumerable<DeviceFlowCodes> deviceCodes, CancellationToken cancellationToken = default);
 }
diff --git a/src/EntityFramework.Storage/TokenCleanup/ITokenCleanupService.cs b/src/EntityFramework.Storage/TokenCleanup/ITokenCleanupService.cs
index 9f48873ca..5b23d5381 100644
--- a/src/EntityFramework.Storage/TokenCleanup/ITokenCleanupService.cs
+++ b/src/EntityFramework.Storage/TokenCleanup/ITokenCleanupService.cs
@@ -21,6 +21,5 @@ public interface ITokenCleanupService
     /// </summary>
     /// <param name="cancellationToken">A token that propagates notification
     /// that the cleanup operation should be canceled.</param>
-    /// <returns></returns>
     Task CleanupGrantsAsync(CancellationToken cancellationToken = default);
 }
diff --git a/src/EntityFramework.Storage/TokenCleanup/TokenCleanupService.cs b/src/EntityFramework.Storage/TokenCleanup/TokenCleanupService.cs
index 3e8f7f150..16afae671 100644
--- a/src/EntityFramework.Storage/TokenCleanup/TokenCleanupService.cs
+++ b/src/EntityFramework.Storage/TokenCleanup/TokenCleanupService.cs
@@ -66,7 +66,6 @@ public async Task CleanupGrantsAsync(CancellationToken cancellationToken = defau
     /// <summary>
     /// Removes the stale persisted grants.
     /// </summary>
-    /// <returns></returns>
     protected virtual async Task RemoveGrantsAsync(CancellationToken cancellationToken = default)
     {
         await RemoveExpiredPersistedGrantsAsync(cancellationToken);
@@ -79,7 +78,6 @@ protected virtual async Task RemoveGrantsAsync(CancellationToken cancellationTok
     /// <summary>
     /// Removes the expired persisted grants.
     /// </summary>
-    /// <returns></returns>
     protected virtual async Task RemoveExpiredPersistedGrantsAsync(CancellationToken cancellationToken = default)
     {
         var found = Int32.MaxValue;
@@ -148,7 +146,6 @@ protected virtual async Task RemoveExpiredPersistedGrantsAsync(CancellationToken
     /// <summary>
     /// Removes the consumed persisted grants.
     /// </summary>
-    /// <returns></returns>
     protected virtual async Task RemoveConsumedPersistedGrantsAsync(CancellationToken cancellationToken = default)
     {
         var found = Int32.MaxValue;
@@ -211,7 +208,6 @@ protected virtual async Task RemoveConsumedPersistedGrantsAsync(CancellationToke
     /// <summary>
     /// Removes the stale device codes.
     /// </summary>
-    /// <returns></returns>
     protected virtual async Task RemoveDeviceCodesAsync(CancellationToken cancellationToken = default)
     {
         var found = Int32.MaxValue;
diff --git a/src/EntityFramework/IdentityServerEntityFrameworkBuilderExtensions.cs b/src/EntityFramework/IdentityServerEntityFrameworkBuilderExtensions.cs
index d376750ee..7d1bc64d3 100644
--- a/src/EntityFramework/IdentityServerEntityFrameworkBuilderExtensions.cs
+++ b/src/EntityFramework/IdentityServerEntityFrameworkBuilderExtensions.cs
@@ -27,7 +27,6 @@ public static class IdentityServerEntityFrameworkBuilderExtensions
     /// </summary>
     /// <param name="builder">The builder.</param>
     /// <param name="storeOptionsAction">The store options action.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddConfigurationStore(
         this IIdentityServerBuilder builder,
         Action<ConfigurationStoreOptions>? storeOptionsAction = null)
@@ -41,7 +40,6 @@ public static IIdentityServerBuilder AddConfigurationStore(
     /// <typeparam name="TContext">The IConfigurationDbContext to use.</typeparam>
     /// <param name="builder">The builder.</param>
     /// <param name="storeOptionsAction">The store options action.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddConfigurationStore<TContext>(
         this IIdentityServerBuilder builder,
         Action<ConfigurationStoreOptions>? storeOptionsAction = null)
@@ -61,7 +59,6 @@ public static IIdentityServerBuilder AddConfigurationStore<TContext>(
     /// Configures caching for IClientStore, IResourceStore, and ICorsPolicyService with IdentityServer.
     /// </summary>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddConfigurationStoreCache(
         this IIdentityServerBuilder builder)
     {
@@ -81,7 +78,6 @@ public static IIdentityServerBuilder AddConfigurationStoreCache(
     /// </summary>
     /// <param name="builder">The builder.</param>
     /// <param name="storeOptionsAction">The store options action.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddOperationalStore(
         this IIdentityServerBuilder builder,
         Action<OperationalStoreOptions>? storeOptionsAction = null)
@@ -95,7 +91,6 @@ public static IIdentityServerBuilder AddOperationalStore(
     /// <typeparam name="TContext">The IPersistedGrantDbContext to use.</typeparam>
     /// <param name="builder">The builder.</param>
     /// <param name="storeOptionsAction">The store options action.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddOperationalStore<TContext>(
         this IIdentityServerBuilder builder,
         Action<OperationalStoreOptions>? storeOptionsAction = null)
@@ -119,7 +114,6 @@ public static IIdentityServerBuilder AddOperationalStore<TContext>(
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="builder"></param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddOperationalStoreNotification<T>(
         this IIdentityServerBuilder builder)
         where T : class, IOperationalStoreNotification
diff --git a/src/EntityFramework/Services/CorsPolicyService.cs b/src/EntityFramework/Services/CorsPolicyService.cs
index d9206823b..c057c2ebf 100644
--- a/src/EntityFramework/Services/CorsPolicyService.cs
+++ b/src/EntityFramework/Services/CorsPolicyService.cs
@@ -52,7 +52,6 @@ public CorsPolicyService(IConfigurationDbContext dbContext, ILogger<CorsPolicySe
     /// Determines whether origin is allowed.
     /// </summary>
     /// <param name="origin">The origin.</param>
-    /// <returns></returns>
     public async Task<bool> IsOriginAllowedAsync(string origin)
     {
         origin = origin.ToLowerInvariant();
diff --git a/src/IdentityServer/Configuration/CryptoHelper.cs b/src/IdentityServer/Configuration/CryptoHelper.cs
index 863feaaf2..fa0244bec 100644
--- a/src/IdentityServer/Configuration/CryptoHelper.cs
+++ b/src/IdentityServer/Configuration/CryptoHelper.cs
@@ -22,7 +22,6 @@ public static class CryptoHelper
     /// <summary>
     /// Creates a new RSA security key.
     /// </summary>
-    /// <returns></returns>
     public static RsaSecurityKey CreateRsaSecurityKey(int keySize = 2048)
     {
         return new RsaSecurityKey(RSA.Create(keySize))
@@ -36,7 +35,6 @@ public static RsaSecurityKey CreateRsaSecurityKey(int keySize = 2048)
     /// </summary>
     /// <param name="curve">The name of the curve as defined in
     /// https://tools.ietf.org/html/rfc7518#section-6.2.1.1.</param>
-    /// <returns></returns>
     public static ECDsaSecurityKey CreateECDsaSecurityKey(string curve = JsonWebKeyECTypes.P256)
     {
         return new ECDsaSecurityKey(ECDsa.Create(GetCurveFromCrvValue(curve)))
@@ -50,7 +48,6 @@ public static ECDsaSecurityKey CreateECDsaSecurityKey(string curve = JsonWebKeyE
     /// </summary>
     /// <param name="parameters">The parameters.</param>
     /// <param name="id">The identifier.</param>
-    /// <returns></returns>
     public static RsaSecurityKey CreateRsaSecurityKey(RSAParameters parameters, string id)
     {
         var key = new RsaSecurityKey(parameters)
@@ -66,7 +63,6 @@ public static RsaSecurityKey CreateRsaSecurityKey(RSAParameters parameters, stri
     /// </summary>
     /// <param name="value">The value to hash.</param>
     /// <param name="tokenSigningAlgorithm">The token signing algorithm</param>
-    /// <returns></returns>
     public static string CreateHashClaimValue(string value, string tokenSigningAlgorithm)
     {
         var (hashFunction, hashLength) = GetHashFunctionForSigningAlgorithm(tokenSigningAlgorithm);
@@ -85,7 +81,6 @@ public static string CreateHashClaimValue(string value, string tokenSigningAlgor
     /// Returns the matching hash function for a token signing algorithm
     /// </summary>
     /// <param name="signingAlgorithm"></param>
-    /// <returns></returns>
     /// <exception cref="InvalidOperationException"></exception>
     public static (Func<byte[], byte[]> hashFunction, int hashLength) GetHashFunctionForSigningAlgorithm(string signingAlgorithm)
     {
@@ -107,7 +102,6 @@ public static (Func<byte[], byte[]> hashFunction, int hashLength) GetHashFunctio
     /// Returns the matching hashing algorithm for a token signing algorithm
     /// </summary>
     /// <param name="signingAlgorithm">The signing algorithm</param>
-    /// <returns></returns>
     [Obsolete("This method is obsolete and will be removed in a future version. Consider using GetHashFunctionForSigningAlgorithm instead for better performance (it does not allocate a HashAlgorithm)")]
     public static HashAlgorithm GetHashAlgorithmForSigningAlgorithm(string signingAlgorithm)
     {
diff --git a/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Additional.cs b/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Additional.cs
index 086891c8c..6ad30ab74 100644
--- a/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Additional.cs
+++ b/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Additional.cs
@@ -28,7 +28,6 @@ public static class IdentityServerBuilderExtensionsAdditional
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddExtensionGrantValidator<T>(this IIdentityServerBuilder builder)
         where T : class, IExtensionGrantValidator
     {
@@ -42,7 +41,6 @@ public static IIdentityServerBuilder AddExtensionGrantValidator<T>(this IIdentit
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddRedirectUriValidator<T>(this IIdentityServerBuilder builder)
         where T : class, IRedirectUriValidator
     {
@@ -55,7 +53,6 @@ public static IIdentityServerBuilder AddRedirectUriValidator<T>(this IIdentitySe
     /// Adds an "AppAuth" (OAuth 2.0 for Native Apps) compliant redirect URI validator (does strict validation but also allows http://127.0.0.1 with random port)
     /// </summary>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddAppAuthRedirectUriValidator(this IIdentityServerBuilder builder)
     {
         return builder.AddRedirectUriValidator<StrictRedirectUriValidatorAppAuth>();
@@ -66,7 +63,6 @@ public static IIdentityServerBuilder AddAppAuthRedirectUriValidator(this IIdenti
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddResourceOwnerValidator<T>(this IIdentityServerBuilder builder)
         where T : class, IResourceOwnerPasswordValidator
     {
@@ -80,7 +76,6 @@ public static IIdentityServerBuilder AddResourceOwnerValidator<T>(this IIdentity
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddProfileService<T>(this IIdentityServerBuilder builder)
         where T : class, IProfileService
     {
@@ -94,7 +89,6 @@ public static IIdentityServerBuilder AddProfileService<T>(this IIdentityServerBu
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddResourceValidator<T>(this IIdentityServerBuilder builder)
         where T : class, IResourceValidator
     {
@@ -108,7 +102,6 @@ public static IIdentityServerBuilder AddResourceValidator<T>(this IIdentityServe
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddScopeParser<T>(this IIdentityServerBuilder builder)
         where T : class, IScopeParser
     {
@@ -122,7 +115,6 @@ public static IIdentityServerBuilder AddScopeParser<T>(this IIdentityServerBuild
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddClientStore<T>(this IIdentityServerBuilder builder)
         where T : class, IClientStore
     {
@@ -137,7 +129,6 @@ public static IIdentityServerBuilder AddClientStore<T>(this IIdentityServerBuild
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddResourceStore<T>(this IIdentityServerBuilder builder)
         where T : class, IResourceStore
     {
@@ -206,7 +197,6 @@ public static IIdentityServerBuilder AddPushedAuthorizationRequestStore<T>(this
     /// </summary>
     /// <typeparam name="T">The type of the concrete CORS policy service that is registered in DI.</typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddCorsPolicyService<T>(this IIdentityServerBuilder builder)
         where T : class, ICorsPolicyService
     {
@@ -219,7 +209,6 @@ public static IIdentityServerBuilder AddCorsPolicyService<T>(this IIdentityServe
     /// </summary>
     /// <typeparam name="T">The type of the concrete CORS policy service that is registered in DI.</typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddCorsPolicyCache<T>(this IIdentityServerBuilder builder)
         where T : class, ICorsPolicyService
     {
@@ -233,7 +222,6 @@ public static IIdentityServerBuilder AddCorsPolicyCache<T>(this IIdentityServerB
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddSecretParser<T>(this IIdentityServerBuilder builder)
         where T : class, ISecretParser
     {
@@ -247,7 +235,6 @@ public static IIdentityServerBuilder AddSecretParser<T>(this IIdentityServerBuil
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddSecretValidator<T>(this IIdentityServerBuilder builder)
         where T : class, ISecretValidator
     {
@@ -261,7 +248,6 @@ public static IIdentityServerBuilder AddSecretValidator<T>(this IIdentityServerB
     /// </summary>
     /// <typeparam name="T">The type of the concrete client store class that is registered in DI.</typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddClientStoreCache<T>(this IIdentityServerBuilder builder)
         where T : IClientStore
     {
@@ -277,7 +263,6 @@ public static IIdentityServerBuilder AddClientStoreCache<T>(this IIdentityServer
     /// </summary>
     /// <typeparam name="T">The type of the concrete scope store class that is registered in DI.</typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddResourceStoreCache<T>(this IIdentityServerBuilder builder)
         where T : IResourceStore
     {
@@ -290,7 +275,6 @@ public static IIdentityServerBuilder AddResourceStoreCache<T>(this IIdentityServ
     /// Adds the identity provider store cache.
     /// </summary>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddIdentityProviderStoreCache<T>(this IIdentityServerBuilder builder)
         where T : IIdentityProviderStore
     {
@@ -308,7 +292,6 @@ public static IIdentityServerBuilder AddIdentityProviderStoreCache<T>(this IIden
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddAuthorizeInteractionResponseGenerator<T>(this IIdentityServerBuilder builder)
         where T : class, IAuthorizeInteractionResponseGenerator
     {
@@ -322,7 +305,6 @@ public static IIdentityServerBuilder AddAuthorizeInteractionResponseGenerator<T>
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddCustomAuthorizeRequestValidator<T>(this IIdentityServerBuilder builder)
         where T : class, ICustomAuthorizeRequestValidator
     {
@@ -336,7 +318,6 @@ public static IIdentityServerBuilder AddCustomAuthorizeRequestValidator<T>(this
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddCustomTokenRequestValidator<T>(this IIdentityServerBuilder builder)
         where T : class, ICustomTokenRequestValidator
     {
@@ -350,7 +331,6 @@ public static IIdentityServerBuilder AddCustomTokenRequestValidator<T>(this IIde
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddCustomBackchannelAuthenticationRequestValidator<T>(this IIdentityServerBuilder builder)
         where T : class, ICustomBackchannelAuthenticationValidator
     {
@@ -363,7 +343,6 @@ public static IIdentityServerBuilder AddCustomBackchannelAuthenticationRequestVa
     /// Adds support for client authentication using JWT bearer assertions.
     /// </summary>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddJwtBearerClientAuthentication(this IIdentityServerBuilder builder)
     {
         builder.AddSecretParser<JwtBearerClientAssertionSecretParser>();
@@ -377,7 +356,6 @@ public static IIdentityServerBuilder AddJwtBearerClientAuthentication(this IIden
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddClientConfigurationValidator<T>(this IIdentityServerBuilder builder)
         where T : class, IClientConfigurationValidator
     {
@@ -392,7 +370,6 @@ public static IIdentityServerBuilder AddClientConfigurationValidator<T>(this IId
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddIdentityProviderConfigurationValidator<T>(this IIdentityServerBuilder builder)
         where T : class, IIdentityProviderConfigurationValidator
     {
@@ -405,7 +382,6 @@ public static IIdentityServerBuilder AddIdentityProviderConfigurationValidator<T
     /// Adds the X509 secret validators for mutual TLS.
     /// </summary>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddMutualTlsSecretValidators(this IIdentityServerBuilder builder)
     {
         builder.AddSecretParser<MutualTlsSecretParser>();
@@ -420,7 +396,6 @@ public static IIdentityServerBuilder AddMutualTlsSecretValidators(this IIdentity
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddBackChannelLogoutService<T>(this IIdentityServerBuilder builder)
         where T : class, IBackChannelLogoutService
     {
@@ -434,7 +409,6 @@ public static IIdentityServerBuilder AddBackChannelLogoutService<T>(this IIdenti
     /// </summary>
     /// <param name="builder">The builder.</param>
     /// <param name="configureClient">The configuration callback.</param>
-    /// <returns></returns>
     public static IHttpClientBuilder AddBackChannelLogoutHttpClient(this IIdentityServerBuilder builder, Action<HttpClient>? configureClient = null)
     {
         const string name = IdentityServerConstants.HttpClients.BackChannelLogoutHttpClient;
@@ -469,7 +443,6 @@ public static IHttpClientBuilder AddBackChannelLogoutHttpClient(this IIdentitySe
     /// </summary>
     /// <param name="builder">The builder.</param>
     /// <param name="configureClient">The configuration callback.</param>
-    /// <returns></returns>
     public static IHttpClientBuilder AddJwtRequestUriHttpClient(this IIdentityServerBuilder builder, Action<HttpClient>? configureClient = null)
     {
         const string name = IdentityServerConstants.HttpClients.JwtRequestUriHttpClient;
@@ -505,7 +478,6 @@ public static IHttpClientBuilder AddJwtRequestUriHttpClient(this IIdentityServer
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     [Obsolete("This feature is deprecated. Consider using Pushed Authorization Requests instead.")]
     public static IIdentityServerBuilder AddAuthorizationParametersMessageStore<T>(this IIdentityServerBuilder builder)
         where T : class, IAuthorizationParametersMessageStore
@@ -520,7 +492,6 @@ public static IIdentityServerBuilder AddAuthorizationParametersMessageStore<T>(t
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddUserSession<T>(this IIdentityServerBuilder builder)
         where T : class, IUserSession
     {
@@ -537,7 +508,6 @@ public static IIdentityServerBuilder AddUserSession<T>(this IIdentityServerBuild
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddIdentityProviderStore<T>(this IIdentityServerBuilder builder)
         where T : class, IIdentityProviderStore
     {
@@ -554,7 +524,6 @@ public static IIdentityServerBuilder AddIdentityProviderStore<T>(this IIdentityS
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddBackchannelAuthenticationUserValidator<T>(this IIdentityServerBuilder builder)
         where T : class, IBackchannelAuthenticationUserValidator
     {
@@ -568,7 +537,6 @@ public static IIdentityServerBuilder AddBackchannelAuthenticationUserValidator<T
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddBackchannelAuthenticationUserNotificationService<T>(this IIdentityServerBuilder builder)
         where T : class, IBackchannelAuthenticationUserNotificationService
     {
@@ -581,7 +549,6 @@ public static IIdentityServerBuilder AddBackchannelAuthenticationUserNotificatio
     /// Adds the legacy clock based on the pre-.NET8 ISystemClock.
     /// </summary>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddLegacyClock(this IIdentityServerBuilder builder)
     {
         builder.Services.AddTransient<IClock, LegacyClock>();
diff --git a/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Core.cs b/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Core.cs
index e554d86be..81a194982 100644
--- a/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Core.cs
+++ b/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Core.cs
@@ -46,7 +46,6 @@ public static class IdentityServerBuilderExtensionsCore
     /// Adds the required platform services.
     /// </summary>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddRequiredPlatformServices(this IIdentityServerBuilder builder)
     {
         builder.Services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();
@@ -64,7 +63,6 @@ public static IIdentityServerBuilder AddRequiredPlatformServices(this IIdentityS
     /// Adds the default infrastructure for cookie authentication in IdentityServer.
     /// </summary>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddCookieAuthentication(this IIdentityServerBuilder builder)
     {
         return builder
@@ -76,7 +74,6 @@ public static IIdentityServerBuilder AddCookieAuthentication(this IIdentityServe
     /// Adds the default cookie handlers and corresponding configuration
     /// </summary>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddDefaultCookieHandlers(this IIdentityServerBuilder builder)
     {
         builder.Services.AddAuthentication(IdentityServerConstants.DefaultCookieAuthenticationScheme)
@@ -91,7 +88,6 @@ public static IIdentityServerBuilder AddDefaultCookieHandlers(this IIdentityServ
     /// Adds the necessary decorators for cookie authentication required by IdentityServer
     /// </summary>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddCookieAuthenticationExtensions(this IIdentityServerBuilder builder)
     {
         builder.Services.AddSingleton<IPostConfigureOptions<CookieAuthenticationOptions>, PostConfigureInternalCookieOptions>();
@@ -105,7 +101,6 @@ public static IIdentityServerBuilder AddCookieAuthenticationExtensions(this IIde
     /// Adds the default endpoints.
     /// </summary>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddDefaultEndpoints(this IIdentityServerBuilder builder)
     {
         builder.Services.AddTransient<IEndpointRouter, EndpointRouter>();
@@ -213,7 +208,6 @@ public static IIdentityServerBuilder AddCoreServices(this IIdentityServerBuilder
     /// Adds the pluggable services.
     /// </summary>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddPluggableServices(this IIdentityServerBuilder builder)
     {
         builder.Services.TryAddTransient<ICancellationTokenProvider, DefaultCancellationTokenProvider>();
@@ -273,7 +267,6 @@ public static IIdentityServerBuilder AddPluggableServices(this IIdentityServerBu
     /// Adds key management services.
     /// </summary>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddKeyManagement(this IIdentityServerBuilder builder)
     {
         builder.Services.TryAddTransient<IAutomaticKeyManagerKeyStore, AutomaticKeyManagerKeyStore>();
@@ -295,7 +288,6 @@ public static IIdentityServerBuilder AddKeyManagement(this IIdentityServerBuilde
     /// Adds the core services for dynamic external providers.
     /// </summary>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddDynamicProvidersCore(this IIdentityServerBuilder builder)
     {
         builder.Services.AddTransient(svcs => svcs.GetRequiredService<IdentityServerOptions>().DynamicProviders);
@@ -313,7 +305,6 @@ public static IIdentityServerBuilder AddDynamicProvidersCore(this IIdentityServe
     /// Adds the validators.
     /// </summary>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddValidators(this IIdentityServerBuilder builder)
     {
         // core
@@ -350,7 +341,6 @@ public static IIdentityServerBuilder AddValidators(this IIdentityServerBuilder b
     /// Adds the response generators.
     /// </summary>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddResponseGenerators(this IIdentityServerBuilder builder)
     {
         builder.Services.TryAddTransient<ITokenResponseGenerator, TokenResponseGenerator>();
@@ -371,7 +361,6 @@ public static IIdentityServerBuilder AddResponseGenerators(this IIdentityServerB
     /// Adds the default secret parsers.
     /// </summary>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddDefaultSecretParsers(this IIdentityServerBuilder builder)
     {
         builder.Services.AddTransient<ISecretParser, BasicAuthenticationSecretParser>();
@@ -384,7 +373,6 @@ public static IIdentityServerBuilder AddDefaultSecretParsers(this IIdentityServe
     /// Adds the default secret validators.
     /// </summary>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddDefaultSecretValidators(this IIdentityServerBuilder builder)
     {
         builder.Services.AddTransient<ISecretValidator, HashedSharedSecretValidator>();
diff --git a/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Crypto.cs b/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Crypto.cs
index 7499d12df..6d5d673b5 100644
--- a/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Crypto.cs
+++ b/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Crypto.cs
@@ -27,7 +27,6 @@ public static class IdentityServerBuilderExtensionsCrypto
     /// </summary>
     /// <param name="builder">The builder.</param>
     /// <param name="credential">The credential.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddSigningCredential(this IIdentityServerBuilder builder, SigningCredentials credential)
     {
         if (!(credential.Key is AsymmetricSecurityKey
@@ -71,7 +70,6 @@ public static IIdentityServerBuilder AddSigningCredential(this IIdentityServerBu
     /// <param name="builder">The builder.</param>
     /// <param name="certificate">The certificate.</param>
     /// <param name="signingAlgorithm">The signing algorithm (defaults to RS256)</param>
-    /// <returns></returns>
     /// <exception cref="ArgumentNullException"></exception>
     /// <exception cref="InvalidOperationException">X509 certificate does not have a private key.</exception>
     public static IIdentityServerBuilder AddSigningCredential(this IIdentityServerBuilder builder, X509Certificate2 certificate, string signingAlgorithm = SecurityAlgorithms.RsaSha256)
@@ -119,7 +117,6 @@ public static IIdentityServerBuilder AddSigningCredential(
     /// <param name="builder">The builder.</param>
     /// <param name="key">The key.</param>
     /// <param name="signingAlgorithm">The signing algorithm</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddSigningCredential(this IIdentityServerBuilder builder, SecurityKey key, string signingAlgorithm)
     {
         var credential = new SigningCredentials(key, signingAlgorithm);
@@ -132,7 +129,6 @@ public static IIdentityServerBuilder AddSigningCredential(this IIdentityServerBu
     /// <param name="builder">The builder.</param>
     /// <param name="key">The RSA key.</param>
     /// <param name="signingAlgorithm">The signing algorithm</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddSigningCredential(this IIdentityServerBuilder builder, RsaSecurityKey key, IdentityServerConstants.RsaSigningAlgorithm signingAlgorithm)
     {
         var credential = new SigningCredentials(key, CryptoHelper.GetRsaSigningAlgorithmValue(signingAlgorithm));
@@ -145,7 +141,6 @@ public static IIdentityServerBuilder AddSigningCredential(this IIdentityServerBu
     /// <param name="builder">The builder.</param>
     /// <param name="key">The ECDsa key.</param>
     /// <param name="signingAlgorithm">The signing algorithm</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddSigningCredential(this IIdentityServerBuilder builder, ECDsaSecurityKey key, IdentityServerConstants.ECDsaSigningAlgorithm signingAlgorithm)
     {
         var credential = new SigningCredentials(key, CryptoHelper.GetECDsaSigningAlgorithmValue(signingAlgorithm));
@@ -159,7 +154,6 @@ public static IIdentityServerBuilder AddSigningCredential(this IIdentityServerBu
     /// <param name="persistKey">Specifies if the temporary key should be persisted to disk.</param>
     /// <param name="filename">The filename.</param>
     /// <param name="signingAlgorithm">The signing algorithm (defaults to RS256)</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddDeveloperSigningCredential(
         this IIdentityServerBuilder builder,
         bool persistKey = true,
@@ -198,7 +192,6 @@ public static IIdentityServerBuilder AddDeveloperSigningCredential(
     /// </summary>
     /// <param name="builder">The builder.</param>
     /// <param name="keys">The keys.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddValidationKey(this IIdentityServerBuilder builder, params SecurityKeyInfo[] keys)
     {
         builder.Services.AddSingleton<IValidationKeysStore>(new InMemoryValidationKeysStore(keys));
@@ -212,7 +205,6 @@ public static IIdentityServerBuilder AddValidationKey(this IIdentityServerBuilde
     /// <param name="builder">The builder.</param>
     /// <param name="key">The RSA key</param>
     /// <param name="signingAlgorithm">The RSA-based signing algorithm</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddValidationKey(
         this IIdentityServerBuilder builder,
         RsaSecurityKey key,
@@ -233,7 +225,6 @@ public static IIdentityServerBuilder AddValidationKey(
     /// <param name="builder">The builder.</param>
     /// <param name="key">The ECDSA key</param>
     /// <param name="signingAlgorithm">The ECDSA-based signing algorithm</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddValidationKey(
         this IIdentityServerBuilder builder,
         ECDsaSecurityKey key,
@@ -254,7 +245,6 @@ public static IIdentityServerBuilder AddValidationKey(
     /// <param name="builder">The builder.</param>
     /// <param name="certificate">The certificate.</param>
     /// <param name="signingAlgorithm">The signing algorithm</param>
-    /// <returns></returns>
     /// <exception cref="ArgumentNullException"></exception>
     public static IIdentityServerBuilder AddValidationKey(
         this IIdentityServerBuilder builder,
diff --git a/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/InMemory.cs b/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/InMemory.cs
index 11436a207..b4a6799e5 100644
--- a/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/InMemory.cs
+++ b/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/InMemory.cs
@@ -24,7 +24,6 @@ public static class IdentityServerBuilderExtensionsInMemory
     /// Adds the in memory caching.
     /// </summary>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddInMemoryCaching(this IIdentityServerBuilder builder)
     {
         builder.Services.TryAddSingleton<IMemoryCache, MemoryCache>();
@@ -38,7 +37,6 @@ public static IIdentityServerBuilder AddInMemoryCaching(this IIdentityServerBuil
     /// </summary>
     /// <param name="builder">The builder.</param>
     /// <param name="identityResources">The identity resources.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddInMemoryIdentityResources(this IIdentityServerBuilder builder, IEnumerable<IdentityResource> identityResources)
     {
         builder.Services.AddSingleton(identityResources);
@@ -52,7 +50,6 @@ public static IIdentityServerBuilder AddInMemoryIdentityResources(this IIdentity
     /// </summary>
     /// <param name="builder">The builder.</param>
     /// <param name="section">The configuration section containing the configuration data.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddInMemoryIdentityResources(this IIdentityServerBuilder builder, IConfigurationSection section)
     {
         var resources = new List<IdentityResource>();
@@ -66,7 +63,6 @@ public static IIdentityServerBuilder AddInMemoryIdentityResources(this IIdentity
     /// </summary>
     /// <param name="builder">The builder.</param>
     /// <param name="apiResources">The API resources.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddInMemoryApiResources(this IIdentityServerBuilder builder, IEnumerable<ApiResource> apiResources)
     {
         builder.Services.AddSingleton(apiResources);
@@ -80,7 +76,6 @@ public static IIdentityServerBuilder AddInMemoryApiResources(this IIdentityServe
     /// </summary>
     /// <param name="builder">The builder.</param>
     /// <param name="section">The configuration section containing the configuration data.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddInMemoryApiResources(this IIdentityServerBuilder builder, IConfigurationSection section)
     {
         var resources = new List<ApiResource>();
@@ -94,7 +89,6 @@ public static IIdentityServerBuilder AddInMemoryApiResources(this IIdentityServe
     /// </summary>
     /// <param name="builder">The builder.</param>
     /// <param name="apiScopes">The API scopes.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddInMemoryApiScopes(this IIdentityServerBuilder builder, IEnumerable<ApiScope> apiScopes)
     {
         builder.Services.AddSingleton(apiScopes);
@@ -108,7 +102,6 @@ public static IIdentityServerBuilder AddInMemoryApiScopes(this IIdentityServerBu
     /// </summary>
     /// <param name="builder">The builder.</param>
     /// <param name="section">The configuration section containing the configuration data.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddInMemoryApiScopes(this IIdentityServerBuilder builder, IConfigurationSection section)
     {
         var resources = new List<ApiScope>();
@@ -134,7 +127,6 @@ public static IIdentityServerBuilder AddInMemoryClients(this IIdentityServerBuil
     /// </summary>
     /// <param name="builder">The builder.</param>
     /// <param name="clients">The clients.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddInMemoryClients(this IIdentityServerBuilder builder, IEnumerable<Client> clients)
     {
         builder.Services.AddSingleton(clients);
@@ -159,7 +151,6 @@ public static IIdentityServerBuilder AddInMemoryClients(this IIdentityServerBuil
     /// </summary>
     /// <param name="builder">The builder.</param>
     /// <param name="section">The configuration section containing the configuration data.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddInMemoryClients(this IIdentityServerBuilder builder, IConfigurationSection section)
     {
         var clients = new List<Client>();
@@ -173,7 +164,6 @@ public static IIdentityServerBuilder AddInMemoryClients(this IIdentityServerBuil
     /// Adds the in memory stores.
     /// </summary>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddInMemoryPersistedGrants(this IIdentityServerBuilder builder)
     {
         builder.Services.TryAddSingleton<IPersistedGrantStore, InMemoryPersistedGrantStore>();
@@ -186,7 +176,6 @@ public static IIdentityServerBuilder AddInMemoryPersistedGrants(this IIdentitySe
     /// Adds the in memory pushed authorization request store.
     /// </summary>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddInMemoryPushedAuthorizationRequests(this IIdentityServerBuilder builder) 
     {
         builder.Services.TryAddSingleton<IPushedAuthorizationRequestStore, InMemoryPushedAuthorizationRequestStore>();
diff --git a/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/SessionManagement.cs b/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/SessionManagement.cs
index 30e81114b..39bbed30d 100644
--- a/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/SessionManagement.cs
+++ b/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/SessionManagement.cs
@@ -22,7 +22,6 @@ public static class SessionManagementServiceCollectionExtensions
     /// <summary>
     /// Adds a server-side session store using the provided store type
     /// </summary>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddServerSideSessions<T>(this IIdentityServerBuilder builder)
         where T : class, IServerSideSessionStore
     {
@@ -35,7 +34,6 @@ public static IIdentityServerBuilder AddServerSideSessions<T>(this IIdentityServ
     /// <summary>
     /// Adds a server-side session store using the in-memory store
     /// </summary>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddServerSideSessions(this IIdentityServerBuilder builder)
     {
         builder.Services.AddSingleton<IServerSideSessionsMarker, NopIServerSideSessionsMarker>();
@@ -73,7 +71,6 @@ public static IIdentityServerBuilder AddServerSideSessions(this IIdentityServerB
     /// Adds a server-side session store using the supplied session store implementation
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddServerSideSessionStore<T>(this IIdentityServerBuilder builder)
         where T : class, IServerSideSessionStore
     {
diff --git a/src/IdentityServer/Configuration/DependencyInjection/IdentityServerServiceCollectionExtensions.cs b/src/IdentityServer/Configuration/DependencyInjection/IdentityServerServiceCollectionExtensions.cs
index bb77dafac..8efb7bfe3 100644
--- a/src/IdentityServer/Configuration/DependencyInjection/IdentityServerServiceCollectionExtensions.cs
+++ b/src/IdentityServer/Configuration/DependencyInjection/IdentityServerServiceCollectionExtensions.cs
@@ -21,7 +21,6 @@ public static class IdentityServerServiceCollectionExtensions
     /// Creates a builder.
     /// </summary>
     /// <param name="services">The services.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddIdentityServerBuilder(this IServiceCollection services)
     {
         return new IdentityServerBuilder(services);
@@ -31,7 +30,6 @@ public static IIdentityServerBuilder AddIdentityServerBuilder(this IServiceColle
     /// Adds IdentityServer.
     /// </summary>
     /// <param name="services">The services.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddIdentityServer(this IServiceCollection services)
     {
         var builder = services.AddIdentityServerBuilder();
@@ -62,7 +60,6 @@ public static IIdentityServerBuilder AddIdentityServer(this IServiceCollection s
     /// </summary>
     /// <param name="services">The services.</param>
     /// <param name="setupAction">The setup action.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddIdentityServer(this IServiceCollection services, Action<IdentityServerOptions> setupAction)
     {
         services.Configure(setupAction);
@@ -74,7 +71,6 @@ public static IIdentityServerBuilder AddIdentityServer(this IServiceCollection s
     /// </summary>
     /// <param name="services">The services.</param>
     /// <param name="configuration">The configuration.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddIdentityServer(this IServiceCollection services, IConfiguration configuration)
     {
         services.Configure<IdentityServerOptions>(configuration);
diff --git a/src/IdentityServer/Configuration/DependencyInjection/Options/DynamicProviderOptions.cs b/src/IdentityServer/Configuration/DependencyInjection/Options/DynamicProviderOptions.cs
index abe7e0720..506f02fbf 100644
--- a/src/IdentityServer/Configuration/DependencyInjection/Options/DynamicProviderOptions.cs
+++ b/src/IdentityServer/Configuration/DependencyInjection/Options/DynamicProviderOptions.cs
@@ -73,7 +73,6 @@ public void AddProviderType<THandler, TOptions, TIdentityProvider>(string type)
     /// Finds the DynamicProviderType registration by protocol type.
     /// </summary>
     /// <param name="type"></param>
-    /// <returns></returns>
     public DynamicProviderType? FindProviderType(string type)
     {
         return _providers.ContainsKey(type) ? _providers[type] : null;
diff --git a/src/IdentityServer/Configuration/IdentityServerApplicationBuilderExtensions.cs b/src/IdentityServer/Configuration/IdentityServerApplicationBuilderExtensions.cs
index 8ada54d8c..e3140a522 100644
--- a/src/IdentityServer/Configuration/IdentityServerApplicationBuilderExtensions.cs
+++ b/src/IdentityServer/Configuration/IdentityServerApplicationBuilderExtensions.cs
@@ -33,7 +33,6 @@ public static class IdentityServerApplicationBuilderExtensions
     /// </summary>
     /// <param name="app">The application.</param>
     /// <param name="options">The options.</param>
-    /// <returns></returns>
     public static IApplicationBuilder UseIdentityServer(this IApplicationBuilder app, IdentityServerMiddlewareOptions? options = null)
     {
         app.Validate();
diff --git a/src/IdentityServer/Endpoints/DeviceAuthorizationEndpoint.cs b/src/IdentityServer/Endpoints/DeviceAuthorizationEndpoint.cs
index f2df82545..b6a218d77 100644
--- a/src/IdentityServer/Endpoints/DeviceAuthorizationEndpoint.cs
+++ b/src/IdentityServer/Endpoints/DeviceAuthorizationEndpoint.cs
@@ -51,7 +51,6 @@ public DeviceAuthorizationEndpoint(
     /// Processes the request.
     /// </summary>
     /// <param name="context">The HTTP context.</param>
-    /// <returns></returns>
     /// <exception cref="System.NotImplementedException"></exception>
     public async Task<IEndpointResult> ProcessAsync(HttpContext context)
     {
diff --git a/src/IdentityServer/Endpoints/IntrospectionEndpoint.cs b/src/IdentityServer/Endpoints/IntrospectionEndpoint.cs
index f4d7124bc..c99e699c4 100644
--- a/src/IdentityServer/Endpoints/IntrospectionEndpoint.cs
+++ b/src/IdentityServer/Endpoints/IntrospectionEndpoint.cs
@@ -60,7 +60,6 @@ public IntrospectionEndpoint(
     /// Processes the request.
     /// </summary>
     /// <param name="context">The HTTP context.</param>
-    /// <returns></returns>
     public async Task<IEndpointResult> ProcessAsync(HttpContext context)
     {
         using var activity = Tracing.BasicActivitySource.StartActivity(IdentityServerConstants.EndpointNames.Introspection + "Endpoint");
diff --git a/src/IdentityServer/Endpoints/TokenEndpoint.cs b/src/IdentityServer/Endpoints/TokenEndpoint.cs
index e55fdac6b..429f2dd62 100644
--- a/src/IdentityServer/Endpoints/TokenEndpoint.cs
+++ b/src/IdentityServer/Endpoints/TokenEndpoint.cs
@@ -62,7 +62,6 @@ public TokenEndpoint(
     /// Processes the request.
     /// </summary>
     /// <param name="context">The HTTP context.</param>
-    /// <returns></returns>
     public async Task<IEndpointResult> ProcessAsync(HttpContext context)
     {
         using var activity = Tracing.BasicActivitySource.StartActivity(IdentityServerConstants.EndpointNames.Token + "Endpoint");
diff --git a/src/IdentityServer/Endpoints/TokenRevocationEndpoint.cs b/src/IdentityServer/Endpoints/TokenRevocationEndpoint.cs
index 01b255d5f..db4846287 100644
--- a/src/IdentityServer/Endpoints/TokenRevocationEndpoint.cs
+++ b/src/IdentityServer/Endpoints/TokenRevocationEndpoint.cs
@@ -56,7 +56,6 @@ public TokenRevocationEndpoint(ILogger<TokenRevocationEndpoint> logger,
     /// Processes the request.
     /// </summary>
     /// <param name="context">The HTTP context.</param>
-    /// <returns></returns>
     public async Task<IEndpointResult> ProcessAsync(HttpContext context)
     {
         using var activity = Tracing.BasicActivitySource.StartActivity(IdentityServerConstants.EndpointNames.Revocation + "Endpoint");
diff --git a/src/IdentityServer/Endpoints/UserInfoEndpoint.cs b/src/IdentityServer/Endpoints/UserInfoEndpoint.cs
index 81cf110f5..85004b817 100644
--- a/src/IdentityServer/Endpoints/UserInfoEndpoint.cs
+++ b/src/IdentityServer/Endpoints/UserInfoEndpoint.cs
@@ -48,7 +48,6 @@ public UserInfoEndpoint(
     /// Processes the request.
     /// </summary>
     /// <param name="context">The HTTP context.</param>
-    /// <returns></returns>
     public async Task<IEndpointResult> ProcessAsync(HttpContext context)
     {
         using var activity = Tracing.BasicActivitySource.StartActivity(IdentityServerConstants.EndpointNames.UserInfo + "Endpoint");
diff --git a/src/IdentityServer/Events/Infrastructure/Event.cs b/src/IdentityServer/Events/Infrastructure/Event.cs
index 5a44448f4..7b0488459 100644
--- a/src/IdentityServer/Events/Infrastructure/Event.cs
+++ b/src/IdentityServer/Events/Infrastructure/Event.cs
@@ -38,7 +38,6 @@ protected Event(string category, string name, EventTypes type, int id, string? m
     /// <summary>
     /// Allows implementing custom initialization logic.
     /// </summary>
-    /// <returns></returns>
     protected internal virtual Task PrepareAsync()
     {
         return Task.CompletedTask;
@@ -129,7 +128,6 @@ protected internal virtual Task PrepareAsync()
     /// Obfuscates a token.
     /// </summary>
     /// <param name="value">The token.</param>
-    /// <returns></returns>
     protected static string Obfuscate(string value)
     {
         var last4Chars = "****";
diff --git a/src/IdentityServer/Extensions/AuthenticationPropertiesExtensions.cs b/src/IdentityServer/Extensions/AuthenticationPropertiesExtensions.cs
index 510012508..83f1e5e16 100644
--- a/src/IdentityServer/Extensions/AuthenticationPropertiesExtensions.cs
+++ b/src/IdentityServer/Extensions/AuthenticationPropertiesExtensions.cs
@@ -23,7 +23,6 @@ public static class AuthenticationPropertiesExtensions
     /// Gets the user's session identifier.
     /// </summary>
     /// <param name="properties"></param>
-    /// <returns></returns>
     public static string GetSessionId(this AuthenticationProperties properties)
     {
         if (properties?.Items.ContainsKey(SessionIdKey) == true)
@@ -39,7 +38,6 @@ public static string GetSessionId(this AuthenticationProperties properties)
     /// </summary>
     /// <param name="properties"></param>
     /// <param name="sid">The session id</param>
-    /// <returns></returns>
     public static void SetSessionId(this AuthenticationProperties properties, string sid)
     {
         properties.Items[SessionIdKey] = sid;
@@ -49,7 +47,6 @@ public static void SetSessionId(this AuthenticationProperties properties, string
     /// Gets the list of client ids the user has signed into during their session.
     /// </summary>
     /// <param name="properties"></param>
-    /// <returns></returns>
     public static IEnumerable<string> GetClientList(this AuthenticationProperties properties)
     {
         if (properties?.Items.ContainsKey(ClientListKey) == true)
diff --git a/src/IdentityServer/Extensions/ClientExtensions.cs b/src/IdentityServer/Extensions/ClientExtensions.cs
index ab9b3b476..d1b1581f1 100644
--- a/src/IdentityServer/Extensions/ClientExtensions.cs
+++ b/src/IdentityServer/Extensions/ClientExtensions.cs
@@ -31,7 +31,6 @@ public static bool IsImplicitOnly(this Client client)
     /// Constructs a list of SecurityKey from a Secret collection
     /// </summary>
     /// <param name="secrets">The secrets</param>
-    /// <returns></returns>
     public static Task<List<SecurityKey>> GetKeysAsync(this IEnumerable<Secret> secrets)
     {
         var secretList = secrets.ToList().AsReadOnly();
diff --git a/src/IdentityServer/Extensions/HttpContextAuthenticationExtensions.cs b/src/IdentityServer/Extensions/HttpContextAuthenticationExtensions.cs
index 0533c4f74..e7cdade80 100644
--- a/src/IdentityServer/Extensions/HttpContextAuthenticationExtensions.cs
+++ b/src/IdentityServer/Extensions/HttpContextAuthenticationExtensions.cs
@@ -21,7 +21,6 @@ public static class AuthenticationManagerExtensions
     /// </summary>
     /// <param name="context">The manager.</param>
     /// <param name="user">The IdentityServer user.</param>
-    /// <returns></returns>
     public static async Task SignInAsync(this HttpContext context, IdentityServerUser user)
     {
         await context.SignInAsync(await context.GetCookieAuthenticationSchemeAsync(), user.CreatePrincipal());
@@ -33,7 +32,6 @@ public static async Task SignInAsync(this HttpContext context, IdentityServerUse
     /// <param name="context">The manager.</param>
     /// <param name="user">The IdentityServer user.</param>
     /// <param name="properties">The authentication properties.</param>
-    /// <returns></returns>
     public static async Task SignInAsync(this HttpContext context, IdentityServerUser user, AuthenticationProperties properties)
     {
         await context.SignInAsync(await context.GetCookieAuthenticationSchemeAsync(), user.CreatePrincipal(), properties);
diff --git a/src/IdentityServer/Extensions/IClientStoreExtensions.cs b/src/IdentityServer/Extensions/IClientStoreExtensions.cs
index 7630f5934..5cac6d875 100644
--- a/src/IdentityServer/Extensions/IClientStoreExtensions.cs
+++ b/src/IdentityServer/Extensions/IClientStoreExtensions.cs
@@ -17,7 +17,6 @@ public static class IClientStoreExtensions
     /// </summary>
     /// <param name="store">The store.</param>
     /// <param name="clientId">The client identifier.</param>
-    /// <returns></returns>
     public static async Task<Client> FindEnabledClientByIdAsync(this IClientStore store, string clientId)
     {
         var client = await store.FindClientByIdAsync(clientId);
diff --git a/src/IdentityServer/Extensions/IResourceStoreExtensions.cs b/src/IdentityServer/Extensions/IResourceStoreExtensions.cs
index 7fadc6690..5e3a69efb 100644
--- a/src/IdentityServer/Extensions/IResourceStoreExtensions.cs
+++ b/src/IdentityServer/Extensions/IResourceStoreExtensions.cs
@@ -20,7 +20,6 @@ public static class IResourceStoreExtensions
     /// </summary>
     /// <param name="store">The store.</param>
     /// <param name="scopeNames">The scope names.</param>
-    /// <returns></returns>
     public static async Task<Resources> FindResourcesByScopeAsync(this IResourceStore store, IEnumerable<string> scopeNames)
     {
         var identity = await store.FindIdentityResourcesByScopeNameAsync(scopeNames);
@@ -92,7 +91,6 @@ private static IEnumerable<string> GetDuplicates(IEnumerable<string> names)
     /// </summary>
     /// <param name="store">The store.</param>
     /// <param name="scopeNames">The scope names.</param>
-    /// <returns></returns>
     public static async Task<Resources> FindEnabledResourcesByScopeAsync(this IResourceStore store, IEnumerable<string> scopeNames)
     {
         return (await store.FindResourcesByScopeAsync(scopeNames)).FilterEnabled();
@@ -102,7 +100,6 @@ public static async Task<Resources> FindEnabledResourcesByScopeAsync(this IResou
     /// Gets all enabled resources.
     /// </summary>
     /// <param name="store">The store.</param>
-    /// <returns></returns>
     public static async Task<Resources> GetAllEnabledResourcesAsync(this IResourceStore store)
     {
         var resources = await store.GetAllResourcesAsync();
@@ -116,7 +113,6 @@ public static async Task<Resources> GetAllEnabledResourcesAsync(this IResourceSt
     /// </summary>
     /// <param name="store">The store.</param>
     /// <param name="scopeNames">The scope names.</param>
-    /// <returns></returns>
     public static async Task<IEnumerable<IdentityResource>> FindEnabledIdentityResourcesByScopeAsync(this IResourceStore store, IEnumerable<string> scopeNames)
     {
         return (await store.FindIdentityResourcesByScopeNameAsync(scopeNames)).Where(x => x.Enabled).ToArray();
diff --git a/src/IdentityServer/Extensions/PrincipalExtensions.cs b/src/IdentityServer/Extensions/PrincipalExtensions.cs
index 634a9ee5d..43116102f 100644
--- a/src/IdentityServer/Extensions/PrincipalExtensions.cs
+++ b/src/IdentityServer/Extensions/PrincipalExtensions.cs
@@ -20,7 +20,6 @@ public static class PrincipalExtensions
     /// Gets the authentication time.
     /// </summary>
     /// <param name="principal">The principal.</param>
-    /// <returns></returns>
     [DebuggerStepThrough]
     public static DateTime GetAuthenticationTime(this IPrincipal principal)
     {
@@ -31,7 +30,6 @@ public static DateTime GetAuthenticationTime(this IPrincipal principal)
     /// Gets the authentication epoch time.
     /// </summary>
     /// <param name="principal">The principal.</param>
-    /// <returns></returns>
     [DebuggerStepThrough]
     public static long GetAuthenticationTimeEpoch(this IPrincipal principal)
     {
@@ -42,7 +40,6 @@ public static long GetAuthenticationTimeEpoch(this IPrincipal principal)
     /// Gets the authentication epoch time.
     /// </summary>
     /// <param name="identity">The identity.</param>
-    /// <returns></returns>
     [DebuggerStepThrough]
     public static long GetAuthenticationTimeEpoch(this IIdentity identity)
     {
@@ -58,7 +55,6 @@ public static long GetAuthenticationTimeEpoch(this IIdentity identity)
     /// Gets the subject identifier.
     /// </summary>
     /// <param name="principal">The principal.</param>
-    /// <returns></returns>
     [DebuggerStepThrough]
     public static string GetSubjectId(this IPrincipal principal)
     {
@@ -69,7 +65,6 @@ public static string GetSubjectId(this IPrincipal principal)
     /// Gets the subject identifier.
     /// </summary>
     /// <param name="identity">The identity.</param>
-    /// <returns></returns>
     /// <exception cref="System.InvalidOperationException">sub claim is missing</exception>
     [DebuggerStepThrough]
     public static string GetSubjectId(this IIdentity identity)
@@ -85,7 +80,6 @@ public static string GetSubjectId(this IIdentity identity)
     /// Gets the name.
     /// </summary>
     /// <param name="principal">The principal.</param>
-    /// <returns></returns>
     [DebuggerStepThrough]
     public static string GetDisplayName(this ClaimsPrincipal principal)
     {
@@ -102,7 +96,6 @@ public static string GetDisplayName(this ClaimsPrincipal principal)
     /// Gets the authentication method.
     /// </summary>
     /// <param name="principal">The principal.</param>
-    /// <returns></returns>
     [DebuggerStepThrough]
     public static string GetAuthenticationMethod(this IPrincipal principal)
     {
@@ -113,7 +106,6 @@ public static string GetAuthenticationMethod(this IPrincipal principal)
     /// Gets the authentication method claims.
     /// </summary>
     /// <param name="principal">The principal.</param>
-    /// <returns></returns>
     [DebuggerStepThrough]
     public static IEnumerable<Claim> GetAuthenticationMethods(this IPrincipal principal)
     {
@@ -124,7 +116,6 @@ public static IEnumerable<Claim> GetAuthenticationMethods(this IPrincipal princi
     /// Gets the authentication method.
     /// </summary>
     /// <param name="identity">The identity.</param>
-    /// <returns></returns>
     /// <exception cref="System.InvalidOperationException">amr claim is missing</exception>
     [DebuggerStepThrough]
     public static string GetAuthenticationMethod(this IIdentity identity)
@@ -140,7 +131,6 @@ public static string GetAuthenticationMethod(this IIdentity identity)
     /// Gets the authentication method claims.
     /// </summary>
     /// <param name="identity">The identity.</param>
-    /// <returns></returns>
     [DebuggerStepThrough]
     public static IEnumerable<Claim> GetAuthenticationMethods(this IIdentity identity)
     {
@@ -152,7 +142,6 @@ public static IEnumerable<Claim> GetAuthenticationMethods(this IIdentity identit
     /// Gets the identity provider.
     /// </summary>
     /// <param name="principal">The principal.</param>
-    /// <returns></returns>
     [DebuggerStepThrough]
     public static string GetIdentityProvider(this IPrincipal principal)
     {
@@ -163,7 +152,6 @@ public static string GetIdentityProvider(this IPrincipal principal)
     /// Gets the identity provider.
     /// </summary>
     /// <param name="identity">The identity.</param>
-    /// <returns></returns>
     /// <exception cref="System.InvalidOperationException">idp claim is missing</exception>
     [DebuggerStepThrough]
     public static string GetIdentityProvider(this IIdentity identity)
@@ -179,7 +167,6 @@ public static string GetIdentityProvider(this IIdentity identity)
     /// Gets the tenant.
     /// </summary>
     /// <param name="principal">The principal.</param>
-    /// <returns></returns>
     [DebuggerStepThrough]
     public static string GetTenant(this ClaimsPrincipal principal)
     {
diff --git a/src/IdentityServer/Extensions/ProfileDataRequestContextExtensions.cs b/src/IdentityServer/Extensions/ProfileDataRequestContextExtensions.cs
index 33a817f2a..f08c948b9 100644
--- a/src/IdentityServer/Extensions/ProfileDataRequestContextExtensions.cs
+++ b/src/IdentityServer/Extensions/ProfileDataRequestContextExtensions.cs
@@ -21,7 +21,6 @@ public static class ProfileDataRequestContextExtensions
     /// </summary>
     /// <param name="context">The context.</param>
     /// <param name="claims">The claims.</param>
-    /// <returns></returns>
     public static List<Claim> FilterClaims(this ProfileDataRequestContext context, IEnumerable<Claim> claims)
     {
         if (context == null) throw new ArgumentNullException(nameof(context));
diff --git a/src/IdentityServer/Extensions/ResourceExtensions.cs b/src/IdentityServer/Extensions/ResourceExtensions.cs
index e3c3c4c73..2e0a9176d 100644
--- a/src/IdentityServer/Extensions/ResourceExtensions.cs
+++ b/src/IdentityServer/Extensions/ResourceExtensions.cs
@@ -20,7 +20,6 @@ public static class ResourceExtensions
     /// Returns the collection of scope values that are required.
     /// </summary>
     /// <param name="resourceValidationResult"></param>
-    /// <returns></returns>
     public static IEnumerable<string> GetRequiredScopeValues(this ResourceValidationResult resourceValidationResult)
     {
         var names = resourceValidationResult.Resources.IdentityResources.Where(x => x.Required).Select(x => x.Name).ToList();
@@ -34,7 +33,6 @@ public static IEnumerable<string> GetRequiredScopeValues(this ResourceValidation
     /// Converts to scope names.
     /// </summary>
     /// <param name="resources">The resources.</param>
-    /// <returns></returns>
     public static IEnumerable<string> ToScopeNames(this Resources resources)
     {
         var names = resources.IdentityResources.Select(x => x.Name).ToList();
@@ -52,7 +50,6 @@ public static IEnumerable<string> ToScopeNames(this Resources resources)
     /// </summary>
     /// <param name="resources">The resources.</param>
     /// <param name="name">The name.</param>
-    /// <returns></returns>
     public static IdentityResource FindIdentityResourcesByScope(this Resources resources, string name)
     {
         var q = from id in resources.IdentityResources
@@ -66,7 +63,6 @@ public static IdentityResource FindIdentityResourcesByScope(this Resources resou
     /// </summary>
     /// <param name="resources">The resources.</param>
     /// <param name="name">The name.</param>
-    /// <returns></returns>
     public static IEnumerable<ApiResource> FindApiResourcesByScope(this Resources resources, string name)
     {
         var q = from api in resources.ApiResources
@@ -80,7 +76,6 @@ public static IEnumerable<ApiResource> FindApiResourcesByScope(this Resources re
     /// </summary>
     /// <param name="resources">The resources.</param>
     /// <param name="name">The name.</param>
-    /// <returns></returns>
     public static ApiScope FindApiScope(this Resources resources, string name)
     {
         var q = from scope in resources.ApiScopes
diff --git a/src/IdentityServer/Extensions/TokenExtensions.cs b/src/IdentityServer/Extensions/TokenExtensions.cs
index 4f100fb63..7a8bf7974 100644
--- a/src/IdentityServer/Extensions/TokenExtensions.cs
+++ b/src/IdentityServer/Extensions/TokenExtensions.cs
@@ -27,7 +27,6 @@ public static class TokenExtensions
     /// <param name="options"></param>
     /// <param name="clock"></param>
     /// <param name="logger"></param>
-    /// <returns></returns>
     public static Dictionary<string, object> CreateJwtPayloadDictionary(this Token token,
         IdentityServerOptions options, IClock clock, ILogger logger)
     {
diff --git a/src/IdentityServer/Extensions/X509CertificateExtensions.cs b/src/IdentityServer/Extensions/X509CertificateExtensions.cs
index de4255849..c3d3989f9 100644
--- a/src/IdentityServer/Extensions/X509CertificateExtensions.cs
+++ b/src/IdentityServer/Extensions/X509CertificateExtensions.cs
@@ -19,7 +19,6 @@ public static class X509CertificateExtensions
     /// Create the value of a thumbprint-based cnf claim
     /// </summary>
     /// <param name="certificate"></param>
-    /// <returns></returns>
     public static string CreateThumbprintCnf(this X509Certificate2 certificate)
     {
         var hash = certificate.GetSha256Thumbprint();
@@ -35,7 +34,6 @@ public static string CreateThumbprintCnf(this X509Certificate2 certificate)
     /// <summary>
     /// Returns the SHA256 thumbprint of the certificate as a base64url encoded string
     /// </summary>
-    /// <returns></returns>
     public static string GetSha256Thumbprint(this X509Certificate2 certificate)
     {
         return Base64Url.Encode(certificate.GetCertHash(HashAlgorithmName.SHA256));
diff --git a/src/IdentityServer/Hosting/DynamicProviders/DynamicSchemes/DynamicAuthenticationSchemeCache.cs b/src/IdentityServer/Hosting/DynamicProviders/DynamicSchemes/DynamicAuthenticationSchemeCache.cs
index 7623d9961..a7e15abe4 100644
--- a/src/IdentityServer/Hosting/DynamicProviders/DynamicSchemes/DynamicAuthenticationSchemeCache.cs
+++ b/src/IdentityServer/Hosting/DynamicProviders/DynamicSchemes/DynamicAuthenticationSchemeCache.cs
@@ -43,7 +43,6 @@ public DynamicAuthenticationScheme Get(string name)
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="name"></param>
-    /// <returns></returns>
     public T GetIdentityProvider<T>(string name)
         where T : IdentityProvider
     {
diff --git a/src/IdentityServer/Hosting/DynamicProviders/DynamicSchemes/IdentityServerBuilderDynamicSchemesExtensions.cs b/src/IdentityServer/Hosting/DynamicProviders/DynamicSchemes/IdentityServerBuilderDynamicSchemesExtensions.cs
index 24af2d5d5..00b5c256e 100644
--- a/src/IdentityServer/Hosting/DynamicProviders/DynamicSchemes/IdentityServerBuilderDynamicSchemesExtensions.cs
+++ b/src/IdentityServer/Hosting/DynamicProviders/DynamicSchemes/IdentityServerBuilderDynamicSchemesExtensions.cs
@@ -19,7 +19,6 @@ public static class IdentityServerBuilderDynamicSchemesExtensions
     /// </summary>
     /// <param name="builder">The builder.</param>
     /// <param name="providers"></param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddInMemoryIdentityProviders(
         this IIdentityServerBuilder builder, IEnumerable<IdentityProvider> providers)
     {
diff --git a/src/IdentityServer/Hosting/DynamicProviders/Oidc/IdentityServerBuilderOidcExtensions.cs b/src/IdentityServer/Hosting/DynamicProviders/Oidc/IdentityServerBuilderOidcExtensions.cs
index 07473954d..66c086521 100644
--- a/src/IdentityServer/Hosting/DynamicProviders/Oidc/IdentityServerBuilderOidcExtensions.cs
+++ b/src/IdentityServer/Hosting/DynamicProviders/Oidc/IdentityServerBuilderOidcExtensions.cs
@@ -23,7 +23,6 @@ public static class IdentityServerBuilderOidcExtensions
     /// Adds the OIDC dynamic provider feature.
     /// </summary>
     /// <param name="builder"></param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddOidcDynamicProvider(this IIdentityServerBuilder builder)
     {
         builder.Services.Configure<IdentityServerOptions>(options =>
@@ -49,7 +48,6 @@ public static IIdentityServerBuilder AddOidcDynamicProvider(this IIdentityServer
     /// </summary>
     /// <param name="builder">The builder.</param>
     /// <param name="providers"></param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddInMemoryOidcProviders(this IIdentityServerBuilder builder, IEnumerable<OidcProvider> providers)
     {
         return builder.AddInMemoryIdentityProviders(providers);
diff --git a/src/IdentityServer/Hosting/IEndpointHandler.cs b/src/IdentityServer/Hosting/IEndpointHandler.cs
index 7a6fa02ae..183e8afda 100644
--- a/src/IdentityServer/Hosting/IEndpointHandler.cs
+++ b/src/IdentityServer/Hosting/IEndpointHandler.cs
@@ -18,6 +18,5 @@ public interface IEndpointHandler
     /// Processes the request.
     /// </summary>
     /// <param name="context">The HTTP context.</param>
-    /// <returns></returns>
     Task<IEndpointResult?> ProcessAsync(HttpContext context);
 }
diff --git a/src/IdentityServer/Hosting/IdentityServerMiddleware.cs b/src/IdentityServer/Hosting/IdentityServerMiddleware.cs
index 120f2b9a4..d3ba3d589 100644
--- a/src/IdentityServer/Hosting/IdentityServerMiddleware.cs
+++ b/src/IdentityServer/Hosting/IdentityServerMiddleware.cs
@@ -46,7 +46,6 @@ public IdentityServerMiddleware(RequestDelegate next, ILogger<IdentityServerMidd
     /// <param name="events">The event service.</param>
     /// <param name="issuerNameService">The issuer name service</param>
     /// <param name="sessionCoordinationService"></param>
-    /// <returns></returns>
     public async Task Invoke(
         HttpContext context, 
         IdentityServerOptions options,
diff --git a/src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationExtensions.cs b/src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationExtensions.cs
index 7b93744d3..734e8a16b 100644
--- a/src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationExtensions.cs
+++ b/src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationExtensions.cs
@@ -23,7 +23,6 @@ public static class LocalApiAuthenticationExtensions
     /// </summary>
     /// <param name="services">The service collection</param>
     /// <param name="transformationFunc">Function to transform the resulting principal</param>
-    /// <returns></returns>
     public static IServiceCollection AddLocalApiAuthentication(this IServiceCollection services, Func<ClaimsPrincipal, Task<ClaimsPrincipal>>? transformationFunc = null)
     {
         services.AddAuthentication()
@@ -59,7 +58,6 @@ public static IServiceCollection AddLocalApiAuthentication(this IServiceCollecti
     /// Registers the authentication handler for local APIs.
     /// </summary>
     /// <param name="builder">The builder.</param>
-    /// <returns></returns>
     public static AuthenticationBuilder AddLocalApi(this AuthenticationBuilder builder)
         => builder.AddLocalApi(IdentityServerConstants.LocalApi.AuthenticationScheme, _ => { });
 
@@ -68,7 +66,6 @@ public static AuthenticationBuilder AddLocalApi(this AuthenticationBuilder build
     /// </summary>
     /// <param name="builder">The builder.</param>
     /// <param name="configureOptions">The configure options.</param>
-    /// <returns></returns>
     public static AuthenticationBuilder AddLocalApi(this AuthenticationBuilder builder, Action<LocalApiAuthenticationOptions> configureOptions)
         => builder.AddLocalApi(IdentityServerConstants.LocalApi.AuthenticationScheme, configureOptions);
 
@@ -78,7 +75,6 @@ public static AuthenticationBuilder AddLocalApi(this AuthenticationBuilder build
     /// <param name="builder">The builder.</param>
     /// <param name="authenticationScheme">The authentication scheme.</param>
     /// <param name="configureOptions">The configure options.</param>
-    /// <returns></returns>
     public static AuthenticationBuilder AddLocalApi(this AuthenticationBuilder builder, string authenticationScheme, Action<LocalApiAuthenticationOptions> configureOptions)
         => builder.AddLocalApi(authenticationScheme, displayName: null, configureOptions: configureOptions);
 
@@ -89,7 +85,6 @@ public static AuthenticationBuilder AddLocalApi(this AuthenticationBuilder build
     /// <param name="authenticationScheme">The authentication scheme.</param>
     /// <param name="displayName">The display name of this scheme.</param>
     /// <param name="configureOptions">The configure options.</param>
-    /// <returns></returns>
     public static AuthenticationBuilder AddLocalApi(this AuthenticationBuilder builder, string authenticationScheme, string? displayName, Action<LocalApiAuthenticationOptions> configureOptions)
     {
         return builder.AddScheme<LocalApiAuthenticationOptions, LocalApiAuthenticationHandler>(authenticationScheme, displayName, configureOptions);
diff --git a/src/IdentityServer/IdentityServerUser.cs b/src/IdentityServer/IdentityServerUser.cs
index 8fb9acdb3..33d15f006 100644
--- a/src/IdentityServer/IdentityServerUser.cs
+++ b/src/IdentityServer/IdentityServerUser.cs
@@ -67,7 +67,6 @@ public IdentityServerUser(string subjectId)
     /// <summary>
     /// Creates an IdentityServer claims principal
     /// </summary>
-    /// <returns></returns>
     /// <exception cref="ArgumentNullException"></exception>
     public ClaimsPrincipal CreatePrincipal()
     {
diff --git a/src/IdentityServer/Infrastructure/ConcurrencyLock/IConcurrencyLock.cs b/src/IdentityServer/Infrastructure/ConcurrencyLock/IConcurrencyLock.cs
index 7f31b3ee6..f113d9180 100644
--- a/src/IdentityServer/Infrastructure/ConcurrencyLock/IConcurrencyLock.cs
+++ b/src/IdentityServer/Infrastructure/ConcurrencyLock/IConcurrencyLock.cs
@@ -14,12 +14,10 @@ public interface IConcurrencyLock<T>
     /// <summary>
     /// Locks. Returns false if lock was not obtained within in the timeout.
     /// </summary>
-    /// <returns></returns>
     Task<bool> LockAsync(int millisecondsTimeout);
 
     /// <summary>
     /// Unlocks
     /// </summary>
-    /// <returns></returns>
     void Unlock();
 }
\ No newline at end of file
diff --git a/src/IdentityServer/Infrastructure/DistributedCacheStateDataFormatter.cs b/src/IdentityServer/Infrastructure/DistributedCacheStateDataFormatter.cs
index e144830e8..92db74012 100644
--- a/src/IdentityServer/Infrastructure/DistributedCacheStateDataFormatter.cs
+++ b/src/IdentityServer/Infrastructure/DistributedCacheStateDataFormatter.cs
@@ -38,7 +38,6 @@ public DistributedCacheStateDataFormatter(IServiceProvider provider, string name
     /// Protects the specified data.
     /// </summary>
     /// <param name="data">The data.</param>
-    /// <returns></returns>
     public string Protect(AuthenticationProperties data)
     {
         return Protect(data, null);
@@ -49,7 +48,6 @@ public string Protect(AuthenticationProperties data)
     /// </summary>
     /// <param name="data">The data.</param>
     /// <param name="purpose">The purpose.</param>
-    /// <returns></returns>
     public string Protect(AuthenticationProperties data, string purpose)
     {
         var key = Guid.NewGuid().ToString();
@@ -77,7 +75,6 @@ public string Protect(AuthenticationProperties data, string purpose)
     /// Unprotects the specified protected text.
     /// </summary>
     /// <param name="protectedText">The protected text.</param>
-    /// <returns></returns>
     public AuthenticationProperties Unprotect(string protectedText)
     {
         return Unprotect(protectedText, null);
@@ -88,7 +85,6 @@ public AuthenticationProperties Unprotect(string protectedText)
     /// </summary>
     /// <param name="protectedText">The protected text.</param>
     /// <param name="purpose">The purpose.</param>
-    /// <returns></returns>
     public AuthenticationProperties Unprotect(string protectedText, string purpose)
     {
         if (String.IsNullOrWhiteSpace(protectedText))
diff --git a/src/IdentityServer/Logging/LogSerializer.cs b/src/IdentityServer/Logging/LogSerializer.cs
index 434ec6c18..5657c8d87 100644
--- a/src/IdentityServer/Logging/LogSerializer.cs
+++ b/src/IdentityServer/Logging/LogSerializer.cs
@@ -27,7 +27,6 @@ static LogSerializer()
     /// Serializes the specified object.
     /// </summary>
     /// <param name="logObject">The object.</param>
-    /// <returns></returns>
     public static string Serialize(object logObject)
     {
         return JsonSerializer.Serialize(logObject, Options);
diff --git a/src/IdentityServer/Models/DeviceFlowInteractionResult.cs b/src/IdentityServer/Models/DeviceFlowInteractionResult.cs
index 946569777..4f028c726 100644
--- a/src/IdentityServer/Models/DeviceFlowInteractionResult.cs
+++ b/src/IdentityServer/Models/DeviceFlowInteractionResult.cs
@@ -39,7 +39,6 @@ public class DeviceFlowInteractionResult
     /// Create failure result
     /// </summary>
     /// <param name="errorDescription">The error description.</param>
-    /// <returns></returns>
     public static DeviceFlowInteractionResult Failure(string? errorDescription = null)
     {
         return new DeviceFlowInteractionResult
diff --git a/src/IdentityServer/ResponseHandling/Default/AuthorizeInteractionResponseGenerator.cs b/src/IdentityServer/ResponseHandling/Default/AuthorizeInteractionResponseGenerator.cs
index de5596884..875a36694 100644
--- a/src/IdentityServer/ResponseHandling/Default/AuthorizeInteractionResponseGenerator.cs
+++ b/src/IdentityServer/ResponseHandling/Default/AuthorizeInteractionResponseGenerator.cs
@@ -73,7 +73,6 @@ public AuthorizeInteractionResponseGenerator(
     /// </summary>
     /// <param name="request">The request.</param>
     /// <param name="consent">The consent.</param>
-    /// <returns></returns>
     public virtual async Task<InteractionResponse> ProcessInteractionAsync(ValidatedAuthorizeRequest request, ConsentResponse consent = null)
     {
         using var activity = Tracing.BasicActivitySource.StartActivity("AuthorizeInteractionResponseGenerator.ProcessInteraction");
@@ -137,7 +136,6 @@ public virtual async Task<InteractionResponse> ProcessInteractionAsync(Validated
     /// Processes the create account logic.
     /// </summary>
     /// <param name="request">The request.</param>
-    /// <returns></returns>
     protected internal virtual Task<InteractionResponse> ProcessCreateAccountAsync(ValidatedAuthorizeRequest request)
     {
         InteractionResponse result;
@@ -164,7 +162,6 @@ protected internal virtual Task<InteractionResponse> ProcessCreateAccountAsync(V
     /// Processes the login logic.
     /// </summary>
     /// <param name="request">The request.</param>
-    /// <returns></returns>
     protected internal virtual async Task<InteractionResponse> ProcessLoginAsync(ValidatedAuthorizeRequest request)
     {
         using var activity = Tracing.BasicActivitySource.StartActivity("AuthorizeInteractionResponseGenerator.ProcessLogin");
@@ -308,7 +305,6 @@ protected internal virtual async Task<InteractionResponse> ProcessLoginAsync(Val
     /// </summary>
     /// <param name="request">The request.</param>
     /// <param name="consent">The consent.</param>
-    /// <returns></returns>
     /// <exception cref="ArgumentNullException"></exception>
     /// <exception cref="ArgumentException">Invalid PromptMode</exception>
     protected internal virtual async Task<InteractionResponse> ProcessConsentAsync(ValidatedAuthorizeRequest request, ConsentResponse consent = null)
diff --git a/src/IdentityServer/ResponseHandling/Default/AuthorizeResponseGenerator.cs b/src/IdentityServer/ResponseHandling/Default/AuthorizeResponseGenerator.cs
index 29f899518..0b2fc07ea 100644
--- a/src/IdentityServer/ResponseHandling/Default/AuthorizeResponseGenerator.cs
+++ b/src/IdentityServer/ResponseHandling/Default/AuthorizeResponseGenerator.cs
@@ -89,7 +89,6 @@ public AuthorizeResponseGenerator(
     /// Creates the response
     /// </summary>
     /// <param name="request">The request.</param>
-    /// <returns></returns>
     /// <exception cref="System.InvalidOperationException">invalid grant type: " + request.GrantType</exception>
     public virtual async Task<AuthorizeResponse> CreateResponseAsync(ValidatedAuthorizeRequest request)
     {
@@ -116,7 +115,6 @@ public virtual async Task<AuthorizeResponse> CreateResponseAsync(ValidatedAuthor
     /// Creates the response for a hybrid flow request
     /// </summary>
     /// <param name="request"></param>
-    /// <returns></returns>
     protected virtual async Task<AuthorizeResponse> CreateHybridFlowResponseAsync(ValidatedAuthorizeRequest request)
     {
         Logger.LogDebug("Creating Hybrid Flow response.");
@@ -134,7 +132,6 @@ protected virtual async Task<AuthorizeResponse> CreateHybridFlowResponseAsync(Va
     /// Creates the response for a code flow request
     /// </summary>
     /// <param name="request"></param>
-    /// <returns></returns>
     protected virtual async Task<AuthorizeResponse> CreateCodeFlowResponseAsync(ValidatedAuthorizeRequest request)
     {
         Logger.LogDebug("Creating Authorization Code Flow response.");
@@ -158,7 +155,6 @@ protected virtual async Task<AuthorizeResponse> CreateCodeFlowResponseAsync(Vali
     /// </summary>
     /// <param name="request"></param>
     /// <param name="authorizationCode"></param>
-    /// <returns></returns>
     protected virtual async Task<AuthorizeResponse> CreateImplicitFlowResponseAsync(ValidatedAuthorizeRequest request, string authorizationCode = null)
     {
         Logger.LogDebug("Creating Implicit Flow response.");
@@ -234,7 +230,6 @@ protected virtual async Task<AuthorizeResponse> CreateImplicitFlowResponseAsync(
     /// Creates an authorization code
     /// </summary>
     /// <param name="request"></param>
-    /// <returns></returns>
     protected virtual async Task<AuthorizationCode> CreateCodeAsync(ValidatedAuthorizeRequest request)
     {
         string stateHash = null;
diff --git a/src/IdentityServer/ResponseHandling/Default/DeviceAuthorizationResponseGenerator.cs b/src/IdentityServer/ResponseHandling/Default/DeviceAuthorizationResponseGenerator.cs
index c8b103773..9fc0f9b86 100644
--- a/src/IdentityServer/ResponseHandling/Default/DeviceAuthorizationResponseGenerator.cs
+++ b/src/IdentityServer/ResponseHandling/Default/DeviceAuthorizationResponseGenerator.cs
@@ -66,7 +66,6 @@ public DeviceAuthorizationResponseGenerator(IdentityServerOptions options, IUser
     /// </summary>
     /// <param name="validationResult">The validation result.</param>
     /// <param name="baseUrl">The base URL.</param>
-    /// <returns></returns>
     /// <exception cref="ArgumentNullException">validationResult or Client</exception>
     /// <exception cref="ArgumentException">Value cannot be null or whitespace. - baseUrl</exception>
     public virtual async Task<DeviceAuthorizationResponse> ProcessAsync(DeviceAuthorizationRequestValidationResult validationResult, string baseUrl)
diff --git a/src/IdentityServer/ResponseHandling/Default/IntrospectionResponseGenerator.cs b/src/IdentityServer/ResponseHandling/Default/IntrospectionResponseGenerator.cs
index 644fc13b7..30a3c5b64 100644
--- a/src/IdentityServer/ResponseHandling/Default/IntrospectionResponseGenerator.cs
+++ b/src/IdentityServer/ResponseHandling/Default/IntrospectionResponseGenerator.cs
@@ -48,7 +48,6 @@ public IntrospectionResponseGenerator(IEventService events, ILogger<Introspectio
     /// Processes the response.
     /// </summary>
     /// <param name="validationResult">The validation result.</param>
-    /// <returns></returns>
     public virtual async Task<Dictionary<string, object>> ProcessAsync(IntrospectionRequestValidationResult validationResult)
     {
         using var activity = Tracing.BasicActivitySource.StartActivity("IntrospectionResponseGenerator.Process");
@@ -108,7 +107,6 @@ public virtual async Task<Dictionary<string, object>> ProcessAsync(Introspection
     /// Checks if the API resource is allowed to introspect the scopes.
     /// </summary>
     /// <param name="validationResult">The validation result.</param>
-    /// <returns></returns>
     protected virtual async Task<bool> AreExpectedScopesPresentAsync(IntrospectionRequestValidationResult validationResult)
     {
         var apiScopes = validationResult.Api.Scopes;
diff --git a/src/IdentityServer/ResponseHandling/Default/TokenResponseGenerator.cs b/src/IdentityServer/ResponseHandling/Default/TokenResponseGenerator.cs
index 6e6b97d0b..23947a466 100644
--- a/src/IdentityServer/ResponseHandling/Default/TokenResponseGenerator.cs
+++ b/src/IdentityServer/ResponseHandling/Default/TokenResponseGenerator.cs
@@ -82,7 +82,6 @@ public TokenResponseGenerator(IClock clock, ITokenService tokenService, IRefresh
     /// Processes the response.
     /// </summary>
     /// <param name="request">The request.</param>
-    /// <returns></returns>
     public virtual async Task<TokenResponse> ProcessAsync(TokenRequestValidationResult request)
     {
         using var activity = Tracing.BasicActivitySource.StartActivity("TokenResponseGenerator.Process");
@@ -112,7 +111,6 @@ public virtual async Task<TokenResponse> ProcessAsync(TokenRequestValidationResu
     /// Creates the response for a client credentials request.
     /// </summary>
     /// <param name="request">The request.</param>
-    /// <returns></returns>
     protected virtual Task<TokenResponse> ProcessClientCredentialsRequestAsync(TokenRequestValidationResult request)
     {
         Logger.LogTrace("Creating response for client credentials request");
@@ -124,7 +122,6 @@ protected virtual Task<TokenResponse> ProcessClientCredentialsRequestAsync(Token
     /// Creates the response for a password request.
     /// </summary>
     /// <param name="request">The request.</param>
-    /// <returns></returns>
     protected virtual Task<TokenResponse> ProcessPasswordRequestAsync(TokenRequestValidationResult request)
     {
         Logger.LogTrace("Creating response for password request");
@@ -136,7 +133,6 @@ protected virtual Task<TokenResponse> ProcessPasswordRequestAsync(TokenRequestVa
     /// Creates the response for an authorization code request.
     /// </summary>
     /// <param name="request">The request.</param>
-    /// <returns></returns>
     /// <exception cref="System.InvalidOperationException">Client does not exist anymore.</exception>
     protected virtual async Task<TokenResponse> ProcessAuthorizationCodeRequestAsync(TokenRequestValidationResult request)
     {
@@ -180,7 +176,6 @@ protected virtual async Task<TokenResponse> ProcessAuthorizationCodeRequestAsync
     /// Creates the response for a refresh token request.
     /// </summary>
     /// <param name="request">The request.</param>
-    /// <returns></returns>
     protected virtual async Task<TokenResponse> ProcessRefreshTokenRequestAsync(TokenRequestValidationResult request)
     {
         Logger.LogTrace("Creating response for refresh token request");
@@ -239,7 +234,6 @@ protected virtual async Task<TokenResponse> ProcessRefreshTokenRequestAsync(Toke
     /// Processes the response for device code grant request.
     /// </summary>
     /// <param name="request">The request.</param>
-    /// <returns></returns>
     protected virtual async Task<TokenResponse> ProcessDeviceCodeRequestAsync(TokenRequestValidationResult request)
     {
         Logger.LogTrace("Creating response for device code request");
@@ -280,7 +274,6 @@ protected virtual async Task<TokenResponse> ProcessDeviceCodeRequestAsync(TokenR
     /// Processes the response for CIBA request.
     /// </summary>
     /// <param name="request">The request.</param>
-    /// <returns></returns>
     protected virtual async Task<TokenResponse> ProcessCibaRequestAsync(TokenRequestValidationResult request)
     {
         Logger.LogTrace("Creating response for CIBA request");
@@ -318,7 +311,6 @@ protected virtual async Task<TokenResponse> ProcessCibaRequestAsync(TokenRequest
     /// Creates the response for an extension grant request.
     /// </summary>
     /// <param name="request">The request.</param>
-    /// <returns></returns>
     protected virtual Task<TokenResponse> ProcessExtensionGrantRequestAsync(TokenRequestValidationResult request)
     {
         Logger.LogTrace("Creating response for extension grant request");
@@ -355,7 +347,6 @@ protected virtual async Task<TokenResponse> ProcessTokenRequestAsync(TokenReques
     /// Creates the access/refresh token.
     /// </summary>
     /// <param name="request">The request.</param>
-    /// <returns></returns>
     /// <exception cref="System.InvalidOperationException">Client does not exist anymore.</exception>
     protected virtual async Task<(string accessToken, string refreshToken)> CreateAccessTokenAsync(ValidatedTokenRequest request)
     {
@@ -462,7 +453,6 @@ protected virtual async Task<TokenResponse> ProcessTokenRequestAsync(TokenReques
     /// </summary>
     /// <param name="request">The request.</param>
     /// <param name="newAccessToken">The new access token.</param>
-    /// <returns></returns>
     protected virtual async Task<string> CreateIdTokenFromRefreshTokenRequestAsync(ValidatedTokenRequest request, string newAccessToken)
     {
         if (request.RefreshToken.AuthorizedScopes.Contains(OidcConstants.StandardScopes.OpenId))
diff --git a/src/IdentityServer/ResponseHandling/Default/TokenRevocationResponseGenerator.cs b/src/IdentityServer/ResponseHandling/Default/TokenRevocationResponseGenerator.cs
index 6492ccdcb..85a95e45a 100644
--- a/src/IdentityServer/ResponseHandling/Default/TokenRevocationResponseGenerator.cs
+++ b/src/IdentityServer/ResponseHandling/Default/TokenRevocationResponseGenerator.cs
@@ -56,7 +56,6 @@ public TokenRevocationResponseGenerator(IReferenceTokenStore referenceTokenStore
     /// Creates the revocation endpoint response and processes the revocation request.
     /// </summary>
     /// <param name="validationResult">The userinfo request validation result.</param>
-    /// <returns></returns>
     public virtual async Task<TokenRevocationResponse> ProcessAsync(TokenRevocationRequestValidationResult validationResult)
     {
         using var activity = Tracing.BasicActivitySource.StartActivity("TokenRevocationResponseGenerator.Process");
diff --git a/src/IdentityServer/ResponseHandling/Default/UserInfoResponseGenerator.cs b/src/IdentityServer/ResponseHandling/Default/UserInfoResponseGenerator.cs
index fa8667656..63abdfea6 100644
--- a/src/IdentityServer/ResponseHandling/Default/UserInfoResponseGenerator.cs
+++ b/src/IdentityServer/ResponseHandling/Default/UserInfoResponseGenerator.cs
@@ -55,7 +55,6 @@ public UserInfoResponseGenerator(IProfileService profile, IResourceStore resourc
     /// Creates the response.
     /// </summary>
     /// <param name="validationResult">The userinfo request validation result.</param>
-    /// <returns></returns>
     /// <exception cref="System.InvalidOperationException">Profile service returned incorrect subject value</exception>
     public virtual async Task<Dictionary<string, object>> ProcessAsync(UserInfoRequestValidationResult validationResult)
     {
@@ -113,7 +112,6 @@ public virtual async Task<Dictionary<string, object>> ProcessAsync(UserInfoReque
     ///  Gets the identity resources from the scopes.
     /// </summary>
     /// <param name="scopes"></param>
-    /// <returns></returns>
     protected internal virtual async Task<ResourceValidationResult> GetRequestedResourcesAsync(IEnumerable<string> scopes)
     {
         if (scopes == null || !scopes.Any())
@@ -137,7 +135,6 @@ protected internal virtual async Task<ResourceValidationResult> GetRequestedReso
     /// Gets the requested claim types.
     /// </summary>
     /// <param name="resourceValidationResult"></param>
-    /// <returns></returns>
     protected internal virtual Task<IEnumerable<string>> GetRequestedClaimTypesAsync(ResourceValidationResult resourceValidationResult)
     {
         IEnumerable<string> result = null;
diff --git a/src/IdentityServer/ResponseHandling/IAuthorizeInteractionResponseGenerator.cs b/src/IdentityServer/ResponseHandling/IAuthorizeInteractionResponseGenerator.cs
index b775929bb..78383a802 100644
--- a/src/IdentityServer/ResponseHandling/IAuthorizeInteractionResponseGenerator.cs
+++ b/src/IdentityServer/ResponseHandling/IAuthorizeInteractionResponseGenerator.cs
@@ -20,6 +20,5 @@ public interface IAuthorizeInteractionResponseGenerator
     /// </summary>
     /// <param name="request">The request.</param>
     /// <param name="consent">The consent.</param>
-    /// <returns></returns>
     Task<InteractionResponse> ProcessInteractionAsync(ValidatedAuthorizeRequest request, ConsentResponse? consent = null);
 }
diff --git a/src/IdentityServer/ResponseHandling/IAuthorizeResponseGenerator.cs b/src/IdentityServer/ResponseHandling/IAuthorizeResponseGenerator.cs
index 868b2306a..94cd5f307 100644
--- a/src/IdentityServer/ResponseHandling/IAuthorizeResponseGenerator.cs
+++ b/src/IdentityServer/ResponseHandling/IAuthorizeResponseGenerator.cs
@@ -16,6 +16,5 @@ public interface IAuthorizeResponseGenerator
     /// Creates the response
     /// </summary>
     /// <param name="request">The request.</param>
-    /// <returns></returns>
     Task<AuthorizeResponse> CreateResponseAsync(ValidatedAuthorizeRequest request);
 }
\ No newline at end of file
diff --git a/src/IdentityServer/ResponseHandling/IBackchannelAuthenticationResponseGenerator.cs b/src/IdentityServer/ResponseHandling/IBackchannelAuthenticationResponseGenerator.cs
index 1e804094f..11fe3c192 100644
--- a/src/IdentityServer/ResponseHandling/IBackchannelAuthenticationResponseGenerator.cs
+++ b/src/IdentityServer/ResponseHandling/IBackchannelAuthenticationResponseGenerator.cs
@@ -16,6 +16,5 @@ public interface IBackchannelAuthenticationResponseGenerator
     /// Processes the response.
     /// </summary>
     /// <param name="validationResult">The validation result.</param>
-    /// <returns></returns>
     Task<BackchannelAuthenticationResponse> ProcessAsync(BackchannelAuthenticationRequestValidationResult validationResult);
 }
\ No newline at end of file
diff --git a/src/IdentityServer/ResponseHandling/IDeviceAuthorizationResponseGenerator.cs b/src/IdentityServer/ResponseHandling/IDeviceAuthorizationResponseGenerator.cs
index 94f451221..dc7b8ae01 100644
--- a/src/IdentityServer/ResponseHandling/IDeviceAuthorizationResponseGenerator.cs
+++ b/src/IdentityServer/ResponseHandling/IDeviceAuthorizationResponseGenerator.cs
@@ -17,6 +17,5 @@ public interface IDeviceAuthorizationResponseGenerator
     /// </summary>
     /// <param name="validationResult">The validation result.</param>
     /// <param name="baseUrl">The base URL.</param>
-    /// <returns></returns>
     Task<DeviceAuthorizationResponse> ProcessAsync(DeviceAuthorizationRequestValidationResult validationResult, string baseUrl);
 }
\ No newline at end of file
diff --git a/src/IdentityServer/ResponseHandling/IIntrospectionResponseGenerator.cs b/src/IdentityServer/ResponseHandling/IIntrospectionResponseGenerator.cs
index a2539480b..94877498b 100644
--- a/src/IdentityServer/ResponseHandling/IIntrospectionResponseGenerator.cs
+++ b/src/IdentityServer/ResponseHandling/IIntrospectionResponseGenerator.cs
@@ -17,6 +17,5 @@ public interface IIntrospectionResponseGenerator
     /// Processes the response.
     /// </summary>
     /// <param name="validationResult">The validation result.</param>
-    /// <returns></returns>
     Task<Dictionary<string, object>> ProcessAsync(IntrospectionRequestValidationResult validationResult);
 }
\ No newline at end of file
diff --git a/src/IdentityServer/ResponseHandling/ITokenResponseGenerator.cs b/src/IdentityServer/ResponseHandling/ITokenResponseGenerator.cs
index 202b69f67..bc128e9fd 100644
--- a/src/IdentityServer/ResponseHandling/ITokenResponseGenerator.cs
+++ b/src/IdentityServer/ResponseHandling/ITokenResponseGenerator.cs
@@ -18,6 +18,5 @@ public interface ITokenResponseGenerator
     /// Processes the response.
     /// </summary>
     /// <param name="validationResult">The validation result.</param>
-    /// <returns></returns>
     Task<TokenResponse> ProcessAsync(TokenRequestValidationResult validationResult);
 }
diff --git a/src/IdentityServer/ResponseHandling/ITokenRevocationResponseGenerator.cs b/src/IdentityServer/ResponseHandling/ITokenRevocationResponseGenerator.cs
index bd5857423..d5c2a47da 100644
--- a/src/IdentityServer/ResponseHandling/ITokenRevocationResponseGenerator.cs
+++ b/src/IdentityServer/ResponseHandling/ITokenRevocationResponseGenerator.cs
@@ -16,6 +16,5 @@ public interface ITokenRevocationResponseGenerator
     /// Creates the revocation endpoint response and processes the revocation request.
     /// </summary>
     /// <param name="validationResult">The userinfo request validation result.</param>
-    /// <returns></returns>
     Task<TokenRevocationResponse> ProcessAsync(TokenRevocationRequestValidationResult validationResult);
 }
\ No newline at end of file
diff --git a/src/IdentityServer/ResponseHandling/IUserInfoResponseGenerator.cs b/src/IdentityServer/ResponseHandling/IUserInfoResponseGenerator.cs
index 9d5b2b4e7..d816e4ec5 100644
--- a/src/IdentityServer/ResponseHandling/IUserInfoResponseGenerator.cs
+++ b/src/IdentityServer/ResponseHandling/IUserInfoResponseGenerator.cs
@@ -17,6 +17,5 @@ public interface IUserInfoResponseGenerator
     /// Creates the response.
     /// </summary>
     /// <param name="validationResult">The userinfo request validation result.</param>
-    /// <returns></returns>
     Task<Dictionary<string, object>> ProcessAsync(UserInfoRequestValidationResult validationResult);
 }
\ No newline at end of file
diff --git a/src/IdentityServer/Services/Default/BackChannelLogoutHttpClient.cs b/src/IdentityServer/Services/Default/BackChannelLogoutHttpClient.cs
index 9241298dd..9e10a376a 100644
--- a/src/IdentityServer/Services/Default/BackChannelLogoutHttpClient.cs
+++ b/src/IdentityServer/Services/Default/BackChannelLogoutHttpClient.cs
@@ -38,7 +38,6 @@ public DefaultBackChannelLogoutHttpClient(HttpClient client, ILoggerFactory logg
     /// </summary>
     /// <param name="url"></param>
     /// <param name="payload"></param>
-    /// <returns></returns>
     public async Task PostAsync(string url, Dictionary<string, string> payload)
     {
         using var activity = Tracing.ServiceActivitySource.StartActivity("DefaultBackChannelLogoutHttpClient.Post");
diff --git a/src/IdentityServer/Services/Default/DefaultBackChannelLogoutService.cs b/src/IdentityServer/Services/Default/DefaultBackChannelLogoutService.cs
index e27f1a7bb..918504cc7 100644
--- a/src/IdentityServer/Services/Default/DefaultBackChannelLogoutService.cs
+++ b/src/IdentityServer/Services/Default/DefaultBackChannelLogoutService.cs
@@ -94,7 +94,6 @@ public virtual async Task SendLogoutNotificationsAsync(LogoutNotificationContext
     /// Sends the logout notifications for the collection of clients.
     /// </summary>
     /// <param name="requests"></param>
-    /// <returns></returns>
     protected virtual Task SendLogoutNotificationsAsync(IEnumerable<BackChannelLogoutRequest> requests)
     {
         requests = requests ?? Enumerable.Empty<BackChannelLogoutRequest>();
@@ -117,7 +116,6 @@ protected virtual async Task SendLogoutNotificationAsync(BackChannelLogoutReques
     /// </summary>
     /// <param name="client"></param>
     /// <param name="data"></param>
-    /// <returns></returns>
     protected virtual Task PostLogoutJwt(BackChannelLogoutRequest client, Dictionary<string, string> data)
     {
         return HttpClient.PostAsync(client.LogoutUri, data);
@@ -127,7 +125,6 @@ protected virtual Task PostLogoutJwt(BackChannelLogoutRequest client, Dictionary
     /// Creates the form-url-encoded payload (as a dictionary) to send to the client.
     /// </summary>
     /// <param name="request"></param>
-    /// <returns></returns>
     protected async Task<Dictionary<string, string>> CreateFormPostPayloadAsync(BackChannelLogoutRequest request)
     {
         var token = await CreateTokenAsync(request);
diff --git a/src/IdentityServer/Services/Default/DefaultCache.cs b/src/IdentityServer/Services/Default/DefaultCache.cs
index 22eb68f54..dc5ead466 100644
--- a/src/IdentityServer/Services/Default/DefaultCache.cs
+++ b/src/IdentityServer/Services/Default/DefaultCache.cs
@@ -60,7 +60,6 @@ public DefaultCache(IdentityServerOptions identityServerOptions, IMemoryCache ca
     /// Used to create the key for the cache based on the data type being cached.
     /// </summary>
     /// <param name="key"></param>
-    /// <returns></returns>
     protected string GetKey(string key)
     {
         return typeof(T).FullName + KeySeparator + key;
diff --git a/src/IdentityServer/Services/Default/DefaultClaimsService.cs b/src/IdentityServer/Services/Default/DefaultClaimsService.cs
index f36a359cc..88513f998 100644
--- a/src/IdentityServer/Services/Default/DefaultClaimsService.cs
+++ b/src/IdentityServer/Services/Default/DefaultClaimsService.cs
@@ -258,7 +258,6 @@ protected virtual IEnumerable<Claim> GetOptionalClaims(ClaimsPrincipal subject)
     /// Filters out protocol claims like amr, nonce etc..
     /// </summary>
     /// <param name="claims">The claims.</param>
-    /// <returns></returns>
     protected virtual IEnumerable<Claim> FilterProtocolClaims(IEnumerable<Claim> claims)
     {
         var claimsToFilter = claims.Where(x => Constants.Filters.ClaimsServiceFilterClaimTypes.Contains(x.Type));
diff --git a/src/IdentityServer/Services/Default/DefaultConsentService.cs b/src/IdentityServer/Services/Default/DefaultConsentService.cs
index 4dced8d14..c734f4623 100644
--- a/src/IdentityServer/Services/Default/DefaultConsentService.cs
+++ b/src/IdentityServer/Services/Default/DefaultConsentService.cs
@@ -147,7 +147,6 @@ public virtual async Task<bool> RequiresConsentAsync(ClaimsPrincipal subject, Cl
     /// <param name="client">The client.</param>
     /// <param name="subject">The subject.</param>
     /// <param name="parsedScopes">The parsed scopes.</param>
-    /// <returns></returns>
     /// <exception cref="System.ArgumentNullException">
     /// client
     /// or
diff --git a/src/IdentityServer/Services/Default/DefaultCorsPolicyService.cs b/src/IdentityServer/Services/Default/DefaultCorsPolicyService.cs
index ba94d8b2b..bb2eb881b 100644
--- a/src/IdentityServer/Services/Default/DefaultCorsPolicyService.cs
+++ b/src/IdentityServer/Services/Default/DefaultCorsPolicyService.cs
@@ -49,7 +49,6 @@ public DefaultCorsPolicyService(ILogger<DefaultCorsPolicyService> logger)
     /// Determines whether the origin allowed.
     /// </summary>
     /// <param name="origin">The origin.</param>
-    /// <returns></returns>
     public virtual Task<bool> IsOriginAllowedAsync(string origin)
     {
         using var activity = Tracing.ServiceActivitySource.StartActivity("DefaultCorsPolicyService.IsOriginAllowed");
diff --git a/src/IdentityServer/Services/Default/DefaultDeviceFlowCodeService.cs b/src/IdentityServer/Services/Default/DefaultDeviceFlowCodeService.cs
index d9556eba4..684c96ad7 100644
--- a/src/IdentityServer/Services/Default/DefaultDeviceFlowCodeService.cs
+++ b/src/IdentityServer/Services/Default/DefaultDeviceFlowCodeService.cs
@@ -34,7 +34,6 @@ public DefaultDeviceFlowCodeService(IDeviceFlowStore store,
     /// </summary>
     /// <param name="userCode">The user code.</param>
     /// <param name="data">The data.</param>
-    /// <returns></returns>
     public async Task<string> StoreDeviceAuthorizationAsync(string userCode, DeviceCode data)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("DefaultDeviceFlowCodeService.SendLogoutNotifStoreDeviceAuthorization");
@@ -50,7 +49,6 @@ public async Task<string> StoreDeviceAuthorizationAsync(string userCode, DeviceC
     /// Finds device authorization by user code.
     /// </summary>
     /// <param name="userCode">The user code.</param>
-    /// <returns></returns>
     public Task<DeviceCode> FindByUserCodeAsync(string userCode)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("DefaultDeviceFlowCodeService.FindByUserCode");
@@ -62,7 +60,6 @@ public Task<DeviceCode> FindByUserCodeAsync(string userCode)
     /// Finds device authorization by device code.
     /// </summary>
     /// <param name="deviceCode">The device code.</param>
-    /// <returns></returns>
     public Task<DeviceCode> FindByDeviceCodeAsync(string deviceCode)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("DefaultDeviceFlowCodeService.FindByDeviceCode");
@@ -75,7 +72,6 @@ public Task<DeviceCode> FindByDeviceCodeAsync(string deviceCode)
     /// </summary>
     /// <param name="userCode">The user code.</param>
     /// <param name="data">The data.</param>
-    /// <returns></returns>
     public Task UpdateByUserCodeAsync(string userCode, DeviceCode data)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("DefaultDeviceFlowCodeService.UpdateByUserCode");
@@ -87,7 +83,6 @@ public Task UpdateByUserCodeAsync(string userCode, DeviceCode data)
     /// Removes the device authorization, searching by device code.
     /// </summary>
     /// <param name="deviceCode">The device code.</param>
-    /// <returns></returns>
     public Task RemoveByDeviceCodeAsync(string deviceCode)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("DefaultDeviceFlowCodeService.RemoveByDeviceCode");
diff --git a/src/IdentityServer/Services/Default/DefaultEventService.cs b/src/IdentityServer/Services/Default/DefaultEventService.cs
index 691800f52..8e527e1fc 100644
--- a/src/IdentityServer/Services/Default/DefaultEventService.cs
+++ b/src/IdentityServer/Services/Default/DefaultEventService.cs
@@ -56,7 +56,6 @@ public DefaultEventService(IdentityServerOptions options, IHttpContextAccessor c
     /// Raises the specified event.
     /// </summary>
     /// <param name="evt">The event.</param>
-    /// <returns></returns>
     /// <exception cref="System.ArgumentNullException">evt</exception>
     public async Task RaiseAsync(Event evt)
     {
@@ -73,7 +72,6 @@ public async Task RaiseAsync(Event evt)
     /// Indicates if the type of event will be persisted.
     /// </summary>
     /// <param name="evtType"></param>
-    /// <returns></returns>
     /// <exception cref="System.ArgumentOutOfRangeException"></exception>
     public bool CanRaiseEventType(EventTypes evtType)
     {
@@ -108,7 +106,6 @@ protected virtual bool CanRaiseEvent(Event evt)
     /// Prepares the event.
     /// </summary>
     /// <param name="evt">The evt.</param>
-    /// <returns></returns>
     protected virtual async Task PrepareEventAsync(Event evt)
     {
         evt.TimeStamp = Clock.UtcNow.DateTime;
diff --git a/src/IdentityServer/Services/Default/DefaultHandleGenerationService.cs b/src/IdentityServer/Services/Default/DefaultHandleGenerationService.cs
index 4a32c8c69..3f8a6903a 100644
--- a/src/IdentityServer/Services/Default/DefaultHandleGenerationService.cs
+++ b/src/IdentityServer/Services/Default/DefaultHandleGenerationService.cs
@@ -17,7 +17,6 @@ public class DefaultHandleGenerationService : IHandleGenerationService
     /// Generates a handle.
     /// </summary>
     /// <param name="length">The length.</param>
-    /// <returns></returns>
     public Task<string> GenerateAsync(int length)
     {
         return Task.FromResult(CryptoRandom.CreateUniqueId(length, CryptoRandom.OutputFormat.Hex));
diff --git a/src/IdentityServer/Services/Default/DefaultProfileService.cs b/src/IdentityServer/Services/Default/DefaultProfileService.cs
index 3131a51e3..2fb8cf71c 100644
--- a/src/IdentityServer/Services/Default/DefaultProfileService.cs
+++ b/src/IdentityServer/Services/Default/DefaultProfileService.cs
@@ -33,7 +33,6 @@ public DefaultProfileService(ILogger<DefaultProfileService> logger)
     /// This method is called whenever claims about the user are requested (e.g. during token creation or via the userinfo endpoint)
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     public virtual Task GetProfileDataAsync(ProfileDataRequestContext context)
     {
         using var activity = Tracing.ServiceActivitySource.StartActivity("DefaultProfileService.GetProfileData");
@@ -50,7 +49,6 @@ public virtual Task GetProfileDataAsync(ProfileDataRequestContext context)
     /// (e.g. during token issuance or validation).
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     public virtual Task IsActiveAsync(IsActiveContext context)
     {
         using var activity = Tracing.ServiceActivitySource.StartActivity("DefaultProfileService.IsActive");
diff --git a/src/IdentityServer/Services/Default/DefaultRefreshTokenService.cs b/src/IdentityServer/Services/Default/DefaultRefreshTokenService.cs
index 2c810edb6..45b7933bf 100644
--- a/src/IdentityServer/Services/Default/DefaultRefreshTokenService.cs
+++ b/src/IdentityServer/Services/Default/DefaultRefreshTokenService.cs
@@ -71,7 +71,6 @@ public DefaultRefreshTokenService(
     /// </summary>
     /// <param name="tokenHandle">The token handle.</param>
     /// <param name="client">The client.</param>
-    /// <returns></returns>
     public virtual async Task<TokenValidationResult> ValidateRefreshTokenAsync(string tokenHandle, Client client)
     {
         using var activity = Tracing.ServiceActivitySource.StartActivity("DefaultRefreshTokenService.ValidateRefreshToken");
@@ -160,7 +159,6 @@ public virtual async Task<TokenValidationResult> ValidateRefreshTokenAsync(strin
     /// Callback to decide if an already consumed token should be accepted.
     /// </summary>
     /// <param name="refreshToken"></param>
-    /// <returns></returns>
     protected virtual Task<bool> AcceptConsumedTokenAsync(RefreshToken refreshToken)
     {
         // by default we will not accept consumed tokens
diff --git a/src/IdentityServer/Services/Default/DefaultTokenCreationService.cs b/src/IdentityServer/Services/Default/DefaultTokenCreationService.cs
index 83948eeee..f3b25ec5d 100644
--- a/src/IdentityServer/Services/Default/DefaultTokenCreationService.cs
+++ b/src/IdentityServer/Services/Default/DefaultTokenCreationService.cs
@@ -80,7 +80,6 @@ public virtual async Task<string> CreateTokenAsync(Token token)
     /// Creates the JWT payload
     /// </summary>
     /// <param name="token"></param>
-    /// <returns></returns>
     protected virtual Task<string> CreatePayloadAsync(Token token)
     {
         var payload = token.CreateJwtPayloadDictionary(Options, Clock, Logger);
@@ -91,7 +90,6 @@ protected virtual Task<string> CreatePayloadAsync(Token token)
     /// Creates additional JWT header elements
     /// </summary>
     /// <param name="token"></param>
-    /// <returns></returns>
     protected virtual Task<Dictionary<string, object>> CreateHeaderElementsAsync(Token token)
     {
         var additionalHeaderElements = new Dictionary<string, object>();
@@ -120,7 +118,6 @@ protected virtual Task<Dictionary<string, object>> CreateHeaderElementsAsync(Tok
     /// <param name="token"></param>
     /// <param name="payload"></param>
     /// <param name="headerElements"></param>
-    /// <returns></returns>
     /// <exception cref="InvalidOperationException"></exception>
     protected virtual async Task<string> CreateJwtAsync(Token token, string payload,
         Dictionary<string, object> headerElements)
diff --git a/src/IdentityServer/Services/Default/DefaultUserCodeService.cs b/src/IdentityServer/Services/Default/DefaultUserCodeService.cs
index 8ad706bb0..1072b21f0 100644
--- a/src/IdentityServer/Services/Default/DefaultUserCodeService.cs
+++ b/src/IdentityServer/Services/Default/DefaultUserCodeService.cs
@@ -31,7 +31,6 @@ public DefaultUserCodeService(IEnumerable<IUserCodeGenerator> generators)
     /// Gets the user code generator.
     /// </summary>
     /// <param name="userCodeType">Type of user code.</param>
-    /// <returns></returns>
     public Task<IUserCodeGenerator> GetGenerator(string userCodeType) =>
         Task.FromResult(_generators.FirstOrDefault(x => x.UserCodeType == userCodeType));
 }
\ No newline at end of file
diff --git a/src/IdentityServer/Services/Default/DefaultUserSession.cs b/src/IdentityServer/Services/Default/DefaultUserSession.cs
index aa4986f30..78b304f27 100644
--- a/src/IdentityServer/Services/Default/DefaultUserSession.cs
+++ b/src/IdentityServer/Services/Default/DefaultUserSession.cs
@@ -158,7 +158,6 @@ protected virtual async Task AuthenticateAsync()
     /// </summary>
     /// <param name="principal"></param>
     /// <param name="properties"></param>
-    /// <returns></returns>
     /// <exception cref="ArgumentNullException">
     /// principal
     /// or
@@ -202,7 +201,6 @@ public virtual async Task<string> CreateSessionIdAsync(ClaimsPrincipal principal
     /// <summary>
     /// Gets the current authenticated user.
     /// </summary>
-    /// <returns></returns>
     public virtual async Task<ClaimsPrincipal> GetUserAsync()
     {
         await AuthenticateAsync();
@@ -213,7 +211,6 @@ public virtual async Task<ClaimsPrincipal> GetUserAsync()
     /// <summary>
     /// Gets the current session identifier.
     /// </summary>
-    /// <returns></returns>
     public virtual async Task<string> GetSessionIdAsync()
     {
         await AuthenticateAsync();
@@ -226,7 +223,6 @@ public virtual async Task<string> GetSessionIdAsync()
     /// session identifier. If there is no sid, the cookie is removed. If there
     /// is a sid, and the session identifier cookie is missing, it is issued. 
     /// </summary>
-    /// <returns></returns>
     public virtual async Task EnsureSessionIdCookieAsync()
     {
         var sid = await GetSessionIdAsync();
@@ -243,7 +239,6 @@ public virtual async Task EnsureSessionIdCookieAsync()
     /// <summary>
     /// Removes the session identifier cookie.
     /// </summary>
-    /// <returns></returns>
     public virtual Task RemoveSessionIdCookieAsync()
     {
         if (HttpContext.Request.Cookies.ContainsKey(CheckSessionCookieName))
@@ -301,7 +296,6 @@ public virtual void IssueSessionIdCookie(string sid)
     /// Adds a client to the list of clients the user has signed into during their session.
     /// </summary>
     /// <param name="clientId">The client identifier.</param>
-    /// <returns></returns>
     /// <exception cref="ArgumentNullException">clientId</exception>
     public virtual async Task AddClientIdAsync(string clientId)
     {
@@ -318,7 +312,6 @@ public virtual async Task AddClientIdAsync(string clientId)
     /// <summary>
     /// Gets the list of clients the user has signed into during their session.
     /// </summary>
-    /// <returns></returns>
     public virtual async Task<IEnumerable<string>> GetClientListAsync()
     {
         await AuthenticateAsync();
diff --git a/src/IdentityServer/Services/Default/DistributedDeviceFlowThrottlingService.cs b/src/IdentityServer/Services/Default/DistributedDeviceFlowThrottlingService.cs
index 888a022f7..9703e2e4b 100644
--- a/src/IdentityServer/Services/Default/DistributedDeviceFlowThrottlingService.cs
+++ b/src/IdentityServer/Services/Default/DistributedDeviceFlowThrottlingService.cs
@@ -48,7 +48,6 @@ public DistributedDeviceFlowThrottlingService(
     /// </summary>
     /// <param name="deviceCode">The device code.</param>
     /// <param name="details">The device code details.</param>
-    /// <returns></returns>
     /// <exception cref="ArgumentNullException">deviceCode</exception>
     public async Task<bool> ShouldSlowDown(string deviceCode, DeviceCode details)
     {
diff --git a/src/IdentityServer/Services/Default/KeyManagement/AutomaticKeyManagerKeyStore.cs b/src/IdentityServer/Services/Default/KeyManagement/AutomaticKeyManagerKeyStore.cs
index 7135bfe37..1cb41ca52 100644
--- a/src/IdentityServer/Services/Default/KeyManagement/AutomaticKeyManagerKeyStore.cs
+++ b/src/IdentityServer/Services/Default/KeyManagement/AutomaticKeyManagerKeyStore.cs
@@ -20,7 +20,6 @@ public interface IAutomaticKeyManagerKeyStore : IValidationKeysStore, ISigningCr
     /// <summary>
     /// Gets all the signing credentials.
     /// </summary>
-    /// <returns></returns>
     Task<IEnumerable<SigningCredentials>> GetAllSigningCredentialsAsync();
 }
 
diff --git a/src/IdentityServer/Services/Default/KeyManagement/FileSystemKeyStore.cs b/src/IdentityServer/Services/Default/KeyManagement/FileSystemKeyStore.cs
index 41ad38f8a..d9e09c574 100644
--- a/src/IdentityServer/Services/Default/KeyManagement/FileSystemKeyStore.cs
+++ b/src/IdentityServer/Services/Default/KeyManagement/FileSystemKeyStore.cs
@@ -48,7 +48,6 @@ public FileSystemKeyStore(DirectoryInfo directory, ILogger<FileSystemKeyStore> l
     /// <summary>
     /// Returns all the keys in storage.
     /// </summary>
-    /// <returns></returns>
     public async Task<IEnumerable<SerializedKey>> LoadKeysAsync()
     {
         var list = new List<SerializedKey>();
@@ -84,7 +83,6 @@ public async Task<IEnumerable<SerializedKey>> LoadKeysAsync()
     /// Persists new key in storage.
     /// </summary>
     /// <param name="key"></param>
-    /// <returns></returns>
     public Task StoreKeyAsync(SerializedKey key)
     {
         if (!_directory.Exists)
@@ -104,7 +102,6 @@ public Task StoreKeyAsync(SerializedKey key)
     /// Deletes key from storage.
     /// </summary>
     /// <param name="id"></param>
-    /// <returns></returns>
     public Task DeleteKeyAsync(string id)
     {
         var path = Path.Combine(_directory.FullName, KeyFilePrefix + id + KeyFileExtension);
diff --git a/src/IdentityServer/Services/Default/KeyManagement/IKeyManager.cs b/src/IdentityServer/Services/Default/KeyManagement/IKeyManager.cs
index 451dfd059..5679594ec 100644
--- a/src/IdentityServer/Services/Default/KeyManagement/IKeyManager.cs
+++ b/src/IdentityServer/Services/Default/KeyManagement/IKeyManager.cs
@@ -15,12 +15,10 @@ public interface IKeyManager
     /// <summary>
     /// Returns the current signing keys.
     /// </summary>
-    /// <returns></returns>
     Task<IEnumerable<KeyContainer>> GetCurrentKeysAsync();
 
     /// <summary>
     /// Returns all the validation keys.
     /// </summary>
-    /// <returns></returns>
     Task<IEnumerable<KeyContainer>> GetAllKeysAsync();
 }
diff --git a/src/IdentityServer/Services/Default/KeyManagement/IKeyProtector.cs b/src/IdentityServer/Services/Default/KeyManagement/IKeyProtector.cs
index 01bb89e35..ac4989a85 100644
--- a/src/IdentityServer/Services/Default/KeyManagement/IKeyProtector.cs
+++ b/src/IdentityServer/Services/Default/KeyManagement/IKeyProtector.cs
@@ -15,13 +15,11 @@ public interface ISigningKeyProtector
     /// Protects KeyContainer.
     /// </summary>
     /// <param name="key"></param>
-    /// <returns></returns>
     SerializedKey Protect(KeyContainer key);
 
     /// <summary>
     /// Unprotects KeyContainer.
     /// </summary>
     /// <param name="key"></param>
-    /// <returns></returns>
     KeyContainer Unprotect(SerializedKey key);
 }
\ No newline at end of file
diff --git a/src/IdentityServer/Services/Default/KeyManagement/IKeyStoreCache.cs b/src/IdentityServer/Services/Default/KeyManagement/IKeyStoreCache.cs
index ba6bc580f..a282d7c31 100644
--- a/src/IdentityServer/Services/Default/KeyManagement/IKeyStoreCache.cs
+++ b/src/IdentityServer/Services/Default/KeyManagement/IKeyStoreCache.cs
@@ -16,7 +16,6 @@ public interface ISigningKeyStoreCache
     /// <summary>
     /// Returns cached keys.
     /// </summary>
-    /// <returns></returns>
     Task<IEnumerable<KeyContainer>> GetKeysAsync();
 
     /// <summary>
@@ -24,6 +23,5 @@ public interface ISigningKeyStoreCache
     /// </summary>
     /// <param name="keys"></param>
     /// <param name="duration"></param>
-    /// <returns></returns>
     Task StoreKeysAsync(IEnumerable<KeyContainer> keys, TimeSpan duration);
 }
\ No newline at end of file
diff --git a/src/IdentityServer/Services/Default/KeyManagement/InMemoryKeyStoreCache.cs b/src/IdentityServer/Services/Default/KeyManagement/InMemoryKeyStoreCache.cs
index fa0313b08..d0f8c1fba 100644
--- a/src/IdentityServer/Services/Default/KeyManagement/InMemoryKeyStoreCache.cs
+++ b/src/IdentityServer/Services/Default/KeyManagement/InMemoryKeyStoreCache.cs
@@ -32,7 +32,6 @@ public InMemoryKeyStoreCache(IClock clock)
     /// <summary>
     /// Returns cached keys.
     /// </summary>
-    /// <returns></returns>
     public Task<IEnumerable<KeyContainer>> GetKeysAsync()
     {
         DateTime expires;
@@ -57,7 +56,6 @@ public Task<IEnumerable<KeyContainer>> GetKeysAsync()
     /// </summary>
     /// <param name="keys"></param>
     /// <param name="duration"></param>
-    /// <returns></returns>
     public Task StoreKeysAsync(IEnumerable<KeyContainer> keys, TimeSpan duration)
     {
         lock (_lock)
diff --git a/src/IdentityServer/Services/Default/KeyManagement/KeyContainer.cs b/src/IdentityServer/Services/Default/KeyManagement/KeyContainer.cs
index d459c4be0..a8cf0d470 100644
--- a/src/IdentityServer/Services/Default/KeyManagement/KeyContainer.cs
+++ b/src/IdentityServer/Services/Default/KeyManagement/KeyContainer.cs
@@ -52,6 +52,5 @@ public KeyContainer(string id, string algorithm, DateTime created)
     /// <summary>
     /// Creates AsymmetricSecurityKey.
     /// </summary>
-    /// <returns></returns>
     public abstract AsymmetricSecurityKey ToSecurityKey();
 }
\ No newline at end of file
diff --git a/src/IdentityServer/Services/Default/KeyManagement/NopKeyStoreCache.cs b/src/IdentityServer/Services/Default/KeyManagement/NopKeyStoreCache.cs
index 791a3a828..0e7a02459 100644
--- a/src/IdentityServer/Services/Default/KeyManagement/NopKeyStoreCache.cs
+++ b/src/IdentityServer/Services/Default/KeyManagement/NopKeyStoreCache.cs
@@ -16,7 +16,6 @@ class NopKeyStoreCache : ISigningKeyStoreCache
     /// <summary>
     /// Returns null.
     /// </summary>
-    /// <returns></returns>
     public Task<IEnumerable<KeyContainer>> GetKeysAsync()
     {
         return Task.FromResult<IEnumerable<KeyContainer>>(null);
@@ -27,7 +26,6 @@ public Task<IEnumerable<KeyContainer>> GetKeysAsync()
     /// </summary>
     /// <param name="keys"></param>
     /// <param name="duration"></param>
-    /// <returns></returns>
     public Task StoreKeysAsync(IEnumerable<KeyContainer> keys, TimeSpan duration)
     {
         return Task.CompletedTask;
diff --git a/src/IdentityServer/Services/Default/NumericUserCodeGenerator.cs b/src/IdentityServer/Services/Default/NumericUserCodeGenerator.cs
index 6022dbbc6..272e6a0bc 100644
--- a/src/IdentityServer/Services/Default/NumericUserCodeGenerator.cs
+++ b/src/IdentityServer/Services/Default/NumericUserCodeGenerator.cs
@@ -32,7 +32,6 @@ public class NumericUserCodeGenerator : IUserCodeGenerator
     /// <summary>
     /// Generates the user code.
     /// </summary>
-    /// <returns></returns>
     public Task<string> GenerateAsync()
     {
         var next = RandomNumberGenerator.GetInt32(100000000, 1000000000);
diff --git a/src/IdentityServer/Services/Default/ReturnUrlParser.cs b/src/IdentityServer/Services/Default/ReturnUrlParser.cs
index c9d6f55ab..5a92c3bb0 100644
--- a/src/IdentityServer/Services/Default/ReturnUrlParser.cs
+++ b/src/IdentityServer/Services/Default/ReturnUrlParser.cs
@@ -28,7 +28,6 @@ public ReturnUrlParser(IEnumerable<IReturnUrlParser> parsers)
     /// Parses the return URL.
     /// </summary>
     /// <param name="returnUrl">The return URL.</param>
-    /// <returns></returns>
     public virtual async Task<AuthorizationRequest> ParseAsync(string returnUrl)
     {
         using var activity = Tracing.ValidationActivitySource.StartActivity("ReturnUrlParser.Parse");
diff --git a/src/IdentityServer/Services/IBackChannelLogoutHttpClient.cs b/src/IdentityServer/Services/IBackChannelLogoutHttpClient.cs
index 92ab200d1..00c28c7b7 100644
--- a/src/IdentityServer/Services/IBackChannelLogoutHttpClient.cs
+++ b/src/IdentityServer/Services/IBackChannelLogoutHttpClient.cs
@@ -19,6 +19,5 @@ public interface IBackChannelLogoutHttpClient
     /// </summary>
     /// <param name="url"></param>
     /// <param name="payload"></param>
-    /// <returns></returns>
     Task PostAsync(string url, Dictionary<string, string> payload);
 }
diff --git a/src/IdentityServer/Services/ICache.cs b/src/IdentityServer/Services/ICache.cs
index a3537971c..92a7788a7 100644
--- a/src/IdentityServer/Services/ICache.cs
+++ b/src/IdentityServer/Services/ICache.cs
@@ -39,7 +39,6 @@ public interface ICache<T>
     /// <param name="key">The key.</param>
     /// <param name="item">The item.</param>
     /// <param name="expiration">The expiration.</param>
-    /// <returns></returns>
     Task SetAsync(string key, T item, TimeSpan expiration);
 
     /// <summary>
diff --git a/src/IdentityServer/Services/IConsentService.cs b/src/IdentityServer/Services/IConsentService.cs
index 5c1a43828..06f0008ca 100644
--- a/src/IdentityServer/Services/IConsentService.cs
+++ b/src/IdentityServer/Services/IConsentService.cs
@@ -34,6 +34,5 @@ public interface IConsentService
     /// <param name="subject">The subject.</param>
     /// <param name="client">The client.</param>
     /// <param name="parsedScopes">The parsed scopes.</param>
-    /// <returns></returns>
     Task UpdateConsentAsync(ClaimsPrincipal subject, Client client, IEnumerable<ParsedScopeValue> parsedScopes);
 }
diff --git a/src/IdentityServer/Services/IDeviceFlowCodeService.cs b/src/IdentityServer/Services/IDeviceFlowCodeService.cs
index bf0d1ef7d..37e896e4c 100644
--- a/src/IdentityServer/Services/IDeviceFlowCodeService.cs
+++ b/src/IdentityServer/Services/IDeviceFlowCodeService.cs
@@ -25,7 +25,6 @@ public interface IDeviceFlowCodeService
     /// Finds device authorization by user code.
     /// </summary>
     /// <param name="userCode">The user code.</param>
-    /// <returns></returns>
     Task<DeviceCode?> FindByUserCodeAsync(string userCode);
 
     /// <summary>
diff --git a/src/IdentityServer/Services/IDeviceFlowInteractionService.cs b/src/IdentityServer/Services/IDeviceFlowInteractionService.cs
index 0bce82d46..d47a948be 100644
--- a/src/IdentityServer/Services/IDeviceFlowInteractionService.cs
+++ b/src/IdentityServer/Services/IDeviceFlowInteractionService.cs
@@ -18,7 +18,6 @@ public interface IDeviceFlowInteractionService
     /// Gets the authorization context asynchronous.
     /// </summary>
     /// <param name="userCode">The user code.</param>
-    /// <returns></returns>
     Task<DeviceFlowAuthorizationRequest?> GetAuthorizationContextAsync(string userCode);
 
     /// <summary>
@@ -26,6 +25,5 @@ public interface IDeviceFlowInteractionService
     /// </summary>
     /// <param name="userCode">The user code.</param>
     /// <param name="consent">The consent.</param>
-    /// <returns></returns>
     Task<DeviceFlowInteractionResult> HandleRequestAsync(string userCode, ConsentResponse consent);
 }
diff --git a/src/IdentityServer/Services/IDeviceFlowThrottlingService.cs b/src/IdentityServer/Services/IDeviceFlowThrottlingService.cs
index 081a6ecad..43fdaedf5 100644
--- a/src/IdentityServer/Services/IDeviceFlowThrottlingService.cs
+++ b/src/IdentityServer/Services/IDeviceFlowThrottlingService.cs
@@ -19,6 +19,5 @@ public interface IDeviceFlowThrottlingService
     /// </summary>
     /// <param name="deviceCode">The device code.</param>
     /// <param name="details">The device code details.</param>
-    /// <returns></returns>
     Task<bool> ShouldSlowDown(string deviceCode, DeviceCode details);
 }
diff --git a/src/IdentityServer/Services/IHandleGenerationService.cs b/src/IdentityServer/Services/IHandleGenerationService.cs
index 1419287f1..a3189bb5f 100644
--- a/src/IdentityServer/Services/IHandleGenerationService.cs
+++ b/src/IdentityServer/Services/IHandleGenerationService.cs
@@ -17,6 +17,5 @@ public interface IHandleGenerationService
     /// Generates a handle.
     /// </summary>
     /// <param name="length">The length.</param>
-    /// <returns></returns>
     Task<string> GenerateAsync(int length = 32);
 }
diff --git a/src/IdentityServer/Services/IIdentityServerInteractionService.cs b/src/IdentityServer/Services/IIdentityServerInteractionService.cs
index c2c09f4f3..0cf3c5666 100644
--- a/src/IdentityServer/Services/IIdentityServerInteractionService.cs
+++ b/src/IdentityServer/Services/IIdentityServerInteractionService.cs
@@ -42,7 +42,6 @@ public interface IIdentityServerInteractionService
     /// <summary>
     /// Used to create a logoutId if there is not one presently.
     /// </summary>
-    /// <returns></returns>
     Task<string?> CreateLogoutContextAsync();
 
     /// <summary>
diff --git a/src/IdentityServer/Services/IIssuerNameService.cs b/src/IdentityServer/Services/IIssuerNameService.cs
index 28b7f0d76..372d6b9e5 100644
--- a/src/IdentityServer/Services/IIssuerNameService.cs
+++ b/src/IdentityServer/Services/IIssuerNameService.cs
@@ -16,6 +16,5 @@ public interface IIssuerNameService
     /// <summary>
     /// Returns the issuer name for the current request
     /// </summary>
-    /// <returns></returns>
     Task<string> GetCurrentAsync();
 }
diff --git a/src/IdentityServer/Services/IJwtRequestUriHttpClient.cs b/src/IdentityServer/Services/IJwtRequestUriHttpClient.cs
index 12a2f0ef9..81eaab529 100644
--- a/src/IdentityServer/Services/IJwtRequestUriHttpClient.cs
+++ b/src/IdentityServer/Services/IJwtRequestUriHttpClient.cs
@@ -19,6 +19,5 @@ public interface IJwtRequestUriHttpClient
     /// </summary>
     /// <param name="url"></param>
     /// <param name="client"></param>
-    /// <returns></returns>
     Task<string?> GetJwtAsync(string url, Client client);
 }
diff --git a/src/IdentityServer/Services/IKeyMaterialService.cs b/src/IdentityServer/Services/IKeyMaterialService.cs
index 671e3bf86..7554d97ff 100644
--- a/src/IdentityServer/Services/IKeyMaterialService.cs
+++ b/src/IdentityServer/Services/IKeyMaterialService.cs
@@ -19,7 +19,6 @@ public interface IKeyMaterialService
     /// <summary>
     /// Gets all validation keys.
     /// </summary>
-    /// <returns></returns>
     Task<IEnumerable<SecurityKeyInfo>> GetValidationKeysAsync();
 
     /// <summary>
@@ -27,12 +26,10 @@ public interface IKeyMaterialService
     /// </summary>
     /// <param name="allowedAlgorithms">Collection of algorithms used to filter the server supported algorithms. 
     /// A value of null or empty indicates that the server default should be returned.</param>
-    /// <returns></returns>
     Task<SigningCredentials> GetSigningCredentialsAsync(IEnumerable<string>? allowedAlgorithms = null);
 
     /// <summary>
     /// Gets all signing credentials.
     /// </summary>
-    /// <returns></returns>
     Task<IEnumerable<SigningCredentials>> GetAllSigningCredentialsAsync();
 }
diff --git a/src/IdentityServer/Services/IPersistedGrantService.cs b/src/IdentityServer/Services/IPersistedGrantService.cs
index c6be0fbed..7e7514d6a 100644
--- a/src/IdentityServer/Services/IPersistedGrantService.cs
+++ b/src/IdentityServer/Services/IPersistedGrantService.cs
@@ -19,7 +19,6 @@ public interface IPersistedGrantService
     /// Gets all grants for a given subject ID.
     /// </summary>
     /// <param name="subjectId">The subject identifier.</param>
-    /// <returns></returns>
     Task<IEnumerable<Grant>> GetAllGrantsAsync(string subjectId);
 
     /// <summary>
@@ -28,6 +27,5 @@ public interface IPersistedGrantService
     /// <param name="subjectId">The subject identifier.</param>
     /// <param name="clientId">The client identifier (optional).</param>
     /// <param name="sessionId">The session id (optional).</param>
-    /// <returns></returns>
     Task RemoveAllGrantsAsync(string subjectId, string? clientId = null, string? sessionId = null);
 }
diff --git a/src/IdentityServer/Services/IProfileService.cs b/src/IdentityServer/Services/IProfileService.cs
index 46d242884..a89c93849 100644
--- a/src/IdentityServer/Services/IProfileService.cs
+++ b/src/IdentityServer/Services/IProfileService.cs
@@ -18,7 +18,6 @@ public interface IProfileService
     /// This method is called whenever claims about the user are requested (e.g. during token creation or via the userinfo endpoint)
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     Task GetProfileDataAsync(ProfileDataRequestContext context);
 
     /// <summary>
@@ -26,6 +25,5 @@ public interface IProfileService
     /// (e.g. during token issuance or validation).
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     Task IsActiveAsync(IsActiveContext context);
 }
diff --git a/src/IdentityServer/Services/IRefreshTokenService.cs b/src/IdentityServer/Services/IRefreshTokenService.cs
index 4c61b3395..740fe897e 100644
--- a/src/IdentityServer/Services/IRefreshTokenService.cs
+++ b/src/IdentityServer/Services/IRefreshTokenService.cs
@@ -20,7 +20,6 @@ public interface IRefreshTokenService
     /// </summary>
     /// <param name="token">The refresh token.</param>
     /// <param name="client">The client.</param>
-    /// <returns></returns>
     Task<TokenValidationResult> ValidateRefreshTokenAsync(string token, Client client);
 
     /// <summary>
diff --git a/src/IdentityServer/Services/IReplayCache.cs b/src/IdentityServer/Services/IReplayCache.cs
index 9f19c5dda..11c1a7b87 100644
--- a/src/IdentityServer/Services/IReplayCache.cs
+++ b/src/IdentityServer/Services/IReplayCache.cs
@@ -20,7 +20,6 @@ public interface IReplayCache
     /// <param name="purpose"></param>
     /// <param name="handle"></param>
     /// <param name="expiration"></param>
-    /// <returns></returns>
     Task AddAsync(string purpose, string handle, DateTimeOffset expiration);
 
 
@@ -29,6 +28,5 @@ public interface IReplayCache
     /// </summary>
     /// <param name="purpose"></param>
     /// <param name="handle"></param>
-    /// <returns></returns>
     Task<bool> ExistsAsync(string purpose, string handle);
 }
diff --git a/src/IdentityServer/Services/IReturnUrlParser.cs b/src/IdentityServer/Services/IReturnUrlParser.cs
index 20f98a2c9..2079b7d42 100644
--- a/src/IdentityServer/Services/IReturnUrlParser.cs
+++ b/src/IdentityServer/Services/IReturnUrlParser.cs
@@ -18,7 +18,6 @@ public interface IReturnUrlParser
     /// Parses a return URL.
     /// </summary>
     /// <param name="returnUrl">The return URL.</param>
-    /// <returns></returns>
     Task<AuthorizationRequest?> ParseAsync(string returnUrl);
 
     /// <summary>
diff --git a/src/IdentityServer/Services/IUserCodeGenerator.cs b/src/IdentityServer/Services/IUserCodeGenerator.cs
index 8372d1f3c..cd5d6039d 100644
--- a/src/IdentityServer/Services/IUserCodeGenerator.cs
+++ b/src/IdentityServer/Services/IUserCodeGenerator.cs
@@ -32,6 +32,5 @@ public interface IUserCodeGenerator
     /// <summary>
     /// Generates the user code.
     /// </summary>
-    /// <returns></returns>
     Task<string> GenerateAsync();
 }
diff --git a/src/IdentityServer/Services/IUserCodeService.cs b/src/IdentityServer/Services/IUserCodeService.cs
index ef470fee4..1af3a01da 100644
--- a/src/IdentityServer/Services/IUserCodeService.cs
+++ b/src/IdentityServer/Services/IUserCodeService.cs
@@ -17,6 +17,5 @@ public interface IUserCodeService
     /// Gets the user code generator.
     /// </summary>
     /// <param name="userCodeType">Type of user code.</param>
-    /// <returns></returns>
     Task<IUserCodeGenerator?> GetGenerator(string userCodeType);
 }
diff --git a/src/IdentityServer/Services/IUserSession.cs b/src/IdentityServer/Services/IUserSession.cs
index 30daed96a..83205f920 100644
--- a/src/IdentityServer/Services/IUserSession.cs
+++ b/src/IdentityServer/Services/IUserSession.cs
@@ -29,13 +29,11 @@ public interface IUserSession
     /// <summary>
     /// Gets the current session identifier.
     /// </summary>
-    /// <returns></returns>
     Task<string?> GetSessionIdAsync();
 
     /// <summary>
     /// Ensures the session identifier cookie asynchronous.
     /// </summary>
-    /// <returns></returns>
     Task EnsureSessionIdCookieAsync();
 
     /// <summary>
@@ -47,12 +45,10 @@ public interface IUserSession
     /// Adds a client to the list of clients the user has signed into during their session.
     /// </summary>
     /// <param name="clientId">The client identifier.</param>
-    /// <returns></returns>
     Task AddClientIdAsync(string clientId);
 
     /// <summary>
     /// Gets the list of clients the user has signed into during their session.
     /// </summary>
-    /// <returns></returns>
     Task<IEnumerable<string>> GetClientListAsync();
 }
diff --git a/src/IdentityServer/Services/InMemory/InMemoryCorsPolicyService.cs b/src/IdentityServer/Services/InMemory/InMemoryCorsPolicyService.cs
index 71b644a60..aa420ab6b 100644
--- a/src/IdentityServer/Services/InMemory/InMemoryCorsPolicyService.cs
+++ b/src/IdentityServer/Services/InMemory/InMemoryCorsPolicyService.cs
@@ -42,7 +42,6 @@ public InMemoryCorsPolicyService(ILogger<InMemoryCorsPolicyService> logger, IEnu
     /// Determines whether origin is allowed.
     /// </summary>
     /// <param name="origin">The origin.</param>
-    /// <returns></returns>
     public virtual Task<bool> IsOriginAllowedAsync(string origin)
     {
         using var activity = Tracing.ServiceActivitySource.StartActivity("InMemoryCorsPolicyService.IsOriginAllowedAsync");
diff --git a/src/IdentityServer/Stores/Caching/CachingCorsPolicyService.cs b/src/IdentityServer/Stores/Caching/CachingCorsPolicyService.cs
index 1de4e1546..f929d832c 100644
--- a/src/IdentityServer/Stores/Caching/CachingCorsPolicyService.cs
+++ b/src/IdentityServer/Stores/Caching/CachingCorsPolicyService.cs
@@ -57,7 +57,6 @@ public CachingCorsPolicyService(IdentityServerOptions options,
     /// Determines whether origin is allowed.
     /// </summary>
     /// <param name="origin">The origin.</param>
-    /// <returns></returns>
     public virtual async Task<bool> IsOriginAllowedAsync(string origin)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("CachingCorsPolicyService.IsOriginAllowed");
diff --git a/src/IdentityServer/Stores/Default/DefaultAuthorizationCodeStore.cs b/src/IdentityServer/Stores/Default/DefaultAuthorizationCodeStore.cs
index 66b4046cd..b2cdf540e 100644
--- a/src/IdentityServer/Stores/Default/DefaultAuthorizationCodeStore.cs
+++ b/src/IdentityServer/Stores/Default/DefaultAuthorizationCodeStore.cs
@@ -36,7 +36,6 @@ public DefaultAuthorizationCodeStore(
     /// Stores the authorization code asynchronous.
     /// </summary>
     /// <param name="code">The code.</param>
-    /// <returns></returns>
     public Task<string> StoreAuthorizationCodeAsync(AuthorizationCode code)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("DefaultAuthorizationCodeStore.StoreAuthorizationCode");
@@ -48,7 +47,6 @@ public Task<string> StoreAuthorizationCodeAsync(AuthorizationCode code)
     /// Gets the authorization code asynchronous.
     /// </summary>
     /// <param name="code">The code.</param>
-    /// <returns></returns>
     public Task<AuthorizationCode> GetAuthorizationCodeAsync(string code)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("DefaultAuthorizationCodeStore.GetAuthorizationCode");
@@ -60,7 +58,6 @@ public Task<AuthorizationCode> GetAuthorizationCodeAsync(string code)
     /// Removes the authorization code asynchronous.
     /// </summary>
     /// <param name="code">The code.</param>
-    /// <returns></returns>
     public Task RemoveAuthorizationCodeAsync(string code)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("DefaultAuthorizationCodeStore.RemoveAuthorizationCode");
diff --git a/src/IdentityServer/Stores/Default/DefaultGrantStore.cs b/src/IdentityServer/Stores/Default/DefaultGrantStore.cs
index 107cd653e..02a5f015d 100644
--- a/src/IdentityServer/Stores/Default/DefaultGrantStore.cs
+++ b/src/IdentityServer/Stores/Default/DefaultGrantStore.cs
@@ -90,7 +90,6 @@ protected async Task<string> CreateHandleAsync()
     /// Gets the hashed key.
     /// </summary>
     /// <param name="value">The value.</param>
-    /// <returns></returns>
     protected virtual string GetHashedKey(string value)
     {
         var key = (value + KeySeparator + GrantType);
@@ -111,7 +110,6 @@ protected virtual string GetHashedKey(string value)
     /// Gets the item.
     /// </summary>
     /// <param name="key">The key.</param>
-    /// <returns></returns>
     protected virtual async Task<T> GetItemAsync(string key)
     {
         var hashedKey = GetHashedKey(key);
@@ -127,7 +125,6 @@ protected virtual async Task<T> GetItemAsync(string key)
     /// Gets the item by the hashed key.
     /// </summary>
     /// <param name="hashedKey"></param>
-    /// <returns></returns>
     protected virtual async Task<T> GetItemByHashedKeyAsync(string hashedKey)
     {
         var grant = await Store.GetAsync(hashedKey);
@@ -167,7 +164,6 @@ protected virtual async Task<IEnumerable<T>> GetAllAsync(PersistedGrantFilter fi
     /// <param name="description">The description.</param>
     /// <param name="created">The created.</param>
     /// <param name="lifetime">The lifetime.</param>
-    /// <returns></returns>
     protected virtual async Task<string> CreateItemAsync(T item, string clientId, string subjectId, string sessionId, string description, DateTime created, int lifetime)
     {
         var handle = await CreateHandleAsync();
@@ -187,7 +183,6 @@ protected virtual async Task<string> CreateItemAsync(T item, string clientId, st
     /// <param name="created">The created time.</param>
     /// <param name="expiration">The expiration.</param>
     /// <param name="consumedTime">The consumed time.</param>
-    /// <returns></returns>
     protected virtual Task StoreItemAsync(string key, T item, string clientId, string subjectId, string sessionId, string description, DateTime created, DateTime? expiration, DateTime? consumedTime = null)
     {
         key = GetHashedKey(key);
@@ -206,7 +201,6 @@ protected virtual Task StoreItemAsync(string key, T item, string clientId, strin
     /// <param name="created">The created time.</param>
     /// <param name="expiration">The expiration.</param>
     /// <param name="consumedTime">The consumed time.</param>
-    /// <returns></returns>
     protected virtual async Task StoreItemByHashedKeyAsync(string hashedKey, T item, string clientId, string subjectId, string sessionId, string description, DateTime created, DateTime? expiration, DateTime? consumedTime = null)
     {
         var json = Serializer.Serialize(item);
@@ -232,7 +226,6 @@ protected virtual async Task StoreItemByHashedKeyAsync(string hashedKey, T item,
     /// Removes the item.
     /// </summary>
     /// <param name="key">The key.</param>
-    /// <returns></returns>
     protected virtual Task RemoveItemAsync(string key)
     {
         key = GetHashedKey(key);
@@ -243,7 +236,6 @@ protected virtual Task RemoveItemAsync(string key)
     /// Removes the item.
     /// </summary>
     /// <param name="key">The key.</param>
-    /// <returns></returns>
     protected virtual async Task RemoveItemByHashedKeyAsync(string key)
     {
         await Store.RemoveAsync(key);
@@ -255,7 +247,6 @@ protected virtual async Task RemoveItemByHashedKeyAsync(string key)
     /// <param name="subjectId">The subject identifier.</param>
     /// <param name="clientId">The client identifier.</param>
     /// <param name="sessionId">The optional session identifier.</param>
-    /// <returns></returns>
     protected virtual async Task RemoveAllAsync(string subjectId, string clientId, string sessionId = null)
     {
         await Store.RemoveAllAsync(new PersistedGrantFilter
diff --git a/src/IdentityServer/Stores/Default/DefaultRefreshTokenStore.cs b/src/IdentityServer/Stores/Default/DefaultRefreshTokenStore.cs
index 6ab8cf4f6..63312d64f 100644
--- a/src/IdentityServer/Stores/Default/DefaultRefreshTokenStore.cs
+++ b/src/IdentityServer/Stores/Default/DefaultRefreshTokenStore.cs
@@ -35,7 +35,6 @@ public DefaultRefreshTokenStore(
     /// Stores the refresh token.
     /// </summary>
     /// <param name="refreshToken">The refresh token.</param>
-    /// <returns></returns>
     public async Task<string> StoreRefreshTokenAsync(RefreshToken refreshToken)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("DefaultRefreshTokenStore.StoreRefreshTokenAsync");
@@ -48,7 +47,6 @@ public async Task<string> StoreRefreshTokenAsync(RefreshToken refreshToken)
     /// </summary>
     /// <param name="handle">The handle.</param>
     /// <param name="refreshToken">The refresh token.</param>
-    /// <returns></returns>
     public Task UpdateRefreshTokenAsync(string handle, RefreshToken refreshToken)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("DefaultRefreshTokenStore.UpdateRefreshToken");
@@ -60,7 +58,6 @@ public Task UpdateRefreshTokenAsync(string handle, RefreshToken refreshToken)
     /// Gets the refresh token.
     /// </summary>
     /// <param name="refreshTokenHandle">The refresh token handle.</param>
-    /// <returns></returns>
     public Task<RefreshToken> GetRefreshTokenAsync(string refreshTokenHandle)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("DefaultRefreshTokenStore.GetRefreshToken");
@@ -72,7 +69,6 @@ public Task<RefreshToken> GetRefreshTokenAsync(string refreshTokenHandle)
     /// Removes the refresh token.
     /// </summary>
     /// <param name="refreshTokenHandle">The refresh token handle.</param>
-    /// <returns></returns>
     public Task RemoveRefreshTokenAsync(string refreshTokenHandle)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("DefaultRefreshTokenStore.RemoveRefreshToken");
@@ -85,7 +81,6 @@ public Task RemoveRefreshTokenAsync(string refreshTokenHandle)
     /// </summary>
     /// <param name="subjectId">The subject identifier.</param>
     /// <param name="clientId">The client identifier.</param>
-    /// <returns></returns>
     public Task RemoveRefreshTokensAsync(string subjectId, string clientId)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("DefaultRefreshTokenStore.RemoveRefreshTokens");
diff --git a/src/IdentityServer/Stores/Default/DefaultUserConsentStore.cs b/src/IdentityServer/Stores/Default/DefaultUserConsentStore.cs
index bb98ef06b..9552648af 100644
--- a/src/IdentityServer/Stores/Default/DefaultUserConsentStore.cs
+++ b/src/IdentityServer/Stores/Default/DefaultUserConsentStore.cs
@@ -46,7 +46,6 @@ private string GetConsentKey(string subjectId, string clientId, bool useHexEncod
     /// Stores the user consent asynchronous.
     /// </summary>
     /// <param name="consent">The consent.</param>
-    /// <returns></returns>
     public Task StoreUserConsentAsync(Consent consent)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("DefaultUserConsentStore.StoreUserConsent");
@@ -60,7 +59,6 @@ public Task StoreUserConsentAsync(Consent consent)
     /// </summary>
     /// <param name="subjectId">The subject identifier.</param>
     /// <param name="clientId">The client identifier.</param>
-    /// <returns></returns>
     public async Task<Consent> GetUserConsentAsync(string subjectId, string clientId)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("DefaultUserConsentStore.GetUserConsent");
@@ -86,7 +84,6 @@ public async Task<Consent> GetUserConsentAsync(string subjectId, string clientId
     /// </summary>
     /// <param name="subjectId">The subject identifier.</param>
     /// <param name="clientId">The client identifier.</param>
-    /// <returns></returns>
     public Task RemoveUserConsentAsync(string subjectId, string clientId)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("DefaultUserConsentStore.RemoveUserConsent");
diff --git a/src/IdentityServer/Stores/IAuthorizationParametersMessageStore.cs b/src/IdentityServer/Stores/IAuthorizationParametersMessageStore.cs
index e755e32b2..c9cd36d55 100644
--- a/src/IdentityServer/Stores/IAuthorizationParametersMessageStore.cs
+++ b/src/IdentityServer/Stores/IAuthorizationParametersMessageStore.cs
@@ -24,13 +24,11 @@ public interface IAuthorizationParametersMessageStore
     /// Reads the authorization parameters.
     /// </summary>
     /// <param name="id">The identifier.</param>
-    /// <returns></returns>
     Task<Message<IDictionary<string, string[]>>> ReadAsync(string id);
 
     /// <summary>
     /// Deletes the authorization parameters.
     /// </summary>
     /// <param name="id">The identifier.</param>
-    /// <returns></returns>
     Task DeleteAsync(string id);
 }
\ No newline at end of file
diff --git a/src/IdentityServer/Stores/IConsentMessageStore.cs b/src/IdentityServer/Stores/IConsentMessageStore.cs
index 0693e4994..790ac20c5 100644
--- a/src/IdentityServer/Stores/IConsentMessageStore.cs
+++ b/src/IdentityServer/Stores/IConsentMessageStore.cs
@@ -23,13 +23,11 @@ public interface IConsentMessageStore
     /// Reads the consent response message.
     /// </summary>
     /// <param name="id">The identifier.</param>
-    /// <returns></returns>
     Task<Message<ConsentResponse>> ReadAsync(string id);
 
     /// <summary>
     /// Deletes the consent response message.
     /// </summary>
     /// <param name="id">The identifier.</param>
-    /// <returns></returns>
     Task DeleteAsync(string id);
 }
\ No newline at end of file
diff --git a/src/IdentityServer/Stores/IMessageStore.cs b/src/IdentityServer/Stores/IMessageStore.cs
index d8207f059..2ec70c366 100644
--- a/src/IdentityServer/Stores/IMessageStore.cs
+++ b/src/IdentityServer/Stores/IMessageStore.cs
@@ -24,6 +24,5 @@ public interface IMessageStore<TModel>
     /// Reads the message.
     /// </summary>
     /// <param name="id">The identifier.</param>
-    /// <returns></returns>
     Task<Message<TModel>> ReadAsync(string id);
 }
\ No newline at end of file
diff --git a/src/IdentityServer/Stores/ISigningCredentialStore.cs b/src/IdentityServer/Stores/ISigningCredentialStore.cs
index 79283c7fe..b2a21de6f 100644
--- a/src/IdentityServer/Stores/ISigningCredentialStore.cs
+++ b/src/IdentityServer/Stores/ISigningCredentialStore.cs
@@ -15,6 +15,5 @@ public interface ISigningCredentialStore
     /// <summary>
     /// Gets the signing credentials.
     /// </summary>
-    /// <returns></returns>
     Task<SigningCredentials> GetSigningCredentialsAsync();
 }
\ No newline at end of file
diff --git a/src/IdentityServer/Stores/IValidationKeysStore.cs b/src/IdentityServer/Stores/IValidationKeysStore.cs
index 447311abf..0a0189142 100644
--- a/src/IdentityServer/Stores/IValidationKeysStore.cs
+++ b/src/IdentityServer/Stores/IValidationKeysStore.cs
@@ -16,6 +16,5 @@ public interface IValidationKeysStore
     /// <summary>
     /// Gets all validation keys.
     /// </summary>
-    /// <returns></returns>
     Task<IEnumerable<SecurityKeyInfo>> GetValidationKeysAsync();
 }
\ No newline at end of file
diff --git a/src/IdentityServer/Stores/InMemory/InMemoryDeviceFlowStore.cs b/src/IdentityServer/Stores/InMemory/InMemoryDeviceFlowStore.cs
index df45ff845..96ebcc9d5 100644
--- a/src/IdentityServer/Stores/InMemory/InMemoryDeviceFlowStore.cs
+++ b/src/IdentityServer/Stores/InMemory/InMemoryDeviceFlowStore.cs
@@ -23,7 +23,6 @@ public class InMemoryDeviceFlowStore : IDeviceFlowStore
     /// <param name="deviceCode">The device code.</param>
     /// <param name="userCode">The user code.</param>
     /// <param name="data">The data.</param>
-    /// <returns></returns>
     public Task StoreDeviceAuthorizationAsync(string deviceCode, string userCode, DeviceCode data)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("InMemoryDeviceFlowStore.StoreDeviceAuthorization");
@@ -98,7 +97,6 @@ public Task UpdateByUserCodeAsync(string userCode, DeviceCode data)
     /// Removes the device authorization, searching by device code.
     /// </summary>
     /// <param name="deviceCode">The device code.</param>
-    /// <returns></returns>
     public Task RemoveByDeviceCodeAsync(string deviceCode)
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("InMemoryDeviceFlowStore.RemoveByDeviceCode");
diff --git a/src/IdentityServer/Stores/InMemory/InMemorySigningCredentialsStore.cs b/src/IdentityServer/Stores/InMemory/InMemorySigningCredentialsStore.cs
index a94dfdada..7aec0e426 100644
--- a/src/IdentityServer/Stores/InMemory/InMemorySigningCredentialsStore.cs
+++ b/src/IdentityServer/Stores/InMemory/InMemorySigningCredentialsStore.cs
@@ -27,7 +27,6 @@ public InMemorySigningCredentialsStore(SigningCredentials credential)
     /// <summary>
     /// Gets the signing credentials.
     /// </summary>
-    /// <returns></returns>
     public Task<SigningCredentials> GetSigningCredentialsAsync()
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("InMemorySigningCredentialsStore.GetSigningCredentials");
diff --git a/src/IdentityServer/Stores/InMemory/InMemoryValidationKeysStore.cs b/src/IdentityServer/Stores/InMemory/InMemoryValidationKeysStore.cs
index d536a6342..44d1cf4e4 100644
--- a/src/IdentityServer/Stores/InMemory/InMemoryValidationKeysStore.cs
+++ b/src/IdentityServer/Stores/InMemory/InMemoryValidationKeysStore.cs
@@ -30,7 +30,6 @@ public InMemoryValidationKeysStore(IEnumerable<SecurityKeyInfo> keys)
     /// <summary>
     /// Gets all validation keys.
     /// </summary>
-    /// <returns></returns>
     public Task<IEnumerable<SecurityKeyInfo>> GetValidationKeysAsync()
     {
         using var activity = Tracing.StoreActivitySource.StartActivity("InMemoryValidationKeysStore.GetValidationKeys");
diff --git a/src/IdentityServer/Test/IdentityServerBuilderExtensions.cs b/src/IdentityServer/Test/IdentityServerBuilderExtensions.cs
index 977344fe9..1937cf52e 100644
--- a/src/IdentityServer/Test/IdentityServerBuilderExtensions.cs
+++ b/src/IdentityServer/Test/IdentityServerBuilderExtensions.cs
@@ -17,7 +17,6 @@ public static class IdentityServerBuilderExtensions
     /// </summary>
     /// <param name="builder">The builder.</param>
     /// <param name="users">The users.</param>
-    /// <returns></returns>
     public static IIdentityServerBuilder AddTestUsers(this IIdentityServerBuilder builder, List<TestUser> users)
     {
         builder.Services.AddSingleton(new TestUserStore(users));
diff --git a/src/IdentityServer/Test/TestUserProfileService.cs b/src/IdentityServer/Test/TestUserProfileService.cs
index 71cfdfb42..6579cb1f1 100644
--- a/src/IdentityServer/Test/TestUserProfileService.cs
+++ b/src/IdentityServer/Test/TestUserProfileService.cs
@@ -42,7 +42,6 @@ public TestUserProfileService(TestUserStore users, ILogger<TestUserProfileServic
     /// This method is called whenever claims about the user are requested (e.g. during token creation or via the userinfo endpoint)
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     public virtual Task GetProfileDataAsync(ProfileDataRequestContext context)
     {
         context.LogProfileRequest(Logger);
@@ -66,7 +65,6 @@ public virtual Task GetProfileDataAsync(ProfileDataRequestContext context)
     /// (e.g. during token issuance or validation).
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     public virtual Task IsActiveAsync(IsActiveContext context)
     {
         Logger.LogDebug("IsActive called from: {caller}", context.Caller);
diff --git a/src/IdentityServer/Test/TestUserResourceOwnerPasswordValidator.cs b/src/IdentityServer/Test/TestUserResourceOwnerPasswordValidator.cs
index 9c84d9072..7b93d7681 100644
--- a/src/IdentityServer/Test/TestUserResourceOwnerPasswordValidator.cs
+++ b/src/IdentityServer/Test/TestUserResourceOwnerPasswordValidator.cs
@@ -33,7 +33,6 @@ public TestUserResourceOwnerPasswordValidator(TestUserStore users, IClock clock)
     /// Validates the resource owner password credential
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     public Task ValidateAsync(ResourceOwnerPasswordValidationContext context)
     {
         if (_users.ValidateCredentials(context.UserName, context.Password))
diff --git a/src/IdentityServer/Test/TestUserStore.cs b/src/IdentityServer/Test/TestUserStore.cs
index bad3d63b3..27d765aab 100644
--- a/src/IdentityServer/Test/TestUserStore.cs
+++ b/src/IdentityServer/Test/TestUserStore.cs
@@ -32,7 +32,6 @@ public TestUserStore(List<TestUser> users)
     /// </summary>
     /// <param name="username">The username.</param>
     /// <param name="password">The password.</param>
-    /// <returns></returns>
     public bool ValidateCredentials(string username, string password)
     {
         var user = FindByUsername(username);
@@ -54,7 +53,6 @@ public bool ValidateCredentials(string username, string password)
     /// Finds the user by subject identifier.
     /// </summary>
     /// <param name="subjectId">The subject identifier.</param>
-    /// <returns></returns>
     public TestUser FindBySubjectId(string subjectId)
     {
         return _users.FirstOrDefault(x => x.SubjectId == subjectId);
@@ -64,7 +62,6 @@ public TestUser FindBySubjectId(string subjectId)
     /// Finds the user by username.
     /// </summary>
     /// <param name="username">The username.</param>
-    /// <returns></returns>
     public TestUser FindByUsername(string username)
     {
         return _users.FirstOrDefault(x => x.Username.Equals(username, StringComparison.OrdinalIgnoreCase));
@@ -75,7 +72,6 @@ public TestUser FindByUsername(string username)
     /// </summary>
     /// <param name="provider">The provider.</param>
     /// <param name="userId">The user identifier.</param>
-    /// <returns></returns>
     public TestUser FindByExternalProvider(string provider, string userId)
     {
         return _users.FirstOrDefault(x =>
@@ -89,7 +85,6 @@ public TestUser FindByExternalProvider(string provider, string userId)
     /// <param name="provider">The provider.</param>
     /// <param name="userId">The user identifier.</param>
     /// <param name="claims">The claims.</param>
-    /// <returns></returns>
     public TestUser AutoProvisionUser(string provider, string userId, List<Claim> claims)
     {
         // create a list of claims that we want to transfer into our store
@@ -158,7 +153,6 @@ public TestUser AutoProvisionUser(string provider, string userId, List<Claim> cl
     /// <summary>
     /// Adds a new a user.
     /// </summary>
-    /// <returns></returns>
     public TestUser CreateUser(string username, string password, string name = null, string email = null)
     {
         if (_users.Any(x => x.Username == username))
diff --git a/src/IdentityServer/Validation/Default/ApiSecretValidator.cs b/src/IdentityServer/Validation/Default/ApiSecretValidator.cs
index 85aa08ac0..dc88fa15b 100644
--- a/src/IdentityServer/Validation/Default/ApiSecretValidator.cs
+++ b/src/IdentityServer/Validation/Default/ApiSecretValidator.cs
@@ -44,7 +44,6 @@ public ApiSecretValidator(IResourceStore resources, ISecretsListParser parsers,
     /// Validates the secret on the current request.
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     public async Task<ApiSecretValidationResult> ValidateAsync(HttpContext context)
     {
         using var activity = Tracing.ValidationActivitySource.StartActivity("ApiSecretValidator.Validate");
diff --git a/src/IdentityServer/Validation/Default/BearerTokenUsageValidator.cs b/src/IdentityServer/Validation/Default/BearerTokenUsageValidator.cs
index 7c355113d..9625e4b17 100644
--- a/src/IdentityServer/Validation/Default/BearerTokenUsageValidator.cs
+++ b/src/IdentityServer/Validation/Default/BearerTokenUsageValidator.cs
@@ -31,7 +31,6 @@ public BearerTokenUsageValidator(ILogger<BearerTokenUsageValidator> logger)
     /// Validates the request.
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     public async Task<BearerTokenUsageValidationResult> ValidateAsync(HttpContext context)
     {
         var result = ValidateAuthorizationHeader(context);
@@ -59,7 +58,6 @@ public async Task<BearerTokenUsageValidationResult> ValidateAsync(HttpContext co
     /// Validates the authorization header.
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     public BearerTokenUsageValidationResult ValidateAuthorizationHeader(HttpContext context)
     {
         var authorizationHeader = context.Request.Headers["Authorization"].FirstOrDefault();
@@ -92,7 +90,6 @@ public BearerTokenUsageValidationResult ValidateAuthorizationHeader(HttpContext
     /// Validates the post body.
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     public async Task<BearerTokenUsageValidationResult> ValidatePostBodyAsync(HttpContext context)
     {
         var token = (await context.Request.ReadFormAsync())["access_token"].FirstOrDefault();
diff --git a/src/IdentityServer/Validation/Default/ClientSecretValidator.cs b/src/IdentityServer/Validation/Default/ClientSecretValidator.cs
index 07a7a3dfc..e8a7cb193 100644
--- a/src/IdentityServer/Validation/Default/ClientSecretValidator.cs
+++ b/src/IdentityServer/Validation/Default/ClientSecretValidator.cs
@@ -44,7 +44,6 @@ public ClientSecretValidator(IClientStore clients, ISecretsListParser parser, IS
     /// Validates the current request.
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     public async Task<ClientSecretValidationResult> ValidateAsync(HttpContext context)
     {
         using var activity = Tracing.ValidationActivitySource.StartActivity("ClientSecretValidator.Validate");
diff --git a/src/IdentityServer/Validation/Default/DefaultClientConfigurationValidator.cs b/src/IdentityServer/Validation/Default/DefaultClientConfigurationValidator.cs
index bb0bd88b5..32d11251a 100644
--- a/src/IdentityServer/Validation/Default/DefaultClientConfigurationValidator.cs
+++ b/src/IdentityServer/Validation/Default/DefaultClientConfigurationValidator.cs
@@ -31,7 +31,6 @@ public DefaultClientConfigurationValidator(IdentityServerOptions options)
     /// Determines whether the configuration of a client is valid.
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     public async Task ValidateAsync(ClientConfigurationValidationContext context)
     {
         using var activity = Tracing.ValidationActivitySource.StartActivity("DefaultClientConfigurationValidator.Validate");
@@ -65,7 +64,6 @@ public async Task ValidateAsync(ClientConfigurationValidationContext context)
     /// Validates grant type related configuration settings.
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     protected virtual Task ValidateGrantTypesAsync(ClientConfigurationValidationContext context)
     {
         if (context.Client.AllowedGrantTypes?.Any() != true)
@@ -80,7 +78,6 @@ protected virtual Task ValidateGrantTypesAsync(ClientConfigurationValidationCont
     /// Validates lifetime related configuration settings.
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     protected virtual Task ValidateLifetimesAsync(ClientConfigurationValidationContext context)
     {
         if (context.Client.AccessTokenLifetime <= 0)
@@ -122,7 +119,6 @@ protected virtual Task ValidateLifetimesAsync(ClientConfigurationValidationConte
     /// Validates redirect URI related configuration.
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     protected virtual Task ValidateRedirectUriAsync(ClientConfigurationValidationContext context)
     {
         if (context.Client.AllowedGrantTypes?.Any() == true)
@@ -152,7 +148,6 @@ protected virtual Task ValidateRedirectUriAsync(ClientConfigurationValidationCon
     /// Validates allowed CORS origins for valid format.
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     protected virtual Task ValidateAllowedCorsOriginsAsync(ClientConfigurationValidationContext context)
     {
         if (context.Client.AllowedCorsOrigins?.Any() == true)
@@ -193,7 +188,6 @@ protected virtual Task ValidateAllowedCorsOriginsAsync(ClientConfigurationValida
     /// Validates that URI schemes is not in the list of invalid URI scheme prefixes, as controlled by the ValidationOptions.
     /// </summary>
     /// <param name="context"></param>
-    /// <returns></returns>
     protected virtual Task ValidateUriSchemesAsync(ClientConfigurationValidationContext context)
     {
         if (context.Client.RedirectUris?.Any() == true)
@@ -227,7 +221,6 @@ protected virtual Task ValidateUriSchemesAsync(ClientConfigurationValidationCont
     /// Validates secret related configuration.
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     protected virtual Task ValidateSecretsAsync(ClientConfigurationValidationContext context)
     {
         if (context.Client.AllowedGrantTypes?.Any() == true)
@@ -252,7 +245,6 @@ protected virtual Task ValidateSecretsAsync(ClientConfigurationValidationContext
     /// Validates properties related configuration settings.
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     protected virtual Task ValidatePropertiesAsync(ClientConfigurationValidationContext context)
     {
         return Task.CompletedTask;
diff --git a/src/IdentityServer/Validation/Default/DefaultDPoPProofValidator.cs b/src/IdentityServer/Validation/Default/DefaultDPoPProofValidator.cs
index 316e9c3e8..53be18c56 100644
--- a/src/IdentityServer/Validation/Default/DefaultDPoPProofValidator.cs
+++ b/src/IdentityServer/Validation/Default/DefaultDPoPProofValidator.cs
@@ -493,7 +493,6 @@ protected virtual async Task ValidateNonceAsync(DPoPProofValidatonContext contex
     /// <summary>
     /// Creates a nonce value to return to the client.
     /// </summary>
-    /// <returns></returns>
     protected virtual string CreateNonce(DPoPProofValidatonContext context, DPoPProofValidatonResult result)
     {
         var now = Clock.UtcNow.ToUnixTimeSeconds();
@@ -503,7 +502,6 @@ protected virtual string CreateNonce(DPoPProofValidatonContext context, DPoPProo
     /// <summary>
     /// Reads the time the nonce was created.
     /// </summary>
-    /// <returns></returns>
     protected virtual ValueTask<long> GetUnixTimeFromNonceAsync(DPoPProofValidatonContext context, DPoPProofValidatonResult result)
     {
         try
diff --git a/src/IdentityServer/Validation/Default/DefaultResourceValidator.cs b/src/IdentityServer/Validation/Default/DefaultResourceValidator.cs
index 5ce2b605c..32875c90d 100644
--- a/src/IdentityServer/Validation/Default/DefaultResourceValidator.cs
+++ b/src/IdentityServer/Validation/Default/DefaultResourceValidator.cs
@@ -119,7 +119,6 @@ public virtual async Task<ResourceValidationResult> ValidateRequestedResourcesAs
     /// <param name="resourcesFromStore"></param>
     /// <param name="requestedScope"></param>
     /// <param name="result"></param>
-    /// <returns></returns>
     protected virtual async Task ValidateScopeAsync(
         Client client,
         Resources resourcesFromStore,
@@ -188,7 +187,6 @@ protected virtual async Task ValidateScopeAsync(
     /// </summary>
     /// <param name="client"></param>
     /// <param name="identity"></param>
-    /// <returns></returns>
     protected virtual Task<bool> IsClientAllowedIdentityResourceAsync(Client client, IdentityResource identity)
     {
         var allowed = client.AllowedScopes.Contains(identity.Name);
@@ -204,7 +202,6 @@ protected virtual Task<bool> IsClientAllowedIdentityResourceAsync(Client client,
     /// </summary>
     /// <param name="client"></param>
     /// <param name="apiScope"></param>
-    /// <returns></returns>
     protected virtual Task<bool> IsClientAllowedApiScopeAsync(Client client, ApiScope apiScope)
     {
         var allowed = client.AllowedScopes.Contains(apiScope.Name);
@@ -219,7 +216,6 @@ protected virtual Task<bool> IsClientAllowedApiScopeAsync(Client client, ApiScop
     /// Validates if the client is allowed offline_access.
     /// </summary>
     /// <param name="client"></param>
-    /// <returns></returns>
     protected virtual Task<bool> IsClientAllowedOfflineAccessAsync(Client client)
     {
         var allowed = client.AllowOfflineAccess;
diff --git a/src/IdentityServer/Validation/Default/DefaultScopeParser.cs b/src/IdentityServer/Validation/Default/DefaultScopeParser.cs
index c761fecb1..e76333634 100644
--- a/src/IdentityServer/Validation/Default/DefaultScopeParser.cs
+++ b/src/IdentityServer/Validation/Default/DefaultScopeParser.cs
@@ -65,7 +65,6 @@ public ParsedScopesResult ParseScopeValues(IEnumerable<string> scopeValues)
     /// Parses a scope value.
     /// </summary>
     /// <param name="scopeContext"></param>
-    /// <returns></returns>
     public virtual void ParseScopeValue(ParseScopeContext scopeContext)
     {
         // nop leaves the raw scope value as a success result.
diff --git a/src/IdentityServer/Validation/Default/DeviceCodeValidator.cs b/src/IdentityServer/Validation/Default/DeviceCodeValidator.cs
index 5b8f34e00..ff1fd51a8 100644
--- a/src/IdentityServer/Validation/Default/DeviceCodeValidator.cs
+++ b/src/IdentityServer/Validation/Default/DeviceCodeValidator.cs
@@ -49,7 +49,6 @@ public DeviceCodeValidator(
     /// Validates the device code.
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     public async Task ValidateAsync(DeviceCodeValidationContext context)
     {
         using var activity = Tracing.BasicActivitySource.StartActivity("DeviceCodeValidator.Validate");
diff --git a/src/IdentityServer/Validation/Default/EndSessionRequestValidator.cs b/src/IdentityServer/Validation/Default/EndSessionRequestValidator.cs
index b3e79360f..363c71af0 100644
--- a/src/IdentityServer/Validation/Default/EndSessionRequestValidator.cs
+++ b/src/IdentityServer/Validation/Default/EndSessionRequestValidator.cs
@@ -189,7 +189,6 @@ public async Task<EndSessionValidationResult> ValidateAsync(NameValueCollection
     /// </summary>
     /// <param name="message"></param>
     /// <param name="request"></param>
-    /// <returns></returns>
     protected virtual EndSessionValidationResult Invalid(string message, ValidatedEndSessionRequest request = null)
     {
         message = "End session request validation failure: " + message;
diff --git a/src/IdentityServer/Validation/Default/ExtensionGrantValidator.cs b/src/IdentityServer/Validation/Default/ExtensionGrantValidator.cs
index a690052b5..735fb37d8 100644
--- a/src/IdentityServer/Validation/Default/ExtensionGrantValidator.cs
+++ b/src/IdentityServer/Validation/Default/ExtensionGrantValidator.cs
@@ -41,7 +41,6 @@ public ExtensionGrantValidator(IEnumerable<IExtensionGrantValidator> validators,
     /// <summary>
     /// Gets the available grant types.
     /// </summary>
-    /// <returns></returns>
     public IEnumerable<string> GetAvailableGrantTypes()
     {
         return _validators.Select(v => v.GrantType);
@@ -51,7 +50,6 @@ public IEnumerable<string> GetAvailableGrantTypes()
     /// Validates the request.
     /// </summary>
     /// <param name="request">The request.</param>
-    /// <returns></returns>
     public async Task<GrantValidationResult> ValidateAsync(ValidatedTokenRequest request)
     {
         var validator = _validators.FirstOrDefault(v => v.GrantType.Equals(request.GrantType, StringComparison.Ordinal));
diff --git a/src/IdentityServer/Validation/Default/JwtRequestValidator.cs b/src/IdentityServer/Validation/Default/JwtRequestValidator.cs
index 5ed7a3f9d..2dc03a361 100644
--- a/src/IdentityServer/Validation/Default/JwtRequestValidator.cs
+++ b/src/IdentityServer/Validation/Default/JwtRequestValidator.cs
@@ -147,7 +147,6 @@ public virtual async Task<JwtRequestValidationResult> ValidateAsync(JwtRequestVa
     /// Retrieves keys for a given client
     /// </summary>
     /// <param name="client">The client</param>
-    /// <returns></returns>
     protected virtual Task<List<SecurityKey>> GetKeysAsync(Client client)
     {
         return client.ClientSecrets.GetKeysAsync();
@@ -193,7 +192,6 @@ protected virtual async Task<JsonWebToken> ValidateJwtAsync(JwtRequestValidation
     /// </summary>
     /// <param name="context"></param>
     /// <param name="token">The JWT token</param>
-    /// <returns></returns>
     protected virtual Task<List<Claim>> ProcessPayloadAsync(JwtRequestValidationContext context, JsonWebToken token)
     {
         // filter JWT validation values
diff --git a/src/IdentityServer/Validation/Default/MutualTlsSecretParser.cs b/src/IdentityServer/Validation/Default/MutualTlsSecretParser.cs
index 3400742d5..6e82a7bb9 100644
--- a/src/IdentityServer/Validation/Default/MutualTlsSecretParser.cs
+++ b/src/IdentityServer/Validation/Default/MutualTlsSecretParser.cs
@@ -41,7 +41,6 @@ public MutualTlsSecretParser(IdentityServerOptions options, ILogger<MutualTlsSec
     /// Parses the HTTP context
     /// </summary>
     /// <param name="context"></param>
-    /// <returns></returns>
     public async Task<ParsedSecret> ParseAsync(HttpContext context)
     {
         _logger.LogDebug("Start parsing for client id in post body");
diff --git a/src/IdentityServer/Validation/Default/NopClientConfigurationValidator.cs b/src/IdentityServer/Validation/Default/NopClientConfigurationValidator.cs
index d421145a6..fb737f4e2 100644
--- a/src/IdentityServer/Validation/Default/NopClientConfigurationValidator.cs
+++ b/src/IdentityServer/Validation/Default/NopClientConfigurationValidator.cs
@@ -16,7 +16,6 @@ public class NopClientConfigurationValidator : IClientConfigurationValidator
     /// Determines whether the configuration of a client is valid.
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     public Task ValidateAsync(ClientConfigurationValidationContext context)
     {
         context.IsValid = true;
diff --git a/src/IdentityServer/Validation/Default/NotSupportedResouceOwnerCredentialValidator.cs b/src/IdentityServer/Validation/Default/NotSupportedResouceOwnerCredentialValidator.cs
index 6e53fddaf..e3c1b12d0 100644
--- a/src/IdentityServer/Validation/Default/NotSupportedResouceOwnerCredentialValidator.cs
+++ b/src/IdentityServer/Validation/Default/NotSupportedResouceOwnerCredentialValidator.cs
@@ -29,7 +29,6 @@ public NotSupportedResourceOwnerPasswordValidator(ILogger<NotSupportedResourceOw
     /// Validates the resource owner password credential
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     public Task ValidateAsync(ResourceOwnerPasswordValidationContext context)
     {
         context.Result = new GrantValidationResult(TokenRequestErrors.UnsupportedGrantType);
diff --git a/src/IdentityServer/Validation/Default/SecretParser.cs b/src/IdentityServer/Validation/Default/SecretParser.cs
index f2df85c4b..1fc0ad823 100644
--- a/src/IdentityServer/Validation/Default/SecretParser.cs
+++ b/src/IdentityServer/Validation/Default/SecretParser.cs
@@ -35,7 +35,6 @@ public SecretParser(IEnumerable<ISecretParser> parsers, ILogger<ISecretsListPars
     /// Checks the context to find a secret.
     /// </summary>
     /// <param name="context">The HTTP context.</param>
-    /// <returns></returns>
     public async Task<ParsedSecret> ParseAsync(HttpContext context)
     {
         // see if a registered parser finds a secret on the request
@@ -69,7 +68,6 @@ public async Task<ParsedSecret> ParseAsync(HttpContext context)
     /// <summary>
     /// Gets all available authentication methods.
     /// </summary>
-    /// <returns></returns>
     public IEnumerable<string> GetAvailableAuthenticationMethods()
     {
         return _parsers.Select(p => p.AuthenticationMethod).Where(p => !String.IsNullOrWhiteSpace(p));
diff --git a/src/IdentityServer/Validation/Default/SecretValidator.cs b/src/IdentityServer/Validation/Default/SecretValidator.cs
index 58527d3e7..9fa87b21b 100644
--- a/src/IdentityServer/Validation/Default/SecretValidator.cs
+++ b/src/IdentityServer/Validation/Default/SecretValidator.cs
@@ -38,7 +38,6 @@ public SecretValidator(IClock clock, IEnumerable<ISecretValidator> validators, I
     /// </summary>
     /// <param name="parsedSecret">The parsed secret.</param>
     /// <param name="secrets">The secrets.</param>
-    /// <returns></returns>
     public async Task<SecretValidationResult> ValidateAsync(IEnumerable<Secret> secrets, ParsedSecret parsedSecret)
     {
         var secretsArray = secrets as Secret[] ?? secrets.ToArray();
diff --git a/src/IdentityServer/Validation/Default/StrictRedirectUriValidator.cs b/src/IdentityServer/Validation/Default/StrictRedirectUriValidator.cs
index bce157335..07417571c 100644
--- a/src/IdentityServer/Validation/Default/StrictRedirectUriValidator.cs
+++ b/src/IdentityServer/Validation/Default/StrictRedirectUriValidator.cs
@@ -34,7 +34,6 @@ public StrictRedirectUriValidator(IdentityServerOptions options = null)
     /// </summary>
     /// <param name="uris">The uris.</param>
     /// <param name="requestedUri">The requested URI.</param>
-    /// <returns></returns>
     protected bool StringCollectionContainsString(IEnumerable<string> uris, string requestedUri)
     {
         if (IEnumerableExtensions.IsNullOrEmpty(uris)) return false;
diff --git a/src/IdentityServer/Validation/Default/TokenRevocationRequestValidator.cs b/src/IdentityServer/Validation/Default/TokenRevocationRequestValidator.cs
index 09ccc1d17..e662cc239 100644
--- a/src/IdentityServer/Validation/Default/TokenRevocationRequestValidator.cs
+++ b/src/IdentityServer/Validation/Default/TokenRevocationRequestValidator.cs
@@ -34,7 +34,6 @@ public TokenRevocationRequestValidator(ILogger<TokenRevocationRequestValidator>
     /// </summary>
     /// <param name="parameters">The parameters.</param>
     /// <param name="client">The client.</param>
-    /// <returns></returns>
     /// <exception cref="System.ArgumentNullException">
     /// parameters
     /// or
diff --git a/src/IdentityServer/Validation/Default/UserInfoRequestValidator.cs b/src/IdentityServer/Validation/Default/UserInfoRequestValidator.cs
index 6ca209d15..044234191 100644
--- a/src/IdentityServer/Validation/Default/UserInfoRequestValidator.cs
+++ b/src/IdentityServer/Validation/Default/UserInfoRequestValidator.cs
@@ -48,7 +48,6 @@ public UserInfoRequestValidator(
     /// Validates a userinfo request.
     /// </summary>
     /// <param name="accessToken">The access token.</param>
-    /// <returns></returns>
     /// <exception cref="System.NotImplementedException"></exception>
     public async Task<UserInfoRequestValidationResult> ValidateRequestAsync(string accessToken)
     {
diff --git a/src/IdentityServer/Validation/IApiSecretValidator.cs b/src/IdentityServer/Validation/IApiSecretValidator.cs
index 91cd843f6..ad3831a95 100644
--- a/src/IdentityServer/Validation/IApiSecretValidator.cs
+++ b/src/IdentityServer/Validation/IApiSecretValidator.cs
@@ -18,6 +18,5 @@ public interface IApiSecretValidator
     /// Tries to authenticate an API client based on the incoming request
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     Task<ApiSecretValidationResult> ValidateAsync(HttpContext context);
 }
diff --git a/src/IdentityServer/Validation/IAuthorizeRequestValidator.cs b/src/IdentityServer/Validation/IAuthorizeRequestValidator.cs
index 40dfebaa6..76dfa8f0b 100644
--- a/src/IdentityServer/Validation/IAuthorizeRequestValidator.cs
+++ b/src/IdentityServer/Validation/IAuthorizeRequestValidator.cs
@@ -19,6 +19,5 @@ public interface IAuthorizeRequestValidator
     /// <param name="parameters"></param>
     /// <param name="subject"></param>
     /// <param name="authorizeRequestType"></param>
-    /// <returns></returns>
     Task<AuthorizeRequestValidationResult> ValidateAsync(NameValueCollection parameters, ClaimsPrincipal subject = null, AuthorizeRequestType authorizeRequestType = AuthorizeRequestType.Authorize);
 }
\ No newline at end of file
diff --git a/src/IdentityServer/Validation/IBackchannelAuthenticationRequestIdValidator.cs b/src/IdentityServer/Validation/IBackchannelAuthenticationRequestIdValidator.cs
index 862c302e6..e042f1aaf 100644
--- a/src/IdentityServer/Validation/IBackchannelAuthenticationRequestIdValidator.cs
+++ b/src/IdentityServer/Validation/IBackchannelAuthenticationRequestIdValidator.cs
@@ -15,6 +15,5 @@ public interface IBackchannelAuthenticationRequestIdValidator
     /// Validates the authentication request id.
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     Task ValidateAsync(BackchannelAuthenticationRequestIdValidationContext context);
 }
\ No newline at end of file
diff --git a/src/IdentityServer/Validation/IBackchannelAuthenticationRequestValidator.cs b/src/IdentityServer/Validation/IBackchannelAuthenticationRequestValidator.cs
index c79cbb780..5562c161b 100644
--- a/src/IdentityServer/Validation/IBackchannelAuthenticationRequestValidator.cs
+++ b/src/IdentityServer/Validation/IBackchannelAuthenticationRequestValidator.cs
@@ -17,6 +17,5 @@ public interface IBackchannelAuthenticationRequestValidator
     /// </summary>
     /// <param name="parameters">The parameters.</param>
     /// <param name="clientValidationResult">The client validation result.</param>
-    /// <returns></returns>
     Task<BackchannelAuthenticationRequestValidationResult> ValidateRequestAsync(NameValueCollection parameters, ClientSecretValidationResult clientValidationResult);
 }
\ No newline at end of file
diff --git a/src/IdentityServer/Validation/IBackchannelAuthenticationUserValidator.cs b/src/IdentityServer/Validation/IBackchannelAuthenticationUserValidator.cs
index 7ab41a20f..d76427dea 100644
--- a/src/IdentityServer/Validation/IBackchannelAuthenticationUserValidator.cs
+++ b/src/IdentityServer/Validation/IBackchannelAuthenticationUserValidator.cs
@@ -17,6 +17,5 @@ public interface IBackchannelAuthenticationUserValidator
     /// Validates the user.
     /// </summary>
     /// <param name="userValidatorContext"></param>
-    /// <returns></returns>
     Task<BackchannelAuthenticationUserValidationResult> ValidateRequestAsync(BackchannelAuthenticationUserValidatorContext userValidatorContext);
 }
diff --git a/src/IdentityServer/Validation/IClientConfigurationValidator.cs b/src/IdentityServer/Validation/IClientConfigurationValidator.cs
index 58dfc7fb1..635960be9 100644
--- a/src/IdentityServer/Validation/IClientConfigurationValidator.cs
+++ b/src/IdentityServer/Validation/IClientConfigurationValidator.cs
@@ -17,6 +17,5 @@ public interface IClientConfigurationValidator
     /// Determines whether the configuration of a client is valid.
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     Task ValidateAsync(ClientConfigurationValidationContext context);
 }
diff --git a/src/IdentityServer/Validation/IClientSecretValidator.cs b/src/IdentityServer/Validation/IClientSecretValidator.cs
index f35a5e350..234931210 100644
--- a/src/IdentityServer/Validation/IClientSecretValidator.cs
+++ b/src/IdentityServer/Validation/IClientSecretValidator.cs
@@ -18,6 +18,5 @@ public interface IClientSecretValidator
     /// Tries to authenticate a client based on the incoming request
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     Task<ClientSecretValidationResult> ValidateAsync(HttpContext context);
 }
diff --git a/src/IdentityServer/Validation/ICustomBackchannelAuthenticationValidator.cs b/src/IdentityServer/Validation/ICustomBackchannelAuthenticationValidator.cs
index 13df9450d..37a6ade2d 100644
--- a/src/IdentityServer/Validation/ICustomBackchannelAuthenticationValidator.cs
+++ b/src/IdentityServer/Validation/ICustomBackchannelAuthenticationValidator.cs
@@ -15,6 +15,5 @@ public interface ICustomBackchannelAuthenticationValidator
     /// Validates a CIBA authentication request.
     /// </summary>
     /// <param name="customValidationContext"></param>
-    /// <returns></returns>
     Task ValidateAsync(CustomBackchannelAuthenticationRequestValidationContext customValidationContext);
 }
diff --git a/src/IdentityServer/Validation/IDeviceAuthorizationRequestValidator.cs b/src/IdentityServer/Validation/IDeviceAuthorizationRequestValidator.cs
index 6e28f5950..4140e7c9e 100644
--- a/src/IdentityServer/Validation/IDeviceAuthorizationRequestValidator.cs
+++ b/src/IdentityServer/Validation/IDeviceAuthorizationRequestValidator.cs
@@ -17,6 +17,5 @@ public interface IDeviceAuthorizationRequestValidator
     /// </summary>
     /// <param name="parameters"></param>
     /// <param name="clientValidationResult"></param>
-    /// <returns></returns>
     Task<DeviceAuthorizationRequestValidationResult> ValidateAsync(NameValueCollection parameters, ClientSecretValidationResult clientValidationResult);
 }
\ No newline at end of file
diff --git a/src/IdentityServer/Validation/IDeviceCodeValidator.cs b/src/IdentityServer/Validation/IDeviceCodeValidator.cs
index 918602257..1cc0d65b7 100644
--- a/src/IdentityServer/Validation/IDeviceCodeValidator.cs
+++ b/src/IdentityServer/Validation/IDeviceCodeValidator.cs
@@ -15,6 +15,5 @@ public interface IDeviceCodeValidator
     /// Validates the device code.
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     Task ValidateAsync(DeviceCodeValidationContext context);
 }
\ No newline at end of file
diff --git a/src/IdentityServer/Validation/IEndSessionRequestValidator.cs b/src/IdentityServer/Validation/IEndSessionRequestValidator.cs
index eff944cbf..de51161c7 100644
--- a/src/IdentityServer/Validation/IEndSessionRequestValidator.cs
+++ b/src/IdentityServer/Validation/IEndSessionRequestValidator.cs
@@ -20,13 +20,11 @@ public interface IEndSessionRequestValidator
     /// </summary>
     /// <param name="parameters"></param>
     /// <param name="subject"></param>
-    /// <returns></returns>
     Task<EndSessionValidationResult> ValidateAsync(NameValueCollection parameters, ClaimsPrincipal subject);
 
     /// <summary>
     ///  Validates requests from logout page iframe to trigger single signout.
     /// </summary>
     /// <param name="parameters"></param>
-    /// <returns></returns>
     Task<EndSessionCallbackValidationResult> ValidateCallbackAsync(NameValueCollection parameters);
 }
diff --git a/src/IdentityServer/Validation/IIdentityProviderConfigurationValidator.cs b/src/IdentityServer/Validation/IIdentityProviderConfigurationValidator.cs
index 795ae1934..ef6e77406 100644
--- a/src/IdentityServer/Validation/IIdentityProviderConfigurationValidator.cs
+++ b/src/IdentityServer/Validation/IIdentityProviderConfigurationValidator.cs
@@ -17,6 +17,5 @@ public interface IIdentityProviderConfigurationValidator
     /// Determines whether the configuration of an identity provider is valid.
     /// </summary>
     /// <param name="context">The context.</param>
-    /// <returns></returns>
     Task ValidateAsync(IdentityProviderConfigurationValidationContext context);
 }
diff --git a/src/IdentityServer/Validation/ISecretsListParser.cs b/src/IdentityServer/Validation/ISecretsListParser.cs
index 307a4eb45..694cf11ff 100644
--- a/src/IdentityServer/Validation/ISecretsListParser.cs
+++ b/src/IdentityServer/Validation/ISecretsListParser.cs
@@ -28,6 +28,5 @@ public interface ISecretsListParser
     /// <summary>
     /// Gets all available authentication methods.
     /// </summary>
-    /// <returns></returns>
     IEnumerable<string> GetAvailableAuthenticationMethods();
 }
diff --git a/src/IdentityServer/Validation/ITokenRevocationRequestValidator.cs b/src/IdentityServer/Validation/ITokenRevocationRequestValidator.cs
index b0cb89491..1489b36b1 100644
--- a/src/IdentityServer/Validation/ITokenRevocationRequestValidator.cs
+++ b/src/IdentityServer/Validation/ITokenRevocationRequestValidator.cs
@@ -18,6 +18,5 @@ public interface ITokenRevocationRequestValidator
     /// </summary>
     /// <param name="parameters">The parameters.</param>
     /// <param name="client">The client.</param>
-    /// <returns></returns>
     Task<TokenRevocationRequestValidationResult> ValidateRequestAsync(NameValueCollection parameters, Client client);
 }
\ No newline at end of file
diff --git a/src/IdentityServer/Validation/ITokenValidator.cs b/src/IdentityServer/Validation/ITokenValidator.cs
index 0cc464c84..a2f259640 100644
--- a/src/IdentityServer/Validation/ITokenValidator.cs
+++ b/src/IdentityServer/Validation/ITokenValidator.cs
@@ -16,7 +16,6 @@ public interface ITokenValidator
     /// </summary>
     /// <param name="token">The access token.</param>
     /// <param name="expectedScope">The expected scope.</param>
-    /// <returns></returns>
     Task<TokenValidationResult> ValidateAccessTokenAsync(string token, string expectedScope = null);
         
     /// <summary>
@@ -25,6 +24,5 @@ public interface ITokenValidator
     /// <param name="token">The token.</param>
     /// <param name="clientId">The client identifier.</param>
     /// <param name="validateLifetime">if set to <c>true</c> the lifetime gets validated. Otherwise not.</param>
-    /// <returns></returns>
     Task<TokenValidationResult> ValidateIdentityTokenAsync(string token, string clientId = null, bool validateLifetime = true);
 }
\ No newline at end of file
diff --git a/src/IdentityServer/Validation/IUserInfoRequestValidator.cs b/src/IdentityServer/Validation/IUserInfoRequestValidator.cs
index 3ee8590d4..a45073f65 100644
--- a/src/IdentityServer/Validation/IUserInfoRequestValidator.cs
+++ b/src/IdentityServer/Validation/IUserInfoRequestValidator.cs
@@ -15,6 +15,5 @@ public interface IUserInfoRequestValidator
     /// Validates a userinfo request.
     /// </summary>
     /// <param name="accessToken">The access token.</param>
-    /// <returns></returns>
     Task<UserInfoRequestValidationResult> ValidateRequestAsync(string accessToken);
 }
\ No newline at end of file
diff --git a/src/IdentityServer/Validation/Models/ResourceValidationResult.cs b/src/IdentityServer/Validation/Models/ResourceValidationResult.cs
index 5287253a4..cf5ee70b7 100644
--- a/src/IdentityServer/Validation/Models/ResourceValidationResult.cs
+++ b/src/IdentityServer/Validation/Models/ResourceValidationResult.cs
@@ -78,7 +78,6 @@ public ResourceValidationResult(Resources resources, IEnumerable<ParsedScopeValu
     /// Returns new result filted by the scope values.
     /// </summary>
     /// <param name="scopeValues"></param>
-    /// <returns></returns>
     public ResourceValidationResult Filter(IEnumerable<string> scopeValues)
     {
         scopeValues ??= Enumerable.Empty<string>();
diff --git a/src/Storage/IdentityServerUser.cs b/src/Storage/IdentityServerUser.cs
index 9b3f90979..302809a7a 100644
--- a/src/Storage/IdentityServerUser.cs
+++ b/src/Storage/IdentityServerUser.cs
@@ -62,7 +62,6 @@ public IdentityServerUser(string subjectId)
     /// <summary>
     /// Creates an IdentityServer claims principal
     /// </summary>
-    /// <returns></returns>
     /// <exception cref="ArgumentNullException"></exception>
     public ClaimsPrincipal CreatePrincipal()
     {
diff --git a/src/Storage/Models/IdentityProvider.cs b/src/Storage/Models/IdentityProvider.cs
index a455e0a30..557c68850 100644
--- a/src/Storage/Models/IdentityProvider.cs
+++ b/src/Storage/Models/IdentityProvider.cs
@@ -87,7 +87,6 @@ public IdentityProvider(string type, IdentityProvider other) : this(type)
     /// Properties indexer
     /// </summary>
     /// <param name="name"></param>
-    /// <returns></returns>
     protected string? this[string name]
     {
         get
diff --git a/src/Storage/Models/RefreshToken.cs b/src/Storage/Models/RefreshToken.cs
index 0d2ad1d1d..5650bfe71 100644
--- a/src/Storage/Models/RefreshToken.cs
+++ b/src/Storage/Models/RefreshToken.cs
@@ -61,7 +61,6 @@ public class RefreshToken
     /// Returns the access token based on the resource indicator.
     /// </summary>
     /// <param name="resourceIndicator"></param>
-    /// <returns></returns>
     public Token? GetAccessToken(string? resourceIndicator = null)
     {
         AccessTokens.TryGetValue(resourceIndicator ?? String.Empty, out var token);
@@ -73,7 +72,6 @@ public class RefreshToken
     /// </summary>
     /// <param name="resourceIndicator"></param>
     /// <param name="token"></param>
-    /// <returns></returns>
     public void SetAccessToken(Token token, string? resourceIndicator = null)
     {
         AccessTokens[resourceIndicator ?? String.Empty] = token;
diff --git a/src/Storage/Services/ICorsPolicyService.cs b/src/Storage/Services/ICorsPolicyService.cs
index 8bd57c816..06c9dc5f9 100644
--- a/src/Storage/Services/ICorsPolicyService.cs
+++ b/src/Storage/Services/ICorsPolicyService.cs
@@ -17,6 +17,5 @@ public interface ICorsPolicyService
     /// Determines whether origin is allowed.
     /// </summary>
     /// <param name="origin">The origin.</param>
-    /// <returns></returns>
     Task<bool> IsOriginAllowedAsync(string origin);
 }
diff --git a/src/Storage/Stores/IAuthorizationCodeStore.cs b/src/Storage/Stores/IAuthorizationCodeStore.cs
index 800c7a1bc..20de0fe20 100644
--- a/src/Storage/Stores/IAuthorizationCodeStore.cs
+++ b/src/Storage/Stores/IAuthorizationCodeStore.cs
@@ -18,20 +18,17 @@ public interface IAuthorizationCodeStore
     /// Stores the authorization code.
     /// </summary>
     /// <param name="code">The code.</param>
-    /// <returns></returns>
     Task<string> StoreAuthorizationCodeAsync(AuthorizationCode code);
 
     /// <summary>
     /// Gets the authorization code.
     /// </summary>
     /// <param name="code">The code.</param>
-    /// <returns></returns>
     Task<AuthorizationCode?> GetAuthorizationCodeAsync(string code);
 
     /// <summary>
     /// Removes the authorization code.
     /// </summary>
     /// <param name="code">The code.</param>
-    /// <returns></returns>
     Task RemoveAuthorizationCodeAsync(string code);
 }
diff --git a/src/Storage/Stores/IDeviceFlowStore.cs b/src/Storage/Stores/IDeviceFlowStore.cs
index 58224c4d7..3e2be8dc4 100644
--- a/src/Storage/Stores/IDeviceFlowStore.cs
+++ b/src/Storage/Stores/IDeviceFlowStore.cs
@@ -20,14 +20,12 @@ public interface IDeviceFlowStore
     /// <param name="deviceCode">The device code.</param>
     /// <param name="userCode">The user code.</param>
     /// <param name="data">The data.</param>
-    /// <returns></returns>
     Task StoreDeviceAuthorizationAsync(string deviceCode, string userCode, DeviceCode data);
 
     /// <summary>
     /// Finds device authorization by user code.
     /// </summary>
     /// <param name="userCode">The user code.</param>
-    /// <returns></returns>
     Task<DeviceCode?> FindByUserCodeAsync(string userCode);
 
     /// <summary>
diff --git a/src/Storage/Stores/IIdentityProviderStore.cs b/src/Storage/Stores/IIdentityProviderStore.cs
index 79f406e73..4db2306ba 100644
--- a/src/Storage/Stores/IIdentityProviderStore.cs
+++ b/src/Storage/Stores/IIdentityProviderStore.cs
@@ -24,6 +24,5 @@ public interface IIdentityProviderStore
     /// Gets the identity provider by scheme name.
     /// </summary>
     /// <param name="scheme"></param>
-    /// <returns></returns>
     Task<IdentityProvider?> GetBySchemeAsync(string scheme);
 }
diff --git a/src/Storage/Stores/IPersistedGrantStore.cs b/src/Storage/Stores/IPersistedGrantStore.cs
index 08d3b8144..0fcb65ceb 100644
--- a/src/Storage/Stores/IPersistedGrantStore.cs
+++ b/src/Storage/Stores/IPersistedGrantStore.cs
@@ -19,34 +19,29 @@ public interface IPersistedGrantStore
     /// Stores the grant.
     /// </summary>
     /// <param name="grant">The grant.</param>
-    /// <returns></returns>
     Task StoreAsync(PersistedGrant grant);
 
     /// <summary>
     /// Gets the grant.
     /// </summary>
     /// <param name="key">The key.</param>
-    /// <returns></returns>
     Task<PersistedGrant?> GetAsync(string key);
 
     /// <summary>
     /// Gets all grants based on the filter.
     /// </summary>
     /// <param name="filter">The filter.</param>
-    /// <returns></returns>
     Task<IEnumerable<PersistedGrant>> GetAllAsync(PersistedGrantFilter filter);
 
     /// <summary>
     /// Removes the grant by key.
     /// </summary>
     /// <param name="key">The key.</param>
-    /// <returns></returns>
     Task RemoveAsync(string key);
 
     /// <summary>
     /// Removes all grants based on the filter.
     /// </summary>
     /// <param name="filter">The filter.</param>
-    /// <returns></returns>
     Task RemoveAllAsync(PersistedGrantFilter filter);
 }
diff --git a/src/Storage/Stores/IPushedAuthorizationRequestStore.cs b/src/Storage/Stores/IPushedAuthorizationRequestStore.cs
index 470d838e1..2d2713a5a 100644
--- a/src/Storage/Stores/IPushedAuthorizationRequestStore.cs
+++ b/src/Storage/Stores/IPushedAuthorizationRequestStore.cs
@@ -19,7 +19,6 @@ public interface IPushedAuthorizationRequestStore
     /// Stores the pushed authorization request.
     /// </summary>
     /// <param name="pushedAuthorizationRequest">The request.</param>
-    /// <returns></returns>
     Task StoreAsync(PushedAuthorizationRequest pushedAuthorizationRequest);
 
     /// <summary>
@@ -32,7 +31,6 @@ public interface IPushedAuthorizationRequestStore
     /// <param name="referenceValueHash">The hash of the reference value of the
     /// pushed authorization request. The reference value is the identifier
     /// within the request_uri parameter.</param>
-    /// <returns></returns>
     Task ConsumeByHashAsync(string referenceValueHash);
 
     /// <summary>
diff --git a/src/Storage/Stores/IReferenceTokenStore.cs b/src/Storage/Stores/IReferenceTokenStore.cs
index 405c42d81..9d1504d2a 100644
--- a/src/Storage/Stores/IReferenceTokenStore.cs
+++ b/src/Storage/Stores/IReferenceTokenStore.cs
@@ -18,21 +18,18 @@ public interface IReferenceTokenStore
     /// Stores the reference token.
     /// </summary>
     /// <param name="token">The token.</param>
-    /// <returns></returns>
     Task<string> StoreReferenceTokenAsync(Token token);
 
     /// <summary>
     /// Gets the reference token.
     /// </summary>
     /// <param name="handle">The handle.</param>
-    /// <returns></returns>
     Task<Token?> GetReferenceTokenAsync(string handle);
 
     /// <summary>
     /// Removes the reference token.
     /// </summary>
     /// <param name="handle">The handle.</param>
-    /// <returns></returns>
     Task RemoveReferenceTokenAsync(string handle);
 
     /// <summary>
@@ -41,6 +38,5 @@ public interface IReferenceTokenStore
     /// <param name="subjectId">The subject identifier.</param>
     /// <param name="clientId">The client identifier.</param>
     /// <param name="sessionId">The session identifier.</param>
-    /// <returns></returns>
     Task RemoveReferenceTokensAsync(string subjectId, string clientId, string? sessionId = null);
 }
diff --git a/src/Storage/Stores/IRefreshTokenStore.cs b/src/Storage/Stores/IRefreshTokenStore.cs
index 8d6f4e2af..93507d541 100644
--- a/src/Storage/Stores/IRefreshTokenStore.cs
+++ b/src/Storage/Stores/IRefreshTokenStore.cs
@@ -18,7 +18,6 @@ public interface IRefreshTokenStore
     /// Stores the refresh token.
     /// </summary>
     /// <param name="refreshToken">The refresh token.</param>
-    /// <returns></returns>
     Task<string> StoreRefreshTokenAsync(RefreshToken refreshToken);
 
     /// <summary>
@@ -26,21 +25,18 @@ public interface IRefreshTokenStore
     /// </summary>
     /// <param name="handle">The handle.</param>
     /// <param name="refreshToken">The refresh token.</param>
-    /// <returns></returns>
     Task UpdateRefreshTokenAsync(string handle, RefreshToken refreshToken);
 
     /// <summary>
     /// Gets the refresh token.
     /// </summary>
     /// <param name="refreshTokenHandle">The refresh token handle.</param>
-    /// <returns></returns>
     Task<RefreshToken?> GetRefreshTokenAsync(string refreshTokenHandle);
 
     /// <summary>
     /// Removes the refresh token.
     /// </summary>
     /// <param name="refreshTokenHandle">The refresh token handle.</param>
-    /// <returns></returns>
     Task RemoveRefreshTokenAsync(string refreshTokenHandle);
 
     /// <summary>
@@ -48,6 +44,5 @@ public interface IRefreshTokenStore
     /// </summary>
     /// <param name="subjectId">The subject identifier.</param>
     /// <param name="clientId">The client identifier.</param>
-    /// <returns></returns>
     Task RemoveRefreshTokensAsync(string subjectId, string clientId);
 }
diff --git a/src/Storage/Stores/ISigningKeyStore.cs b/src/Storage/Stores/ISigningKeyStore.cs
index 710dde360..b937fc113 100644
--- a/src/Storage/Stores/ISigningKeyStore.cs
+++ b/src/Storage/Stores/ISigningKeyStore.cs
@@ -18,20 +18,17 @@ public interface ISigningKeyStore
     /// <summary>
     /// Returns all the keys in storage.
     /// </summary>
-    /// <returns></returns>
     Task<IEnumerable<SerializedKey>> LoadKeysAsync();
 
     /// <summary>
     /// Persists new key in storage.
     /// </summary>
     /// <param name="key"></param>
-    /// <returns></returns>
     Task StoreKeyAsync(SerializedKey key);
 
     /// <summary>
     /// Deletes key from storage.
     /// </summary>
     /// <param name="id"></param>
-    /// <returns></returns>
     Task DeleteKeyAsync(string id);
 }
diff --git a/src/Storage/Stores/IUserConsentStore.cs b/src/Storage/Stores/IUserConsentStore.cs
index 8857cf1e5..6e053300c 100644
--- a/src/Storage/Stores/IUserConsentStore.cs
+++ b/src/Storage/Stores/IUserConsentStore.cs
@@ -18,7 +18,6 @@ public interface IUserConsentStore
     /// Stores the user consent.
     /// </summary>
     /// <param name="consent">The consent.</param>
-    /// <returns></returns>
     Task StoreUserConsentAsync(Consent consent);
 
     /// <summary>
@@ -26,7 +25,6 @@ public interface IUserConsentStore
     /// </summary>
     /// <param name="subjectId">The subject identifier.</param>
     /// <param name="clientId">The client identifier.</param>
-    /// <returns></returns>
     Task<Consent?> GetUserConsentAsync(string subjectId, string clientId);
 
     /// <summary>
@@ -34,6 +32,5 @@ public interface IUserConsentStore
     /// </summary>
     /// <param name="subjectId">The subject identifier.</param>
     /// <param name="clientId">The client identifier.</param>
-    /// <returns></returns>
     Task RemoveUserConsentAsync(string subjectId, string clientId);
 }
diff --git a/src/Storage/Stores/Serialization/IPersistentGrantSerializer.cs b/src/Storage/Stores/Serialization/IPersistentGrantSerializer.cs
index 33d6f75ce..60ffc45c8 100644
--- a/src/Storage/Stores/Serialization/IPersistentGrantSerializer.cs
+++ b/src/Storage/Stores/Serialization/IPersistentGrantSerializer.cs
@@ -14,7 +14,6 @@ public interface IPersistentGrantSerializer
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="value">The value.</param>
-    /// <returns></returns>
     string Serialize<T>(T value);
 
     /// <summary>
@@ -22,6 +21,5 @@ public interface IPersistentGrantSerializer
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="json">The json.</param>
-    /// <returns></returns>
     T Deserialize<T>(string json);
 }
\ No newline at end of file
diff --git a/src/Storage/Stores/Serialization/PersistentGrantSerializer.cs b/src/Storage/Stores/Serialization/PersistentGrantSerializer.cs
index e4c87d15d..7351fe4b5 100644
--- a/src/Storage/Stores/Serialization/PersistentGrantSerializer.cs
+++ b/src/Storage/Stores/Serialization/PersistentGrantSerializer.cs
@@ -52,7 +52,6 @@ public PersistentGrantSerializer(PersistentGrantOptions options = null, IDataPro
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="value">The value.</param>
-    /// <returns></returns>
     public string Serialize<T>(T value)
     {
         var payload = JsonSerializer.Serialize(value, Settings);
@@ -77,7 +76,6 @@ public string Serialize<T>(T value)
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="json">The json.</param>
-    /// <returns></returns>
     public T Deserialize<T>(string json)
     {
         var container = JsonSerializer.Deserialize<PersistentGrantDataContainer>(json, Settings);