diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures
index 04afef30e6a..c403c575bd0 100644
--- a/hack/.staticcheck_failures
+++ b/hack/.staticcheck_failures
@@ -218,10 +218,6 @@ vendor/k8s.io/code-generator/cmd/client-gen/generators/fake
 vendor/k8s.io/code-generator/cmd/client-gen/generators/util
 vendor/k8s.io/code-generator/cmd/go-to-protobuf/protobuf
 vendor/k8s.io/component-base/metrics
-vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration
-vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/helper
-vendor/k8s.io/kube-aggregator/pkg/controllers/autoregister
-vendor/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator
 vendor/k8s.io/kubectl/pkg/cmd/annotate
 vendor/k8s.io/kubectl/pkg/cmd/certificates
 vendor/k8s.io/kubectl/pkg/cmd/config
diff --git a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/helpers_test.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/helpers_test.go
index 8553b9db553..dd3b6511385 100644
--- a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/helpers_test.go
+++ b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/helpers_test.go
@@ -24,7 +24,6 @@ import (
 var (
 	a APIServiceConditionType = "A"
 	b APIServiceConditionType = "B"
-	c APIServiceConditionType = "C"
 )
 
 func TestGetAPIServiceConditionByType(t *testing.T) {
diff --git a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/helper/helpers_test.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/helper/helpers_test.go
index 128fdd81b58..b294cc74f71 100644
--- a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/helper/helpers_test.go
+++ b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/helper/helpers_test.go
@@ -26,7 +26,6 @@ import (
 var (
 	a v1.APIServiceConditionType = "A"
 	b v1.APIServiceConditionType = "B"
-	c v1.APIServiceConditionType = "C"
 )
 
 func TestIsAPIServiceConditionTrue(t *testing.T) {
diff --git a/staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister/autoregister_controller_test.go b/staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister/autoregister_controller_test.go
index c52a7c69f20..ab4a01b9251 100644
--- a/staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister/autoregister_controller_test.go
+++ b/staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister/autoregister_controller_test.go
@@ -51,15 +51,6 @@ func newAutoRegisterManagedModifiedAPIService(name string) *apiregistrationv1.AP
 	}
 }
 
-func newAutoRegisterManagedOnStartModifiedAPIService(name string) *apiregistrationv1.APIService {
-	return &apiregistrationv1.APIService{
-		ObjectMeta: metav1.ObjectMeta{Name: name, Labels: map[string]string{AutoRegisterManagedLabel: string("onstart")}},
-		Spec: apiregistrationv1.APIServiceSpec{
-			Group: "something",
-		},
-	}
-}
-
 func newAPIService(name string) *apiregistrationv1.APIService {
 	return &apiregistrationv1.APIService{
 		ObjectMeta: metav1.ObjectMeta{Name: name},
diff --git a/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/aggregator.go b/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/aggregator.go
index 1be3d0c939d..11f9683ebd7 100644
--- a/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/aggregator.go
+++ b/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/aggregator.go
@@ -120,8 +120,11 @@ func BuildAndRegisterAggregator(downloader *Downloader, delegationTarget server.
 	}
 
 	// Install handler
-	s.openAPIVersionedService, err = handler.RegisterOpenAPIVersionedService(
-		specToServe, "/openapi/v2", pathHandler)
+	s.openAPIVersionedService, err = handler.NewOpenAPIService(specToServe)
+	if err != nil {
+		return nil, err
+	}
+	err = s.openAPIVersionedService.RegisterOpenAPIVersionedService("/openapi/v2", pathHandler)
 	if err != nil {
 		return nil, err
 	}