diff --git a/hshbase/init.sls b/hshbase/init.sls
index 25cf01fac93171cac0928f90852ed8df5bce4168..706fd03c696e28349a73cb608bc127c0777bf242 100644
--- a/hshbase/init.sls
+++ b/hshbase/init.sls
@@ -8,4 +8,3 @@ include:
   - .openvmtools
   - .time
   - .locale
-  - .snmpd
diff --git a/hshbase/snmpd/files/default.snmpd b/hshbase/snmpd/files/default.snmpd
deleted file mode 100644
index 60af2f267910958b4889af07f9640aa3e463d941..0000000000000000000000000000000000000000
--- a/hshbase/snmpd/files/default.snmpd
+++ /dev/null
@@ -1,3 +0,0 @@
-# Don't load any MIBs by default.
-# You might comment this lines once you have the MIBs downloaded.
-export MIBS=UCD-SNMP-MIB
diff --git a/hshbase/snmpd/files/snmpd.conf b/hshbase/snmpd/files/snmpd.conf
deleted file mode 100644
index b2d713e2b48ef0b514dd44a95130d4928bfc5eb0..0000000000000000000000000000000000000000
--- a/hshbase/snmpd/files/snmpd.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# Listen on all interfaces - default is good
-agentAddress    udp:161,udp6:[::1]:161
-# Credentials for SNMPv3 - used in What's Up Gold
-createUser      hshuser MD5 "hshmonitoringtest" 
-defaultMonitors yes
-# specific disk monitoring
-disk    /       10000
-disk    /var    5%
-# also list all other disks
-includeAllDisks 10%
-iquerySecName   hshuser
-linkUpDownNotifications yes
-# maximum load threshold (1min, 5min, 15min)
-load    12 10 5
-master  agentx
-rouser  hshuser
-sysContact      HsH Webteam
-sysLocation     HsH IT VDC
-# 72 is alright for now. (No idea)
-sysServices     72
-# default systemonly view is fine
-view    systemonly included .1.3.6.1.2.1.1
-view    systemonly included .1.3.6.1.2.1.25.1
diff --git a/hshbase/snmpd/init.sls b/hshbase/snmpd/init.sls
deleted file mode 100644
index 239a909f2c54749a4b2423680e81e9f48d790b29..0000000000000000000000000000000000000000
--- a/hshbase/snmpd/init.sls
+++ /dev/null
@@ -1,38 +0,0 @@
-{% from "hshbase/map.jinja" import hshbase with context %}
-
-{% if hshbase.snmpd %}
-
-{% if grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' %}
-hsh_snmpd_installed:
-  pkg.installed:
-    - pkgs: [snmpd, snmp-mibs-downloader]
-
-/etc/snmp/snmpd.conf:
-  file.managed:
-    - source: salt://hshbase/snmpd/files/snmpd.conf
-    - mode: 644
-    - user: root
-    - group: root
-
-/etc/default/snmpd:
-  file.managed:
-    - source: salt://hshbase/snmpd/files/default.snmpd
-    - mode: 644
-    - user: root
-    - group: root
-
-hsh_snmpd_service_running:
-  service.running:
-    - name: snmpd
-    - reload: True
-    - enable: True
-    - watch:
-      - file: /etc/snmp/snmpd.conf
-      - file: /etc/default/snmpd
-    - require:
-      - file: /etc/snmp/snmpd.conf
-      - file: /etc/default/snmpd
-      - pkg: hsh_snmpd_installed
-{% endif %}
-
-{% endif %}