diff --git a/pkg/controller/controlplane/valuesprovider.go b/pkg/controller/controlplane/valuesprovider.go
index 367c6cf..6365b46 100644
--- a/pkg/controller/controlplane/valuesprovider.go
+++ b/pkg/controller/controlplane/valuesprovider.go
@@ -144,10 +144,6 @@ func (vp *valuesProvider) GetConfigChartValues(
 	cp *extensionsv1alpha1.ControlPlane,
 	cluster *extensionscontroller.Cluster,
 ) (map[string]interface{}, error) {
-	infrastructureStatus := &apismetal.InfrastructureStatus{}
-	if _, _, err := vp.decoder.Decode(cp.Spec.InfrastructureProviderStatus.Raw, nil, infrastructureStatus); err != nil {
-		return nil, fmt.Errorf("failed to decode infrastructure status: %w", err)
-	}
 	// Collect config chart values
 	return map[string]interface{}{
 		metal.ClusterFieldName: cluster.ObjectMeta.Name,
diff --git a/pkg/controller/controlplane/valuesprovider_test.go b/pkg/controller/controlplane/valuesprovider_test.go
index a9db31e..dbf6c8a 100644
--- a/pkg/controller/controlplane/valuesprovider_test.go
+++ b/pkg/controller/controlplane/valuesprovider_test.go
@@ -74,9 +74,6 @@ var _ = Describe("Valueprovider Reconcile", func() {
 							}),
 						},
 					},
-					InfrastructureProviderStatus: &runtime.RawExtension{
-						Raw: encode(&apismetal.InfrastructureStatus{}),
-					},
 				},
 			}
 			Expect(k8sClient.Create(ctx, cp)).To(Succeed())
@@ -129,9 +126,6 @@ var _ = Describe("Valueprovider Reconcile", func() {
 							}),
 						},
 					},
-					InfrastructureProviderStatus: &runtime.RawExtension{
-						Raw: encode(&apismetal.InfrastructureStatus{}),
-					},
 				},
 			}
 			providerCloudProfile := &apismetal.CloudProfileConfig{}
diff --git a/pkg/controller/healthcheck/add.go b/pkg/controller/healthcheck/add.go
index e2d078b..aab927c 100644
--- a/pkg/controller/healthcheck/add.go
+++ b/pkg/controller/healthcheck/add.go
@@ -60,10 +60,6 @@ func RegisterHealthChecks(ctx context.Context, mgr manager.Manager, opts healthc
 				ConditionType: string(gardencorev1beta1.ShootSystemComponentsHealthy),
 				HealthCheck:   general.CheckManagedResource(genericcontrolplaneactuator.ControlPlaneShootChartResourceName),
 			},
-			{
-				ConditionType: string(gardencorev1beta1.ShootSystemComponentsHealthy),
-				HealthCheck:   general.CheckManagedResource(genericcontrolplaneactuator.StorageClassesChartResourceName),
-			},
 		},
 		sets.New[gardencorev1beta1.ConditionType](gardencorev1beta1.ShootSystemComponentsHealthy),
 	); err != nil {