diff --git a/conf/modules.obsoleted/collectd/manifest b/conf/modules.obsoleted/collectd/manifest
deleted file mode 100644
index abd2eb79..00000000
--- a/conf/modules.obsoleted/collectd/manifest
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# 2010 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-#
-
-collectd()
-{
-   config_source="${1:-modules/collectd/collectd.conf}"
-
-   echo cdist_package collectd
-   echo cdist_file /etc/collectd/collectd.conf "${config_source}"
-}
diff --git a/conf/modules.obsoleted/efsh/base.sh b/conf/modules.obsoleted/efsh/base.sh
deleted file mode 100644
index d7202593..00000000
--- a/conf/modules.obsoleted/efsh/base.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-efsh_base()
-{
-   efsh_servicedir="/home/services"
-   efsh_userdir="/home/users"
-   efsh_groupdir="/home/groups"
-}
diff --git a/conf/modules.obsoleted/efsh/test.sh b/conf/modules.obsoleted/efsh/test.sh
deleted file mode 100644
index a13a7ae0..00000000
--- a/conf/modules.obsoleted/efsh/test.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-. ./base.sh
-
-echo $efsh_userdir
-efsh
-echo $efsh_userdir
diff --git a/conf/modules.obsoleted/nginx-website/nginx_config.sh b/conf/modules.obsoleted/nginx-website/nginx_config.sh
deleted file mode 100644
index cced7827..00000000
--- a/conf/modules.obsoleted/nginx-website/nginx_config.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-cat << eof
-#
-# D-INFK SANS MANAGED FILE
-# ========================
-#
-# Do not change this file. Changes will be overwritten by puppet.
-#
-
-server {
-   # Only bind on the reserved IP address
-   listen $nginx_website;
-   server_name $server_name;
-
-   location / {
-      root /home/services/www/$username/$server_name/www;
-   }
-}
-eof
diff --git a/conf/modules.obsoleted/postgresql/init b/conf/modules.obsoleted/postgresql/init
deleted file mode 100644
index c02ccf46..00000000
--- a/conf/modules.obsoleted/postgresql/init
+++ /dev/null
@@ -1,2 +0,0 @@
-# Ensure postgresql 8.4 is instelled
-__package --ensure installed --name postgresql-8.4