diff --git a/bindata/bootkube/manifests/daemonset-kube-controller-manager.yaml b/bindata/bootkube/manifests/daemonset-kube-controller-manager.yaml
deleted file mode 100644
index 01197cc52..000000000
--- a/bindata/bootkube/manifests/daemonset-kube-controller-manager.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: kube-controller-manager
-  namespace: kube-system
-  labels:
-    tier: "control-plane"
-    k8s-app: "kube-controller-manager"
-    openshift.io/control-plane: "true"
-    openshift.io/component: "controller"
-  annotations:
-    openshift.io/run-level: "0"
-spec:
-  selector:
-    matchLabels:
-      tier: "control-plane"
-      k8s-app: "kube-controller-manager"
-      openshift.io/control-plane: "true"
-      openshift.io/component: "controller"
-  template:
-    metadata:
-      labels:
-        tier: "control-plane"
-        k8s-app: "kube-controller-manager"
-        openshift.io/control-plane: "true"
-        openshift.io/component: "controller"
-    spec:
-      containers:
-      - name: kube-controller-manager
-        image: {{ .Image }}
-        imagePullPolicy: {{ .ImagePullPolicy }}
-        command: ["hyperkube", "kube-controller-manager"]
-        args:
-        - --openshift-config=/var/run/configmaps/config/config.yaml
-        - --kubeconfig=/var/run/configmaps/kubeconfig/kubeconfig
-        volumeMounts:
-        - mountPath: /var/run/configmaps/config
-          name: config
-        - mountPath: /var/run/configmaps/kubeconfig
-          name: kubeconfig
-        - mountPath: /var/run/secrets/service-account-private-key
-          name: service-account-private-key
-        - mountPath: /var/run/secrets/cluster-signing-ca
-          name: cluster-signing-ca
-        - mountPath: /var/run/configmaps/client-ca
-          name: client-ca
-      nodeSelector:
-        node-role.kubernetes.io/master: ""
-      tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
-        effect: NoSchedule
-      hostNetwork: true
-      volumes:
-      - name: config
-        configMap:
-          name: kube-controller-manager-config
-      - name: cluster-signing-ca
-        secret:
-          secretName: cluster-signing-ca
-      - name: service-account-private-key
-        secret:
-          secretName: service-account-private-key
-      - name: client-ca
-        configMap:
-          name: client-ca
-      - name: kubeconfig
-        secret:
-          secretName: controller-manager-kubeconfig
-  updateStrategy:
-    rollingUpdate:
-      maxUnavailable: 1
-    type: RollingUpdate
diff --git a/bindata/bootkube/manifests/kube-system-configmap-client-ca.yaml b/bindata/bootkube/manifests/kube-system-configmap-client-ca.yaml
deleted file mode 100644
index 2fe4476b4..000000000
--- a/bindata/bootkube/manifests/kube-system-configmap-client-ca.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: client-ca
-  namespace: kube-system
-  labels:
-    tier: "control-plane"
-    k8s-app: "kube-controller-manager"
-    openshift.io/control-plane: "true"
-    openshift.io/component: "controller"
-data:
-  ca-bundle.crt: |
-    {{ .Assets | load "kube-ca.crt" | indent 4 }}
-
diff --git a/bindata/bootkube/manifests/kube-system-configmap-kube-controller-manager-config.yaml b/bindata/bootkube/manifests/kube-system-configmap-kube-controller-manager-config.yaml
deleted file mode 100644
index a7b40b920..000000000
--- a/bindata/bootkube/manifests/kube-system-configmap-kube-controller-manager-config.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: kube-controller-manager-config
-  namespace: kube-system
-  labels:
-    tier: "control-plane"
-    k8s-app: "kube-controller-manager"
-    openshift.io/control-plane: "true"
-    openshift.io/component: "controller"
-data:
-  config.yaml: |
-    {{ .PostBootstrapConfig | indent 4 }}
diff --git a/bindata/bootkube/manifests/kube-system-secret-cluster-signing-ca.yaml b/bindata/bootkube/manifests/kube-system-secret-cluster-signing-ca.yaml
deleted file mode 100644
index bd4d587e6..000000000
--- a/bindata/bootkube/manifests/kube-system-secret-cluster-signing-ca.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: cluster-signing-ca
-  namespace: kube-system
-  labels:
-    tier: "control-plane"
-    k8s-app: "kube-controller-manager"
-    openshift.io/control-plane: "true"
-    openshift.io/component: "controller"
-data:
-  kube-ca.key: {{ .Assets | load "kube-ca.key" | base64 }}
-  kube-ca.crt: {{ .Assets | load "kube-ca.crt" | base64 }}
-
diff --git a/bindata/bootkube/manifests/kube-system-secret-kubeconfig.yaml b/bindata/bootkube/manifests/kube-system-secret-kubeconfig.yaml
deleted file mode 100644
index 84c77790c..000000000
--- a/bindata/bootkube/manifests/kube-system-secret-kubeconfig.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: controller-manager-kubeconfig
-  namespace: kube-system
-  labels:
-    tier: "control-plane"
-    k8s-app: "kube-controller-manager"
-    openshift.io/control-plane: "true"
-    openshift.io/component: "controller"
-data:
-  kubeconfig: {{ .Assets | load "kubeconfig" | base64 }}
diff --git a/bindata/bootkube/manifests/kube-system-secret-service-account-private-key.yaml b/bindata/bootkube/manifests/kube-system-secret-service-account-private-key.yaml
deleted file mode 100644
index 41712d80a..000000000
--- a/bindata/bootkube/manifests/kube-system-secret-service-account-private-key.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: service-account-private-key
-  namespace: kube-system
-  labels:
-    tier: "control-plane"
-    k8s-app: "kube-controller-manager"
-    openshift.io/control-plane: "true"
-    openshift.io/component: "controller"
-data:
-  service-account.key: {{ .Assets | load "service-account.key" | base64 }}
diff --git a/cmd/cluster-kube-controller-manager-operator/render/render.go b/cmd/cluster-kube-controller-manager-operator/render/render.go
index 951d72a20..00bb7652e 100644
--- a/cmd/cluster-kube-controller-manager-operator/render/render.go
+++ b/cmd/cluster-kube-controller-manager-operator/render/render.go
@@ -4,9 +4,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"os"
 	"path/filepath"
