diff --git a/server.sls b/server.sls
old mode 100644
new mode 100755
index 8a185a1..bac494b
--- a/server.sls
+++ b/server.sls
@@ -16,13 +16,13 @@
   - system: True
   - home: /srv/statsd
   - require:
-    git: https://github.com/etsy/statsd.git
+    - git: https://github.com/etsy/statsd.git
 
 https://github.com/etsy/statsd.git:
   git.latest:
   - target: /srv/statsd/statsd
 
-{#
+
 /etc/init.d/statsd:
   file:
   - managed
@@ -31,15 +31,15 @@
   - group: root
   - mode: 744
   - template: jinja
-#}
-
+{#
 statsd:
   service.running:
-#  - require:
-#    - file: /etc/init.d/statsd
+  - enable: true
+  - require:
+    - file: /etc/init.d/statsd
   - watch:
     - file: /etc/statsd/localConfig.js
-
+#}
 /etc/statsd/localConfig.js:
   file:
   - managed
@@ -49,38 +49,6 @@
   - mode: 644
   - template: jinja
 
-{#
-/etc/default/statsd:
-  file:
-  - managed
-  - source: salt://statsd/conf/default
-  - user: root
-  - group: root
-  - mode: 644
-  - template: jinja
-
-/srv/statsd/scripts:
-  file:
-  - directory
-  - user: statsd
-  - group: statsd
-  - mode: 770
-  - require:
-    - user: statsd
-    - git: https:://github.com/etsy/statsd.git
-
-/srv/statsd/scripts/start:
-  file:
-  - managed
-  - source: salt://statsd/conf/start
-  - user: root
-  - group: root
-  - mode: 744
-  - template: jinja
-  - require:
-    - file: /srv/statsd/scripts
-#}
-
 /var/log/statsd:
   file:
   - directory
@@ -90,12 +58,7 @@
   - require:
     - user: statsd
 
-update-rc.d statsd defaults:
-  cmd.run:
-  - require:
-    - service: statsd
-
-{%- for backend in pillar.statsd.backends %}
+{%- for backend in pillar.statsd.server.backends %}
 
 {%- if backend.type == 'amqp' %}
 #statsd_amqp_package: