diff --git a/core/controlplane/config/templates/cloud-config-controller b/core/controlplane/config/templates/cloud-config-controller
index d97e78781..e3514eadd 100644
--- a/core/controlplane/config/templates/cloud-config-controller
+++ b/core/controlplane/config/templates/cloud-config-controller
@@ -961,20 +961,6 @@ write_files:
       # Deployments
       applyall "${mfdir}"/{kube-dns,kube-dns-autoscaler,kubernetes-dashboard,{{ if .Addons.ClusterAutoscaler.Enabled }}cluster-autoscaler,{{ end }}heapster{{ if .KubeResourcesAutosave.Enabled }},kube-resources-autosave{{ end }}}"-de.yaml"
 
-{{/* RUN-605 Add Flyte */}}
-      {{ if .CustomSettings.Flyte.Enabled }}
-      kubectl apply -f "${mfdir}/flyte-konveyor.yaml"
-      {{ end }}
-{{/* RUN-605 Add Flyte */}}
-
-{{/* RUN-861 Add Helm-deploy-operator */}}
-      {{ if .CustomSettings.HelmDeployOperator.Enabled }}
-      kubectl apply -f "${mfdir}/helm-deploy-crd.yaml"
-      kubectl apply -f "${rbac}/helm-deploy-operator.yaml"
-      kubectl apply -f "${mfdir}/helm-deploy-operator.yaml"
-      {{ end }}
-{{/* RUN-861 */}}
-
       # Daemonsets
       applyall "${mfdir}"/kube-proxy"-ds.yaml"
 
@@ -4386,174 +4372,6 @@ write_files:
         status:
           loadBalancer: {}
 
-{{/* RUN-605 Add Flyte */}}
-{{ if .CustomSettings.Flyte.Enabled }}
-  - path: /srv/kubernetes/manifests/flyte-konveyor.yaml
-    content: |
-        apiVersion: extensions/v1beta1
-        kind: Deployment
-        metadata:
-          name: flyte-konveyor
-          namespace: kube-public
-        spec:
-          replicas: {{ default 1 .CustomSettings.Flyte.Replicas }}
-          template:
-            metadata:
-              labels:
-                app: flyte-konveyor
-            spec:
-              containers:
-              - name: flyte-konveyor
-                image: {{ default "181651482125.dkr.ecr.us-west-2.amazonaws.com/hotels/fkp:latest" .CustomSettings.Flyte.ImageWithTag }}
-                imagePullPolicy: Always
-                env:
-                - name: FLYTE_HOST
-                  value: {{ default "http://flyte.hcom" .CustomSettings.Flyte.HostUrl }}
-                - name: FLYTE_ENVIRONMENT
-                  value: {{ .ClusterName }}
-                - name: VAULT_ADDR
-                  value: {{ .CustomSettings.vault.address }}
-                volumeMounts:
-                - mountPath: /konveyor
-                  name: logs
-                  readOnly: false
-              volumes:
-              - name: logs
-                hostPath:
-                  path: /logs/konveyor
-{{ end }}
-{{/* RUN-605 Add Flyte */}}
-
-{{/* RUN-861 Add HelmDeployOperator and associated resources  */}}
-{{ if .CustomSettings.HelmDeployOperator.Enabled }}
-  - path: /srv/kubernetes/manifests/helm-deploy-crd.yaml
-    content: |
-        apiVersion: apiextensions.k8s.io/v1beta1
-        kind: CustomResourceDefinition
-        metadata:
-          name: helmdeploys.hotels.com
-        spec:
-          scope: Namespaced
-          group: hotels.com
-          version: v1
-          names:
-            kind: HelmDeploy
-            plural: helmdeploys
-            singular: helmdeploy
-            shortNames:
-            - hd
-
-  - path: /srv/kubernetes/rbac/helm-deploy-operator.yaml
-    content: |
-        apiVersion: v1
-        kind: ServiceAccount
-        metadata:
-          name: helm-deploy-operator
-          namespace: kube-public
-          labels:
-            app: helm-deploy-operator
-        ---
-        apiVersion: rbac.authorization.k8s.io/v1beta1
-        kind: ClusterRole
-        metadata:
-          name: hotels:controller:helm-deploy-operator
-          labels:
-            app: helm-deploy-operator
-        rules:
-          - apiGroups:
-              - ""
-            resources:
-              - "pods"
-            verbs:
-              - create
-              - list
-              - get
-          - apiGroups:
-              - "hotels.com"
-            resources:
-              - "helmdeploys"
-            verbs:
-              - get
-              - list
-              - update
-              - watch
-        ---
-        apiVersion: rbac.authorization.k8s.io/v1beta1
-        kind: ClusterRoleBinding
-        metadata:
-          name: hotels:controller:helm-deploy-operator
-          labels:
-            app: helm-deploy-operator
-        roleRef:
-          apiGroup: rbac.authorization.k8s.io
-          kind: ClusterRole
-          name: hotels:controller:helm-deploy-operator
-        subjects:
-          - kind: ServiceAccount
-            name: helm-deploy-operator
-            namespace: kube-public
-
-  - path: /srv/kubernetes/manifests/helm-deploy-operator.yaml
-    content: |
-        apiVersion: apps/v1beta2
-        kind: Deployment
-        metadata:
-          name: helm-deploy-operator
-          namespace: kube-public
-        spec:
-          replicas: 1
-          selector:
-            matchLabels:
-              app: helm-deploy-operator
-          strategy:
-            type: Recreate
-          template:
-            metadata:
-              labels:
-                app: helm-deploy-operator
-                type: operator
-              # I'm not adding a 'critical' annotation here since it will only be used if the operator runs in the kube-system namespace (which we're not doing): https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/
-            spec:
-              priorityClassName: SYSTEM
-              serviceAccountName: helm-deploy-operator
-              containers:
-              - name: helm-deploy-operator
-                image: {{ .CustomSettings.HelmDeployOperator.ImageWithTag }}
-                imagePullPolicy: Always
-                command: ["/helm-deploy-operator"]
-                args: ['-incluster', '-v=5', '-alsologtostderr', '-log_dir=/logs/', '-helmimage={{ .CustomSettings.HelmDeployOperator.Helm.ImageWithTag }}']
-                resources:
-                  requests:
-                    memory: "50Mi"
-                    cpu: "250m"
-                  limits:
-                    memory: "50Mi"
-                    cpu: "250m"
-                ports:
-                - containerPort: 8080
-                readinessProbe:
-                  httpGet:
-                    path: /healthz
-                    port: 8080
-                  initialDelaySeconds: 5
-                  periodSeconds: 10
-                livenessProbe:
-                  httpGet:
-                    path: /healthz
-                    port: 8080
-                  initialDelaySeconds: 5
-                  periodSeconds: 10
-                volumeMounts:
-                - mountPath: /logs
-                  name: logs
-                  readOnly: false
-              volumes:
-              - name: logs
-                hostPath:
-                  path: /logs/helm-deploy-operator
-{{ end }}
-{{/* RUN-861 */}}
-
   - path: {{.KubernetesManifestPlugin.ManifestListFile.Path}}
     encoding: gzip+base64
     content: {{.KubernetesManifestPlugin.ManifestListFile.Content.ToGzip.ToBase64}}