diff --git a/heka/_service.sls b/heka/_service.sls
index c1c85ed..8a09ea7 100644
--- a/heka/_service.sls
+++ b/heka/_service.sls
@@ -78,8 +78,6 @@
     'decoder': {},
     'input': {},
     'trigger': {},
-    'alarm': {},
-    'alarm_cluster': {},
     'filter': {},
     'splitter': {},
     'encoder': {},
@@ -90,7 +88,6 @@
     'input': {},
     'trigger': {},
     'alarm': {},
-    'alarm_cluster': {},
     'filter': {},
     'splitter': {},
     'encoder': {},
@@ -101,7 +98,6 @@
     'input': {},
     'trigger': {},
     'alarm': {},
-    'alarm_cluster': {},
     'filter': {},
     'splitter': {},
     'encoder': {},
@@ -111,7 +107,6 @@
     'decoder': {},
     'input': {},
     'trigger': {},
-    'alarm': {},
     'alarm_cluster': {},
     'filter': {},
     'splitter': {},
diff --git a/heka/map.jinja b/heka/map.jinja
index c7de276..f03637d 100644
--- a/heka/map.jinja
+++ b/heka/map.jinja
@@ -10,10 +10,6 @@
   - syslog
   service:
   - heka
-  filter: {}
-  splitter: {}
-  encoder: {}
-  decoder: {}
   extra_fields:
     environment_label: {{ grains.domain }}
   {%- if pillar.get('linux', {}).get('system', {}).timezone is defined %}