diff --git a/sandbox/OpenIddict.Sandbox.AspNetCore.Server/Controllers/AuthorizationController.cs b/sandbox/OpenIddict.Sandbox.AspNetCore.Server/Controllers/AuthorizationController.cs
index 5269c2e7..c65cbb90 100644
--- a/sandbox/OpenIddict.Sandbox.AspNetCore.Server/Controllers/AuthorizationController.cs
+++ b/sandbox/OpenIddict.Sandbox.AspNetCore.Server/Controllers/AuthorizationController.cs
@@ -4,14 +4,12 @@
  * the license and the contributors participating to this project.
  */
 
-using System.Collections.Immutable;
 using System.Security.Claims;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Primitives;
 using Microsoft.IdentityModel.Tokens;
 using OpenIddict.Abstractions;
 using OpenIddict.Client;
diff --git a/sandbox/OpenIddict.Sandbox.Maui.Client/MauiProgram.cs b/sandbox/OpenIddict.Sandbox.Maui.Client/MauiProgram.cs
index f172493a..74fa0f3f 100644
--- a/sandbox/OpenIddict.Sandbox.Maui.Client/MauiProgram.cs
+++ b/sandbox/OpenIddict.Sandbox.Maui.Client/MauiProgram.cs
@@ -1,5 +1,4 @@
 #if IOS || MACCATALYST || WINDOWS
-using System.Net.Http;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Hosting.Internal;
diff --git a/src/OpenIddict.Abstractions/Descriptors/OpenIddictApplicationDescriptor.cs b/src/OpenIddict.Abstractions/Descriptors/OpenIddictApplicationDescriptor.cs
index 648efa39..c5da1905 100644
--- a/src/OpenIddict.Abstractions/Descriptors/OpenIddictApplicationDescriptor.cs
+++ b/src/OpenIddict.Abstractions/Descriptors/OpenIddictApplicationDescriptor.cs
@@ -1,5 +1,4 @@
-using System.ComponentModel;
-using System.Globalization;
+using System.Globalization;
 using System.Text.Json;
 using Microsoft.IdentityModel.Tokens;
 
diff --git a/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHandlerFilters.cs b/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHandlerFilters.cs
index 942dc0e5..8af45ee5 100644
--- a/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHandlerFilters.cs
+++ b/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHandlerFilters.cs
@@ -5,7 +5,6 @@
  */
 
 using System.ComponentModel;
-using System.Runtime.CompilerServices;
 using Microsoft.Extensions.Options;
 using static OpenIddict.Client.SystemIntegration.OpenIddictClientSystemIntegrationAuthenticationMode;
 
diff --git a/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHandlers.Authentication.cs b/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHandlers.Authentication.cs
index 83c84a14..c59cb672 100644
--- a/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHandlers.Authentication.cs
+++ b/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHandlers.Authentication.cs
@@ -9,7 +9,6 @@ using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 using System.Text;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Primitives;
 using OpenIddict.Extensions;
 
@@ -24,6 +23,7 @@ using AndroidX.Browser.CustomTabs;
 
 #if SUPPORTS_AUTHENTICATION_SERVICES
 using AuthenticationServices;
+using Microsoft.Extensions.Logging;
 #endif
 
 #if SUPPORTS_APPKIT
diff --git a/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHandlers.Session.cs b/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHandlers.Session.cs
index 2eb84fce..8a9d04cb 100644
--- a/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHandlers.Session.cs
+++ b/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHandlers.Session.cs
@@ -9,7 +9,6 @@ using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 using System.Text;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Primitives;
 using OpenIddict.Extensions;
 
@@ -24,6 +23,7 @@ using AndroidX.Browser.CustomTabs;
 
 #if SUPPORTS_AUTHENTICATION_SERVICES
 using AuthenticationServices;
+using Microsoft.Extensions.Logging;
 #endif
 
 #if SUPPORTS_APPKIT
diff --git a/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationService.cs b/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationService.cs
index c3c2bf59..84a8d027 100644
--- a/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationService.cs
+++ b/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationService.cs
@@ -10,10 +10,10 @@ using System.Net;
 using System.Security.Principal;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using OpenIddict.Extensions;
 
 #if SUPPORTS_ANDROID
 using Android.Content;
+using OpenIddict.Extensions;
 #endif
 
 namespace OpenIddict.Client.SystemIntegration;
