diff --git a/pkg/apis/clientauthentication/v1beta1/zz_generated.conversion.go b/pkg/apis/clientauthentication/v1beta1/zz_generated.conversion.go
index 94ef4b73..0e533e46 100644
--- a/pkg/apis/clientauthentication/v1beta1/zz_generated.conversion.go
+++ b/pkg/apis/clientauthentication/v1beta1/zz_generated.conversion.go
@@ -51,11 +51,6 @@ func RegisterConversions(s *runtime.Scheme) error {
 	}); err != nil {
 		return err
 	}
-	if err := s.AddGeneratedConversionFunc((*clientauthentication.ExecCredentialSpec)(nil), (*ExecCredentialSpec)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_clientauthentication_ExecCredentialSpec_To_v1beta1_ExecCredentialSpec(a.(*clientauthentication.ExecCredentialSpec), b.(*ExecCredentialSpec), scope)
-	}); err != nil {
-		return err
-	}
 	if err := s.AddGeneratedConversionFunc((*ExecCredentialStatus)(nil), (*clientauthentication.ExecCredentialStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
 		return Convert_v1beta1_ExecCredentialStatus_To_clientauthentication_ExecCredentialStatus(a.(*ExecCredentialStatus), b.(*clientauthentication.ExecCredentialStatus), scope)
 	}); err != nil {
diff --git a/scale/scheme/appsv1beta1/conversion.go b/scale/scheme/appsv1beta1/conversion.go
index af062b3c..f271c825 100644
--- a/scale/scheme/appsv1beta1/conversion.go
+++ b/scale/scheme/appsv1beta1/conversion.go
@@ -22,23 +22,9 @@ import (
 	v1beta1 "k8s.io/api/apps/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/conversion"
-	"k8s.io/apimachinery/pkg/runtime"
 	scheme "k8s.io/client-go/scale/scheme"
 )
 
-// addConversions registers conversions between the internal version
-// of Scale and supported external versions of Scale.
-func addConversionFuncs(scheme *runtime.Scheme) error {
-	err := scheme.AddConversionFuncs(
-		Convert_scheme_ScaleStatus_To_v1beta1_ScaleStatus,
-		Convert_v1beta1_ScaleStatus_To_scheme_ScaleStatus,
-	)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
 func Convert_scheme_ScaleStatus_To_v1beta1_ScaleStatus(in *scheme.ScaleStatus, out *v1beta1.ScaleStatus, s conversion.Scope) error {
 	out.Replicas = in.Replicas
 	out.Selector = nil
diff --git a/scale/scheme/appsv1beta1/register.go b/scale/scheme/appsv1beta1/register.go
index a684f2d5..f11fcbd0 100644
--- a/scale/scheme/appsv1beta1/register.go
+++ b/scale/scheme/appsv1beta1/register.go
@@ -41,5 +41,5 @@ func init() {
 	// We only register manually written functions here. The registration of the
 	// generated functions takes place in the generated files. The separation
 	// makes the code compile even when the generated files are missing.
-	localSchemeBuilder.Register(addConversionFuncs)
+	localSchemeBuilder.Register()
 }
diff --git a/scale/scheme/appsv1beta1/zz_generated.conversion.go b/scale/scheme/appsv1beta1/zz_generated.conversion.go
index 16d53c69..02a36051 100644
--- a/scale/scheme/appsv1beta1/zz_generated.conversion.go
+++ b/scale/scheme/appsv1beta1/zz_generated.conversion.go
@@ -54,16 +54,6 @@ func RegisterConversions(s *runtime.Scheme) error {
 	}); err != nil {
 		return err
 	}
-	if err := s.AddGeneratedConversionFunc((*v1beta1.ScaleStatus)(nil), (*scheme.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1beta1_ScaleStatus_To_scheme_ScaleStatus(a.(*v1beta1.ScaleStatus), b.(*scheme.ScaleStatus), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*scheme.ScaleStatus)(nil), (*v1beta1.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_scheme_ScaleStatus_To_v1beta1_ScaleStatus(a.(*scheme.ScaleStatus), b.(*v1beta1.ScaleStatus), scope)
-	}); err != nil {
-		return err
-	}
 	if err := s.AddConversionFunc((*scheme.ScaleStatus)(nil), (*v1beta1.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
 		return Convert_scheme_ScaleStatus_To_v1beta1_ScaleStatus(a.(*scheme.ScaleStatus), b.(*v1beta1.ScaleStatus), scope)
 	}); err != nil {
diff --git a/scale/scheme/appsv1beta2/conversion.go b/scale/scheme/appsv1beta2/conversion.go
index f07de6bd..35d15c30 100644
--- a/scale/scheme/appsv1beta2/conversion.go
+++ b/scale/scheme/appsv1beta2/conversion.go
@@ -22,23 +22,9 @@ import (
 	v1beta2 "k8s.io/api/apps/v1beta2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/conversion"
-	"k8s.io/apimachinery/pkg/runtime"
 	scheme "k8s.io/client-go/scale/scheme"
 )
 
-// addConversions registers conversions between the internal version
-// of Scale and supported external versions of Scale.
-func addConversionFuncs(scheme *runtime.Scheme) error {
-	err := scheme.AddConversionFuncs(
-		Convert_scheme_ScaleStatus_To_v1beta2_ScaleStatus,
-		Convert_v1beta2_ScaleStatus_To_scheme_ScaleStatus,
-	)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
 func Convert_scheme_ScaleStatus_To_v1beta2_ScaleStatus(in *scheme.ScaleStatus, out *v1beta2.ScaleStatus, s conversion.Scope) error {
 	out.Replicas = in.Replicas
 	out.Selector = nil
diff --git a/scale/scheme/appsv1beta2/register.go b/scale/scheme/appsv1beta2/register.go
index 88de0893..5e8a5d20 100644
--- a/scale/scheme/appsv1beta2/register.go
+++ b/scale/scheme/appsv1beta2/register.go
@@ -41,5 +41,5 @@ func init() {
 	// We only register manually written functions here. The registration of the
 	// generated functions takes place in the generated files. The separation
 	// makes the code compile even when the generated files are missing.
-	localSchemeBuilder.Register(addConversionFuncs)
+	localSchemeBuilder.Register()
 }
diff --git a/scale/scheme/appsv1beta2/zz_generated.conversion.go b/scale/scheme/appsv1beta2/zz_generated.conversion.go
index 1901be8c..c31ad4b3 100644
--- a/scale/scheme/appsv1beta2/zz_generated.conversion.go
+++ b/scale/scheme/appsv1beta2/zz_generated.conversion.go
@@ -54,16 +54,6 @@ func RegisterConversions(s *runtime.Scheme) error {
 	}); err != nil {
 		return err
 	}
-	if err := s.AddGeneratedConversionFunc((*v1beta2.ScaleStatus)(nil), (*scheme.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1beta2_ScaleStatus_To_scheme_ScaleStatus(a.(*v1beta2.ScaleStatus), b.(*scheme.ScaleStatus), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*scheme.ScaleStatus)(nil), (*v1beta2.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_scheme_ScaleStatus_To_v1beta2_ScaleStatus(a.(*scheme.ScaleStatus), b.(*v1beta2.ScaleStatus), scope)
-	}); err != nil {
-		return err
-	}
 	if err := s.AddConversionFunc((*scheme.ScaleStatus)(nil), (*v1beta2.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
 		return Convert_scheme_ScaleStatus_To_v1beta2_ScaleStatus(a.(*scheme.ScaleStatus), b.(*v1beta2.ScaleStatus), scope)
 	}); err != nil {
diff --git a/scale/scheme/autoscalingv1/conversion.go b/scale/scheme/autoscalingv1/conversion.go
index a775bcc2..36ef82b9 100644
--- a/scale/scheme/autoscalingv1/conversion.go
+++ b/scale/scheme/autoscalingv1/conversion.go
@@ -22,24 +22,9 @@ import (
 	v1 "k8s.io/api/autoscaling/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/conversion"
-	"k8s.io/apimachinery/pkg/runtime"
 	scheme "k8s.io/client-go/scale/scheme"
 )
 
-// addConversions registers conversions between the internal version
-// of Scale and supported external versions of Scale.
-func addConversionFuncs(scheme *runtime.Scheme) error {
-	err := scheme.AddConversionFuncs(
-		Convert_scheme_ScaleStatus_To_v1_ScaleStatus,
-		Convert_v1_ScaleStatus_To_scheme_ScaleStatus,
-	)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func Convert_scheme_ScaleStatus_To_v1_ScaleStatus(in *scheme.ScaleStatus, out *v1.ScaleStatus, s conversion.Scope) error {
 	out.Replicas = in.Replicas
 	out.Selector = ""
diff --git a/scale/scheme/autoscalingv1/register.go b/scale/scheme/autoscalingv1/register.go
index b15701c4..4339376c 100644
--- a/scale/scheme/autoscalingv1/register.go
+++ b/scale/scheme/autoscalingv1/register.go
@@ -41,5 +41,5 @@ func init() {
 	// We only register manually written functions here. The registration of the
 	// generated functions takes place in the generated files. The separation
 	// makes the code compile even when the generated files are missing.
-	localSchemeBuilder.Register(addConversionFuncs)
+	localSchemeBuilder.Register()
 }
diff --git a/scale/scheme/autoscalingv1/zz_generated.conversion.go b/scale/scheme/autoscalingv1/zz_generated.conversion.go
index 203f8b32..9bc48695 100644
--- a/scale/scheme/autoscalingv1/zz_generated.conversion.go
+++ b/scale/scheme/autoscalingv1/zz_generated.conversion.go
@@ -54,16 +54,6 @@ func RegisterConversions(s *runtime.Scheme) error {
 	}); err != nil {
 		return err
 	}
-	if err := s.AddGeneratedConversionFunc((*v1.ScaleStatus)(nil), (*scheme.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1_ScaleStatus_To_scheme_ScaleStatus(a.(*v1.ScaleStatus), b.(*scheme.ScaleStatus), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*scheme.ScaleStatus)(nil), (*v1.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_scheme_ScaleStatus_To_v1_ScaleStatus(a.(*scheme.ScaleStatus), b.(*v1.ScaleStatus), scope)
-	}); err != nil {
-		return err
-	}
 	if err := s.AddConversionFunc((*scheme.ScaleStatus)(nil), (*v1.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
 		return Convert_scheme_ScaleStatus_To_v1_ScaleStatus(a.(*scheme.ScaleStatus), b.(*v1.ScaleStatus), scope)
 	}); err != nil {
diff --git a/scale/scheme/extensionsv1beta1/conversion.go b/scale/scheme/extensionsv1beta1/conversion.go
index 1b6b9e61..821eb33d 100644
--- a/scale/scheme/extensionsv1beta1/conversion.go
+++ b/scale/scheme/extensionsv1beta1/conversion.go
@@ -22,23 +22,9 @@ import (
 	v1beta1 "k8s.io/api/extensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/conversion"
-	"k8s.io/apimachinery/pkg/runtime"
 	scheme "k8s.io/client-go/scale/scheme"
 )
 
-// addConversions registers conversions between the internal version
-// of Scale and supported external versions of Scale.
-func addConversionFuncs(scheme *runtime.Scheme) error {
-	err := scheme.AddConversionFuncs(
-		Convert_scheme_ScaleStatus_To_v1beta1_ScaleStatus,
-		Convert_v1beta1_ScaleStatus_To_scheme_ScaleStatus,
-	)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
 func Convert_scheme_ScaleStatus_To_v1beta1_ScaleStatus(in *scheme.ScaleStatus, out *v1beta1.ScaleStatus, s conversion.Scope) error {
 	out.Replicas = in.Replicas
 	out.Selector = nil
diff --git a/scale/scheme/extensionsv1beta1/register.go b/scale/scheme/extensionsv1beta1/register.go
index aed1174e..248a0071 100644
--- a/scale/scheme/extensionsv1beta1/register.go
+++ b/scale/scheme/extensionsv1beta1/register.go
@@ -41,5 +41,5 @@ func init() {
 	// We only register manually written functions here. The registration of the
 	// generated functions takes place in the generated files. The separation
 	// makes the code compile even when the generated files are missing.
-	localSchemeBuilder.Register(addConversionFuncs)
+	localSchemeBuilder.Register()
 }
diff --git a/scale/scheme/extensionsv1beta1/zz_generated.conversion.go b/scale/scheme/extensionsv1beta1/zz_generated.conversion.go
index 99aef865..5fd69a5a 100644
--- a/scale/scheme/extensionsv1beta1/zz_generated.conversion.go
+++ b/scale/scheme/extensionsv1beta1/zz_generated.conversion.go
@@ -54,16 +54,6 @@ func RegisterConversions(s *runtime.Scheme) error {
 	}); err != nil {
 		return err
 	}
-	if err := s.AddGeneratedConversionFunc((*v1beta1.ScaleStatus)(nil), (*scheme.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1beta1_ScaleStatus_To_scheme_ScaleStatus(a.(*v1beta1.ScaleStatus), b.(*scheme.ScaleStatus), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*scheme.ScaleStatus)(nil), (*v1beta1.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_scheme_ScaleStatus_To_v1beta1_ScaleStatus(a.(*scheme.ScaleStatus), b.(*v1beta1.ScaleStatus), scope)
-	}); err != nil {
-		return err
-	}
 	if err := s.AddConversionFunc((*scheme.ScaleStatus)(nil), (*v1beta1.ScaleStatus)(nil), func(a, b interface{}, scope conversion.Scope) error {
 		return Convert_scheme_ScaleStatus_To_v1beta1_ScaleStatus(a.(*scheme.ScaleStatus), b.(*v1beta1.ScaleStatus), scope)
 	}); err != nil {