diff --git a/apache.yml b/apache.yml
index 19438db..11c5d36 100644
--- a/apache.yml
+++ b/apache.yml
@@ -1,16 +1,15 @@
 - hosts:
   - code.kde.org
   - library.kde.org
   - lxr.kde.org
   - mason.kde.org
   - mimi.kde.org
-  - nellie.kde.org
   - olios.kde.org
   - orbi.kde.org
   - overwatch.kde.org
   - rosetta.kde.org
   - spring.kde.org
   - stumptown.kde.org
 
   roles:
   - apache
diff --git a/backups.yml b/backups.yml
index a280d02..20e1672 100644
--- a/backups.yml
+++ b/backups.yml
@@ -1,37 +1,35 @@
 ---
 - hosts:
   - olios.kde.org
   - mason.kde.org
   - cano.kde.org
-  - shrek.kde.org
   - overwatch.kde.org
   - bluemchen.kde.org
   - fiesta.kde.org
   - recluse.kde.org
   - code.kde.org
   - stumptown.kde.org
 
   - mimi.kde.org
 
   - gohma.kde.org
   - spring.kde.org
 
-  - nellie.kde.org
   - orbi.kde.org
   - dalca.kde.org
   - ange.kde.org
   - pirate.kde.org
   - library.kde.org
   - rosetta.kde.org
   - letterbox.kde.org
   - thera.kde.org
   - mygalo.kde.org
   - komaci.kde.org
   - edulis.kde.org
 
   vars_files:
     - vars/backups.yml
     - vars/backups-vault.yml
 
   roles:
     - kde-backup
diff --git a/production/host_vars/nellie.kde.org.yml b/production/host_vars/nellie.kde.org.yml
deleted file mode 100644
index 3d632d4..0000000
--- a/production/host_vars/nellie.kde.org.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-backup_directory: backups
-hetzner_backup_host: pirate
-
-apache_allow_txt: true
diff --git a/production/host_vars/shrek.kde.org.yml b/production/host_vars/shrek.kde.org.yml
deleted file mode 100644
index a88f56c..0000000
--- a/production/host_vars/shrek.kde.org.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-gohma_backup_user: shrekbackup
-gohma_backup_home: BACKUP.shrek.kde.org
diff --git a/production/hosts b/production/hosts
index 0d3ebe6..bfda24d 100644
--- a/production/hosts
+++ b/production/hosts
@@ -1,87 +1,85 @@
 #zivo.kde.org
 
-#shrek.kde.org
-
 bluemchen.kde.org
 
 cano.kde.org
 olios.kde.org
 
 fiesta.kde.org
 
 recluse.kde.org
 code.kde.org
 
 gohma.kde.org
 spring.kde.org
 
 ange.kde.org
 lxr.kde.org
 joy.kde.org
 
 stumptown.kde.org
 
 dalca.kde.org
 dalca2.kde.org ansible_host=10.150.44.2 ansible_ssh_common_args='-o ProxyCommand="ssh -W %h:%p -q root@dalca.kde.org"'
 
 overwatch.kde.org
 #overwatch-test.kde.org
 
 library.kde.org
 rosetta.kde.org
 
 pirate.kde.org
 mimi.kde.org
 
 orbi.kde.org
 
 letterbox.kde.org
 
 mason.kde.org
 thera.kde.org
 mygalo.kde.org
 
 darwini.kde.org
 
 aranea.kde.org
 artonis.kde.org
 
 anepsion.kde.org
 charlotte.kde.org
 eresida.kde.org
 
 nephilia.kde.org
 komaci.kde.org
 edulis.kde.org
 
 micrea.kde.org
 milonia.kde.org
 platna.kde.org
 
 [anongit]
 mason.kde.org anongit_style=legacy
 
 
 [monitored]
 # Servers that are being monitored with Telegraf
 overwatch.kde.org
 #overwatch-test.kde.org
 bluemchen.kde.org
 rosetta.kde.org
 pirate.kde.org
 mimi.kde.org
 gohma.kde.org
 orbi.kde.org
 recluse.kde.org
 code.kde.org
 darwini.kde.org
 mason.kde.org
 ange.kde.org
 thera.kde.org
 mygalo.kde.org
 anepsion.kde.org
 micrea.kde.org
 
 [monitoring-server]
 overwatch.kde.org
 #overwatch-test.kde.org
diff --git a/roles/kde-backup/templates/backup-nellie.sh b/roles/kde-backup/templates/backup-nellie.sh
deleted file mode 100755
index 45b1759..0000000
--- a/roles/kde-backup/templates/backup-nellie.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCATION=/root/{{backup_directory}}
-
-# Backup homes
-tar -cJf $LOCATION/homes.`date +%w`.tar.xz -C / --exclude=home/sandbox/data/jobs --exclude=home/sandbox/data/cache --exclude=home/sandbox/logs --exclude=home/production/data/jobs --exclude=home/production/data/cache --exclude=home/production/logs --exclude=home/binaryfactory/data/jobs --exclude=home/binaryfactory/data/cache --exclude=home/binaryfactory/logs home/
-
-# Backup configuration and list of installed packages
-tar -czf $LOCATION/etc.`date +%w`.tgz -C / etc/
-tar -czf $LOCATION/crontabs.`date +%w`.tgz -C / var/spool/cron/
-dpkg -l > $LOCATION/dpkg.`date +%w`
-
-# Transfer them to the backup server
-lftp -f ~/bin/backup-options
-