diff --git a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Exchange.cs b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Exchange.cs
index 6f53cdc9..c2bd1d58 100644
--- a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Exchange.cs
+++ b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Exchange.cs
@@ -5,10 +5,6 @@
  */
 
 using System.Collections.Immutable;
-using System.Diagnostics;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text;
 
 namespace OpenIddict.Client.SystemNetHttp;
 
diff --git a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Introspection.cs b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Introspection.cs
index c9064590..656b6890 100644
--- a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Introspection.cs
+++ b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Introspection.cs
@@ -5,10 +5,6 @@
  */
 
 using System.Collections.Immutable;
-using System.Diagnostics;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text;
 
 namespace OpenIddict.Client.SystemNetHttp;
 
diff --git a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Revocation.cs b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Revocation.cs
index b43ab26d..2cd66b2d 100644
--- a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Revocation.cs
+++ b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.Revocation.cs
@@ -5,10 +5,6 @@
  */
 
 using System.Collections.Immutable;
-using System.Diagnostics;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text;
 
 namespace OpenIddict.Client.SystemNetHttp;
 
diff --git a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.cs b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.cs
index c39030e2..04c7b6c3 100644
--- a/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.cs
+++ b/src/OpenIddict.Client.SystemNetHttp/OpenIddictClientSystemNetHttpHandlers.cs
@@ -11,7 +11,6 @@ using System.IO.Compression;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Runtime.InteropServices;
-using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
diff --git a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Userinfo.cs b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Userinfo.cs
index 49c6c83d..bd21d664 100644
--- a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Userinfo.cs
+++ b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Userinfo.cs
@@ -511,12 +511,12 @@ public static partial class OpenIddictClientWebIntegrationHandlers
                 // Note: Clever returns a non-standard "name" claim formatted as a JSON object.
                 else if (context.Registration.ProviderType is ProviderTypes.Clever)
                 {
-                    var name = context.Response[Claims.Name]?.GetNamedParameters();
+                    var name = context.Response[Claims.Name];
                     if (name is not null)
                     {
-                        context.Response[Claims.Name] = $"{name["first"]} {name["last"]}";
-                        context.Response[Claims.FamilyName] = name["last"];
-                        context.Response[Claims.GivenName] = name["first"];
+                        context.Response[Claims.Name] = $"{name?["first"]} {name?["last"]}";
+                        context.Response[Claims.FamilyName] = name?["last"];
+                        context.Response[Claims.GivenName] = name?["first"];
                     }
                 }
 
diff --git a/src/OpenIddict.Client/OpenIddictClientBuilder.cs b/src/OpenIddict.Client/OpenIddictClientBuilder.cs
index dc9054d5..8ab2a2f0 100644
--- a/src/OpenIddict.Client/OpenIddictClientBuilder.cs
+++ b/src/OpenIddict.Client/OpenIddictClientBuilder.cs
@@ -45,7 +45,7 @@ public sealed class OpenIddictClientBuilder
     [EditorBrowsable(EditorBrowsableState.Advanced)]
     public OpenIddictClientBuilder AddEventHandler<TContext>(
         Action<OpenIddictClientHandlerDescriptor.Builder<TContext>> configuration)
