diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures
index 93242d8961b..6021171d132 100644
--- a/hack/.staticcheck_failures
+++ b/hack/.staticcheck_failures
@@ -53,4 +53,3 @@ vendor/k8s.io/client-go/rest
 vendor/k8s.io/client-go/rest/watch
 vendor/k8s.io/client-go/transport
 vendor/k8s.io/kubectl/pkg/cmd/scale
-vendor/k8s.io/metrics/pkg/client/custom_metrics
diff --git a/staging/src/k8s.io/metrics/pkg/client/custom_metrics/multi_client.go b/staging/src/k8s.io/metrics/pkg/client/custom_metrics/multi_client.go
index cbc91a9d26e..0984aa9b1a8 100644
--- a/staging/src/k8s.io/metrics/pkg/client/custom_metrics/multi_client.go
+++ b/staging/src/k8s.io/metrics/pkg/client/custom_metrics/multi_client.go
@@ -46,7 +46,7 @@ func PeriodicallyInvalidate(cache AvailableAPIsGetter, interval time.Duration, s
 		case <-ticker.C:
 			cache.Invalidate()
 		case <-stopCh:
-			break
+			return
 		}
 	}
 }
diff --git a/staging/src/k8s.io/metrics/pkg/client/custom_metrics/versioned_client.go b/staging/src/k8s.io/metrics/pkg/client/custom_metrics/versioned_client.go
index 505b17cec82..6835e80ff0b 100644
--- a/staging/src/k8s.io/metrics/pkg/client/custom_metrics/versioned_client.go
+++ b/staging/src/k8s.io/metrics/pkg/client/custom_metrics/versioned_client.go
@@ -24,7 +24,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/util/flowcontrol"
 
@@ -34,10 +33,7 @@ import (
 	"k8s.io/metrics/pkg/client/custom_metrics/scheme"
 )
 
-var (
-	codecs           = serializer.NewCodecFactory(scheme.Scheme)
-	versionConverter = NewMetricConverter()
-)
+var versionConverter = NewMetricConverter()
 
 type customMetricsClient struct {
 	client  rest.Interface