-	"strings"
 
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
@@ -14,7 +12,6 @@ import (
 
 	kubecontrolplanev1 "github.com/openshift/api/kubecontrolplane/v1"
 	"github.com/openshift/cluster-kube-controller-manager-operator/pkg/operator/v311_00_assets"
-	"github.com/openshift/library-go/pkg/assets"
 	genericrender "github.com/openshift/library-go/pkg/operator/render"
 	genericrenderoptions "github.com/openshift/library-go/pkg/operator/render/options"
 )
@@ -67,10 +64,10 @@ func (r *renderOpts) AddFlags(fs *pflag.FlagSet) {
 	r.manifest.AddFlags(fs, "controller manager")
 	r.generic.AddFlags(fs, kubecontrolplanev1.GroupVersion.WithKind("KubeControllerManagerConfig"))
 
-	// TODO: remove after the transition in the installer to a phase-2 free bootstrapping
+	// TODO: remove when the installer has stopped using it
 	fs.BoolVar(&r.disablePhase2, "disable-phase-2", r.disablePhase2, "Disable rendering of the phase 2 daemonset and dependencies.")
 	fs.MarkHidden("disable-phase-2")
-	fs.MarkDeprecated("disable-phase-2", "Only used temporarily to synchronize roll out of the phase 2 removal.")
+	fs.MarkDeprecated("disable-phase-2", "Only used temporarily to synchronize roll out of the phase 2 removal. Does nothing anymore.")
 }
 
 // Validate verifies the inputs.
@@ -118,21 +115,7 @@ func (r *renderOpts) Run() error {
 		renderConfig.Assets["kubeconfig"] = kubeConfig
 	}
 
-	// TODO: remove after the transition in the installer to a phase-2 free bootstrapping
-	var filters []assets.FileInfoPredicate
-	if r.disablePhase2 {
-		filters = append(filters, func(info os.FileInfo) bool {
-			if strings.HasPrefix(info.Name(), "kube-system-") {
-				return false
-			}
-			if info.Name() == "daemonset-kube-controller-manager.yaml" {
-				return false
-			}
-			return true
-		})
-	}
-
-	return genericrender.WriteFiles(&r.generic, &renderConfig.FileConfig, renderConfig, filters...)
+	return genericrender.WriteFiles(&r.generic, &renderConfig.FileConfig, renderConfig)
 }
 
 func (r *renderOpts) readBootstrapSecretsKubeconfig() ([]byte, error) {