-        where TContext : OpenIddictClientEvents.BaseContext
+        where TContext : BaseContext
     {
         if (configuration is null)
         {
diff --git a/src/OpenIddict.Client/OpenIddictClientEvents.Revocation.cs b/src/OpenIddict.Client/OpenIddictClientEvents.Revocation.cs
index 538dcb43..1d26612a 100644
--- a/src/OpenIddict.Client/OpenIddictClientEvents.Revocation.cs
+++ b/src/OpenIddict.Client/OpenIddictClientEvents.Revocation.cs
@@ -4,8 +4,6 @@
  * the license and the contributors participating to this project.
  */
 
-using System.Security.Claims;
-
 namespace OpenIddict.Client;
 
 public static partial class OpenIddictClientEvents
diff --git a/src/OpenIddict.Client/OpenIddictClientHandlers.Discovery.cs b/src/OpenIddict.Client/OpenIddictClientHandlers.Discovery.cs
index 55968843..4bc3203b 100644
--- a/src/OpenIddict.Client/OpenIddictClientHandlers.Discovery.cs
+++ b/src/OpenIddict.Client/OpenIddictClientHandlers.Discovery.cs
@@ -5,7 +5,6 @@
  */
 
 using System.Collections.Immutable;
-using System.Reflection;
 using System.Text.Json;
 using Microsoft.Extensions.Logging;
 using Microsoft.IdentityModel.Tokens;
diff --git a/src/OpenIddict.Core/OpenIddictCoreOptions.cs b/src/OpenIddict.Core/OpenIddictCoreOptions.cs
index 2be71f7b..a3129da5 100644
--- a/src/OpenIddict.Core/OpenIddictCoreOptions.cs
+++ b/src/OpenIddict.Core/OpenIddictCoreOptions.cs
@@ -4,8 +4,6 @@
  * the license and the contributors participating to this project.
  */
 
-using System.Diagnostics.CodeAnalysis;
-
 namespace OpenIddict.Core;
 
 /// <summary>
diff --git a/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbAuthorization.cs b/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbAuthorization.cs
index d71c4038..f9e895ee 100644
--- a/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbAuthorization.cs
+++ b/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbAuthorization.cs
@@ -4,7 +4,6 @@
  * the license and the contributors participating to this project.
  */
 
-using System.Collections.Immutable;
 using System.Diagnostics;
 
 namespace OpenIddict.MongoDb.Models;
diff --git a/src/OpenIddict.Server/OpenIddictServerBuilder.cs b/src/OpenIddict.Server/OpenIddictServerBuilder.cs
index 1b6109c9..c2e1b93e 100644
--- a/src/OpenIddict.Server/OpenIddictServerBuilder.cs
+++ b/src/OpenIddict.Server/OpenIddictServerBuilder.cs
@@ -45,7 +45,7 @@ public sealed class OpenIddictServerBuilder
     [EditorBrowsable(EditorBrowsableState.Advanced)]
     public OpenIddictServerBuilder AddEventHandler<TContext>(
         Action<OpenIddictServerHandlerDescriptor.Builder<TContext>> configuration)
-        where TContext : OpenIddictServerEvents.BaseContext
+        where TContext : BaseContext
     {
         if (configuration is null)
         {
diff --git a/src/OpenIddict.Server/OpenIddictServerEvents.Userinfo.cs b/src/OpenIddict.Server/OpenIddictServerEvents.Userinfo.cs
index bdc2c92d..362acf87 100644
--- a/src/OpenIddict.Server/OpenIddictServerEvents.Userinfo.cs
+++ b/src/OpenIddict.Server/OpenIddictServerEvents.Userinfo.cs
@@ -5,7 +5,6 @@
  */
 
 using System.Security.Claims;
-using System.Text.Json;
 using System.Text.Json.Nodes;
 
 namespace OpenIddict.Server;
diff --git a/src/OpenIddict.Server/OpenIddictServerHandlers.Authentication.cs b/src/OpenIddict.Server/OpenIddictServerHandlers.Authentication.cs
index 3988df44..970e763a 100644
--- a/src/OpenIddict.Server/OpenIddictServerHandlers.Authentication.cs
+++ b/src/OpenIddict.Server/OpenIddictServerHandlers.Authentication.cs
@@ -1290,7 +1290,7 @@ public static partial class OpenIddictServerHandlers
             /// </summary>
             public static OpenIddictServerHandlerDescriptor Descriptor { get; }
                 = OpenIddictServerHandlerDescriptor.CreateBuilder<ValidateAuthorizationRequestContext>()
-                    .UseScopedHandler<ValidateResponseType>(static provider =>
+                    .UseScopedHandler(static provider =>
                     {
                         // Note: the application manager is only resolved if the degraded mode was not enabled to ensure
                         // invalid core configuration exceptions are not thrown even if the managers were registered.
@@ -1462,7 +1462,7 @@ public static partial class OpenIddictServerHandlers
             public static OpenIddictServerHandlerDescriptor Descriptor { get; }
                 = OpenIddictServerHandlerDescriptor.CreateBuilder<ValidateAuthorizationRequestContext>()
                     .AddFilter<RequireScopeValidationEnabled>()
-                    .UseScopedHandler<ValidateScopes>(static provider =>
+                    .UseScopedHandler(static provider =>
                     {
                         // Note: the scope manager is only resolved if the degraded mode was not enabled to ensure
                         // invalid core configuration exceptions are not thrown even if the managers were registered.
@@ -3247,7 +3247,7 @@ public static partial class OpenIddictServerHandlers
             /// </summary>
             public static OpenIddictServerHandlerDescriptor Descriptor { get; }
                 = OpenIddictServerHandlerDescriptor.CreateBuilder<ValidatePushedAuthorizationRequestContext>()
-                    .UseScopedHandler<ValidatePushedResponseType>(static provider =>
+                    .UseScopedHandler(static provider =>
                     {
                         // Note: the application manager is only resolved if the degraded mode was not enabled to ensure
                         // invalid core configuration exceptions are not thrown even if the managers were registered.
@@ -3419,7 +3419,7 @@ public static partial class OpenIddictServerHandlers
             public static OpenIddictServerHandlerDescriptor Descriptor { get; }
                 = OpenIddictServerHandlerDescriptor.CreateBuilder<ValidatePushedAuthorizationRequestContext>()
                     .AddFilter<RequireScopeValidationEnabled>()
-                    .UseScopedHandler<ValidatePushedScopes>(static provider =>
+                    .UseScopedHandler(static provider =>
                     {
                         // Note: the scope manager is only resolved if the degraded mode was not enabled to ensure
                         // invalid core configuration exceptions are not thrown even if the managers were registered.
diff --git a/src/OpenIddict.Server/OpenIddictServerHandlers.Device.cs b/src/OpenIddict.Server/OpenIddictServerHandlers.Device.cs
index b10ad9d0..bdb51db5 100644
--- a/src/OpenIddict.Server/OpenIddictServerHandlers.Device.cs
+++ b/src/OpenIddict.Server/OpenIddictServerHandlers.Device.cs
@@ -466,7 +466,7 @@ public static partial class OpenIddictServerHandlers
             public static OpenIddictServerHandlerDescriptor Descriptor { get; }
                 = OpenIddictServerHandlerDescriptor.CreateBuilder<ValidateDeviceAuthorizationRequestContext>()
                     .AddFilter<RequireScopeValidationEnabled>()
-                    .UseScopedHandler<ValidateScopes>(static provider =>
+                    .UseScopedHandler(static provider =>
                     {
                         // Note: the scope manager is only resolved if the degraded mode was not enabled to ensure
                         // invalid core configuration exceptions are not thrown even if the managers were registered.
diff --git a/src/OpenIddict.Server/OpenIddictServerHandlers.Exchange.cs b/src/OpenIddict.Server/OpenIddictServerHandlers.Exchange.cs
index 28eb157a..dfd70bb2 100644
--- a/src/OpenIddict.Server/OpenIddictServerHandlers.Exchange.cs
+++ b/src/OpenIddict.Server/OpenIddictServerHandlers.Exchange.cs
@@ -837,7 +837,7 @@ public static partial class OpenIddictServerHandlers
             public static OpenIddictServerHandlerDescriptor Descriptor { get; }
                 = OpenIddictServerHandlerDescriptor.CreateBuilder<ValidateTokenRequestContext>()
                     .AddFilter<RequireScopeValidationEnabled>()
-                    .UseScopedHandler<ValidateScopes>(static provider =>
+                    .UseScopedHandler(static provider =>
                     {
                         // Note: the scope manager is only resolved if the degraded mode was not enabled to ensure
                         // invalid core configuration exceptions are not thrown even if the managers were registered.
diff --git a/src/OpenIddict.Server/OpenIddictServerHandlers.Protection.cs b/src/OpenIddict.Server/OpenIddictServerHandlers.Protection.cs
index 937bf3fe..766d40d0 100644
--- a/src/OpenIddict.Server/OpenIddictServerHandlers.Protection.cs
+++ b/src/OpenIddict.Server/OpenIddictServerHandlers.Protection.cs
@@ -64,7 +64,7 @@ public static partial class OpenIddictServerHandlers
             /// </summary>
             public static OpenIddictServerHandlerDescriptor Descriptor { get; }
                 = OpenIddictServerHandlerDescriptor.CreateBuilder<ValidateTokenContext>()
-                    .UseScopedHandler<ResolveTokenValidationParameters>(static provider =>
+                    .UseScopedHandler(static provider =>
                     {
                         // Note: the application manager is only resolved if the degraded mode was not enabled to ensure
                         // invalid core configuration exceptions are not thrown even if the managers were registered.
diff --git a/src/OpenIddict.Server/OpenIddictServerHandlers.Session.cs b/src/OpenIddict.Server/OpenIddictServerHandlers.Session.cs
index d02d9741..6eae3620 100644
--- a/src/OpenIddict.Server/OpenIddictServerHandlers.Session.cs
+++ b/src/OpenIddict.Server/OpenIddictServerHandlers.Session.cs
@@ -797,7 +797,7 @@ public static partial class OpenIddictServerHandlers
             /// </summary>
             public static OpenIddictServerHandlerDescriptor Descriptor { get; }
                 = OpenIddictServerHandlerDescriptor.CreateBuilder<ValidateEndSessionRequestContext>()
-                    .UseScopedHandler<ValidateAuthorizedParty>(static provider =>
+                    .UseScopedHandler(static provider =>
                     {
                         // Note: the application manager is only resolved if the degraded mode was not enabled to ensure
                         // invalid core configuration exceptions are not thrown even if the managers were registered.
diff --git a/src/OpenIddict.Server/OpenIddictServerHandlers.cs b/src/OpenIddict.Server/OpenIddictServerHandlers.cs
index 694bb6e0..4a19c0e7 100644
--- a/src/OpenIddict.Server/OpenIddictServerHandlers.cs
+++ b/src/OpenIddict.Server/OpenIddictServerHandlers.cs
@@ -1015,7 +1015,7 @@ public static partial class OpenIddictServerHandlers
         /// </summary>
         public static OpenIddictServerHandlerDescriptor Descriptor { get; }
             = OpenIddictServerHandlerDescriptor.CreateBuilder<ProcessAuthenticationContext>()
-                .UseScopedHandler<ValidateClientId>(static provider =>
+                .UseScopedHandler(static provider =>
                 {
                     // Note: the application manager is only resolved if the degraded mode was not enabled to ensure
                     // invalid core configuration exceptions are not thrown even if the managers were registered.
@@ -3065,7 +3065,7 @@ public static partial class OpenIddictServerHandlers
         public static OpenIddictServerHandlerDescriptor Descriptor { get; }
             = OpenIddictServerHandlerDescriptor.CreateBuilder<ProcessSignInContext>()
                 .AddFilter<RequireAccessTokenGenerated>()
-                .UseScopedHandler<PrepareAccessTokenPrincipal>(static provider =>
+                .UseScopedHandler(static provider =>
                 {
                     // Note: the application manager is only resolved if the degraded mode was not enabled to ensure
                     // invalid core configuration exceptions are not thrown even if the managers were registered.
@@ -3223,7 +3223,7 @@ public static partial class OpenIddictServerHandlers
         public static OpenIddictServerHandlerDescriptor Descriptor { get; }
             = OpenIddictServerHandlerDescriptor.CreateBuilder<ProcessSignInContext>()
                 .AddFilter<RequireAuthorizationCodeGenerated>()
-                .UseScopedHandler<PrepareAuthorizationCodePrincipal>(static provider =>
+                .UseScopedHandler(static provider =>
                 {
                     // Note: the application manager is only resolved if the degraded mode was not enabled to ensure
                     // invalid core configuration exceptions are not thrown even if the managers were registered.
@@ -3349,7 +3349,7 @@ public static partial class OpenIddictServerHandlers
         public static OpenIddictServerHandlerDescriptor Descriptor { get; }
             = OpenIddictServerHandlerDescriptor.CreateBuilder<ProcessSignInContext>()
                 .AddFilter<RequireDeviceCodeGenerated>()
-                .UseScopedHandler<PrepareDeviceCodePrincipal>(static provider =>
+                .UseScopedHandler(static provider =>
                 {
                     // Note: the application manager is only resolved if the degraded mode was not enabled to ensure
                     // invalid core configuration exceptions are not thrown even if the managers were registered.
@@ -3462,7 +3462,7 @@ public static partial class OpenIddictServerHandlers
         public static OpenIddictServerHandlerDescriptor Descriptor { get; }
             = OpenIddictServerHandlerDescriptor.CreateBuilder<ProcessSignInContext>()
                 .AddFilter<RequireRequestTokenGenerated>()
-                .UseScopedHandler<PrepareRequestTokenPrincipal>(static provider =>
+                .UseScopedHandler(static provider =>
                 {
                     // Note: the application manager is only resolved if the degraded mode was not enabled to ensure
                     // invalid core configuration exceptions are not thrown even if the managers were registered.
@@ -3593,7 +3593,7 @@ public static partial class OpenIddictServerHandlers
         public static OpenIddictServerHandlerDescriptor Descriptor { get; }
             = OpenIddictServerHandlerDescriptor.CreateBuilder<ProcessSignInContext>()
                 .AddFilter<RequireRefreshTokenGenerated>()
-                .UseScopedHandler<PrepareRefreshTokenPrincipal>(static provider =>
+                .UseScopedHandler(static provider =>
                 {
                     // Note: the application manager is only resolved if the degraded mode was not enabled to ensure
                     // invalid core configuration exceptions are not thrown even if the managers were registered.
@@ -3717,7 +3717,7 @@ public static partial class OpenIddictServerHandlers
         public static OpenIddictServerHandlerDescriptor Descriptor { get; }
             = OpenIddictServerHandlerDescriptor.CreateBuilder<ProcessSignInContext>()
                 .AddFilter<RequireIdentityTokenGenerated>()
-                .UseScopedHandler<PrepareIdentityTokenPrincipal>(static provider =>
+                .UseScopedHandler(static provider =>
                 {
                     // Note: the application manager is only resolved if the degraded mode was not enabled to ensure
                     // invalid core configuration exceptions are not thrown even if the managers were registered.
@@ -3871,7 +3871,7 @@ public static partial class OpenIddictServerHandlers
         public static OpenIddictServerHandlerDescriptor Descriptor { get; }
             = OpenIddictServerHandlerDescriptor.CreateBuilder<ProcessSignInContext>()
                 .AddFilter<RequireUserCodeGenerated>()
-                .UseScopedHandler<PrepareUserCodePrincipal>(static provider =>
+                .UseScopedHandler(static provider =>
                 {
                     // Note: the application manager is only resolved if the degraded mode was not enabled to ensure
                     // invalid core configuration exceptions are not thrown even if the managers were registered.
diff --git a/src/OpenIddict.Validation/OpenIddictValidationBuilder.cs b/src/OpenIddict.Validation/OpenIddictValidationBuilder.cs
index 7a657fc5..e2f8ae67 100644
--- a/src/OpenIddict.Validation/OpenIddictValidationBuilder.cs
+++ b/src/OpenIddict.Validation/OpenIddictValidationBuilder.cs
@@ -44,7 +44,7 @@ public sealed class OpenIddictValidationBuilder
     [EditorBrowsable(EditorBrowsableState.Advanced)]
     public OpenIddictValidationBuilder AddEventHandler<TContext>(
         Action<OpenIddictValidationHandlerDescriptor.Builder<TContext>> configuration)
-        where TContext : OpenIddictValidationEvents.BaseContext
+        where TContext : BaseContext
     {
         if (configuration is null)
         {
diff --git a/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictParameterTests.cs b/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictParameterTests.cs
index b837deb3..4b348a09 100644
--- a/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictParameterTests.cs
+++ b/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictParameterTests.cs
@@ -5,7 +5,6 @@
  */
 
 using System.Collections.Immutable;
-using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Nodes;
diff --git a/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbBuilderTests.cs b/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbBuilderTests.cs
index f1d1c1bb..ba8e64b5 100644
--- a/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbBuilderTests.cs
+++ b/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbBuilderTests.cs
@@ -8,7 +8,6 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using MongoDB.Driver;
 using Moq;
-using OpenIddict.Core;
 using OpenIddict.MongoDb.Models;
 using Xunit;
 
diff --git a/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbExtensionsTests.cs b/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbExtensionsTests.cs
index 13e5ebbe..24ee6b21 100644
--- a/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbExtensionsTests.cs
+++ b/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbExtensionsTests.cs
@@ -5,8 +5,6 @@
  */
 
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using OpenIddict.Core;
 using OpenIddict.MongoDb.Models;
 using Xunit;
 
diff --git a/test/OpenIddict.Validation.IntegrationTests/OpenIddictValidationIntegrationTestClient.cs b/test/OpenIddict.Validation.IntegrationTests/OpenIddictValidationIntegrationTestClient.cs
index 1435f073..971d492e 100644
--- a/test/OpenIddict.Validation.IntegrationTests/OpenIddictValidationIntegrationTestClient.cs
+++ b/test/OpenIddict.Validation.IntegrationTests/OpenIddictValidationIntegrationTestClient.cs
@@ -7,7 +7,6 @@
 using System.Collections.Immutable;
 using System.Net.Http;
 using System.Net.Http.Json;
-using System.Runtime.InteropServices;
 using AngleSharp.Html.Parser;
 using Microsoft.Extensions.Primitives;
 using OpenIddict.Extensions;