diff --git a/moosefs/cleaned.sls b/moosefs/cleaned.sls
new file mode 100644
index 0000000..74d3e04
--- /dev/null
+++ b/moosefs/cleaned.sls
@@ -0,0 +1,20 @@
+# -*- mode: salt; coding: utf-8 -*-
+# vim: ft=sls
+
+{%- set includes = [] %}
+{%- set components = [
+      "netdump",
+      "cli",
+      "client",
+      "cgiserv",
+      "cgi",
+      "chunkserver",
+      "metalogger",
+      "master",
+    ] %}
+
+{%- for component in components %}
+{%-   do includes.append("." ~ component ~ ".cleaned") %}
+{%- endfor %}
+
+include: {{ includes }}
diff --git a/moosefs/init.sls b/moosefs/init.sls
index 351fcb3..8130047 100644
--- a/moosefs/init.sls
+++ b/moosefs/init.sls
@@ -1,23 +1,26 @@
-{% from "moosefs/map.jinja" import moosefs with context %}
+# -*- mode: salt; coding: utf-8 -*-
+# vim: ft=sls
 
+{#- Get the `tplroot` from `tpldir` #}
+{%- set tplroot = tpldir.split("/")[0] %}
+{%- from tplroot ~ "/libs/map.jinja" import mapdata as moosefs without context %}
 
-build_essestial:
-  pkg.installed:
-    - pkgs:
-{% for required_pkg in moosefs.required_pkgs %}
-      - {{ required_pkg }}
-{% endfor %}
+{%- set includes = [] %}
+{%- set components = [
+      "master",
+      "metalogger",
+      "chunkserver",
+      "cgi",
+      "cgiserv",
+      "client",
+      "cli",
+      "netdump",
+    ] %}
 
-mfs-group:
-  group.present:
-    - name: mfs
-    - system: True
+{%- for component in components %}
+{%-   if moosefs | traverse(component ~ ":enabled", False) %}
+{%-     do includes.append("." ~ component) %}
+{%-   endif %}
+{%- endfor %}
 
-mfs:
-  user.present:
-    - name: mfs
-    - fullname: MooseFS
-    - home: /home/mfs
-    - createhome: True
-    - groups:
-      - mfs
+include: {{ includes }}