diff --git a/pkg/registry/apis/apiextensions/register.go b/pkg/registry/apis/apiextensions/register.go
index 91f96e173ef..08dff32cb68 100644
--- a/pkg/registry/apis/apiextensions/register.go
+++ b/pkg/registry/apis/apiextensions/register.go
@@ -62,7 +62,6 @@ type Builder struct {
 	accessClient        authlib.AccessClient
 	unifiedClient       resource.ResourceClient
 	apiExtensionsServer *apiextensionsapiserver.CustomResourceDefinitions
-	restOptsGetter      *apistore.RESTOptionsGetter
 	storageProvider     CRDStorageProvider
 }
 
@@ -76,6 +75,7 @@ func RegisterAPIService(
 	unified resource.ResourceClient,
 	storageProvider CRDStorageProvider,
 ) (*Builder, error) {
+	//nolint:staticcheck // not yet migrated to OpenFeature
 	if !features.IsEnabledGlobally(featuremgmt.FlagApiExtensions) {
 		return nil, nil
 	}
diff --git a/pkg/services/apiserver/service.go b/pkg/services/apiserver/service.go
index 91afe93b54d..058fcfcea2e 100644
--- a/pkg/services/apiserver/service.go
+++ b/pkg/services/apiserver/service.go
@@ -387,7 +387,7 @@ func (s *service) start(ctx context.Context) error {
 	}
 
 	// Determine the delegate for the main server
-	var delegationTarget genericapiserver.DelegationTarget = genericapiserver.NewEmptyDelegateWithCustomHandler(notFoundHandler)
+	var delegationTarget = genericapiserver.NewEmptyDelegateWithCustomHandler(notFoundHandler)
 	var apiExtensionsServer *apiextensionsapiserver.CustomResourceDefinitions
 
 	//nolint:staticcheck // not yet migrated to OpenFeature