diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml
index 7916e9c..306fb15 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml
@@ -6,24 +6,10 @@
 - system.kubernetes.master.cluster
 - cluster.k8s-ha-calico-cloudprovider.kubernetes.compute
 - cluster.k8s-ha-calico-cloudprovider
-# FIXME: replace service.helm to system.helm (once properly in reclass)
-- service.helm.client
 parameters:
   _param:
     keepalived_vip_interface: ${_param:primary_interface}
     keepalived_vip_virtual_router_id: 60
-  helm:
-    client:
-      repos:
-        mirantisworkloads: https://mirantisworkloads.storage.googleapis.com/
-      #releases:
-      # TODO: configure custom application stacks below
-      #  grafana:
-      #    chart: mirantisworkloads/grafana
-      #    version: 0.4.1
-      #    values:
-      #      replicas: 1
-      #      logLevel: INFO
   etcd:
     server:
       source:
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/control.yml b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
index 1b88da8..11bd2e5 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
@@ -6,24 +6,10 @@
 - system.kubernetes.master.cluster
 - cluster.k8s-ha-calico.kubernetes.compute
 - cluster.k8s-ha-calico
-# FIXME: replace service.helm to system.helm (once properly in reclass)
-- service.helm.client
 parameters:
   _param:
     keepalived_vip_interface: ${_param:primary_interface}
     keepalived_vip_virtual_router_id: 60
-  helm:
-    client:
-      repos:
-        mirantisworkloads: https://mirantisworkloads.storage.googleapis.com/
-      #releases:
-      # TODO: configure custom application stacks below
-      #  grafana:
-      #    chart: mirantisworkloads/grafana
-      #    version: 0.4.1
-      #    values:
-      #      replicas: 1
-      #      logLevel: INFO
   etcd:
     server:
       bind: