diff --git a/inventory/cloud b/inventory/cloud
index c983422471..04010df057 100644
--- a/inventory/cloud
+++ b/inventory/cloud
@@ -26,7 +26,6 @@ el7-test.fedorainfracloud.org
 f27-test.fedorainfracloud.org
 f28-test.fedorainfracloud.org
 f29-test.fedorainfracloud.org
-faitout.fedorainfracloud.org
 fas2-dev.fedorainfracloud.org
 fas3-dev.fedorainfracloud.org
 #fed-cloud01.cloud.fedoraproject.org
@@ -65,7 +64,6 @@ ppc64-test.fedorainfracloud.org
 rawhide-test.fedorainfracloud.org
 regcfp2.fedorainfracloud.org
 respins.fedorainfracloud.org
-shumgrepper-dev.fedorainfracloud.org
 taiga.fedorainfracloud.org
 taigastg.fedorainfracloud.org
 telegram-irc.fedorainfracloud.org
diff --git a/inventory/host_vars/faitout.fedorainfracloud.org b/inventory/host_vars/faitout.fedorainfracloud.org
deleted file mode 100644
index 1f4e273b41..0000000000
--- a/inventory/host_vars/faitout.fedorainfracloud.org
+++ /dev/null
@@ -1,18 +0,0 @@
----
-image: rhel7-20141015
-instance_type: m1.small
-keypair: fedora-admin-20130801
-security_group: ssh-anywhere-persistent,web-80-anywhere-persistent,pg-5432-anywhere,default,all-icmp-persistent
-zone: nova
-tcp_ports: [22, 80, 443, 5432]
-
-inventory_tenant: persistent
-inventory_instance_name: faitout
-hostbase: faitout
-public_ip: 209.132.184.65
-root_auth_users: pingou
-description: faitout development instance
-
-cloud_networks:
-  # persistent-net
-  - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"
diff --git a/inventory/host_vars/shumgrepper-dev.fedorainfracloud.org b/inventory/host_vars/shumgrepper-dev.fedorainfracloud.org
deleted file mode 100644
index c9cfeb281d..0000000000
--- a/inventory/host_vars/shumgrepper-dev.fedorainfracloud.org
+++ /dev/null
@@ -1,18 +0,0 @@
----
-image: rhel7-20141015
-instance_type: m1.medium
-keypair: fedora-admin-20130801
-security_group: ssh-anywhere-persistent,web-80-anywhere-persistent,default,all-icmp-persistent
-zone: nova
-tcp_ports: [22, 80, 443]
-
-inventory_tenant: persistent
-inventory_instance_name: shumgrepper-dev
-hostbase: shumgrepper-dev
-public_ip: 209.132.184.66
-root_auth_users: pingou
-description: shumgrepper development instance
-
-cloud_networks:
-  # persistent-net
-  - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"
diff --git a/inventory/inventory b/inventory/inventory
index ade19d08fd..c403df9481 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -1108,14 +1108,10 @@ taiga.fedorainfracloud.org
 taigastg.fedorainfracloud.org
 # glittergallery GSoC dev work
 glittergallery-dev.fedorainfracloud.org
-# shumgrepper-dev
-shumgrepper-dev.fedorainfracloud.org
 # fas2-dev
 fas2-dev.fedorainfracloud.org
 # fas3-dev
 fas3-dev.fedorainfracloud.org
-# faitout
-faitout.fedorainfracloud.org
 # Community Blog
 communityblog.fedorainfracloud.org
 # Fedora Magazine
diff --git a/master.yml b/master.yml
index 8173e72b7b..3ce9970c66 100644
--- a/master.yml
+++ b/master.yml
@@ -135,7 +135,6 @@
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml
 #- import_playbook: /srv/web/infra/ansible/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/hosts/faitout.fedorainfracloud.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml
@@ -146,7 +145,6 @@
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/regcfp2.fedorainfracloud.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/respins.fedorainfracloud.org.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/taiga.fedorainfracloud.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/taigastg.fedorainfracloud.org.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/testdays.fedorainfracloud.org.yml
diff --git a/playbooks/hosts/faitout.fedorainfracloud.org.yml b/playbooks/hosts/faitout.fedorainfracloud.org.yml
deleted file mode 100644
index c30969f383..0000000000
--- a/playbooks/hosts/faitout.fedorainfracloud.org.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-- name: check/create instance
-  hosts: faitout.fedorainfracloud.org
-  gather_facts: False
-
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - /srv/private/ansible/vars.yml
-   - /srv/web/infra/ansible/vars/fedora-cloud.yml
-   - /srv/private/ansible/files/openstack/passwords.yml
-
-  tasks:
-  - import_tasks: "{{ tasks_path }}/persistent_cloud.yml"
-
-  handlers:
-  - import_tasks: "{{ handlers_path }}/restart_services.yml"
-
-- name: setup all the things
-  hosts: faitout.fedorainfracloud.org
-  gather_facts: True
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - /srv/private/ansible/vars.yml
-   - /srv/private/ansible/files/openstack/passwords.yml
-   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-
-  pre_tasks:
-  - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
-  - name: set hostname (required by some services, at least postfix need it)
-    hostname: name="{{inventory_hostname}}"
-
-  roles:
-  - basessh
diff --git a/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml b/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml
deleted file mode 100644
index 7c49b94345..0000000000
--- a/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-- name: check/create instance
-  hosts: shumgrepper-dev.fedorainfracloud.org
-  gather_facts: False
-
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - /srv/private/ansible/vars.yml
-   - /srv/web/infra/ansible/vars/fedora-cloud.yml
-   - /srv/private/ansible/files/openstack/passwords.yml
-
-  tasks:
-  - import_tasks: "{{ tasks_path }}/persistent_cloud.yml"
-
-  handlers:
-  - import_tasks: "{{ handlers_path }}/restart_services.yml"
-
-- name: setup all the things
-  hosts: shumgrepper-dev.fedorainfracloud.org
-  gather_facts: True
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - /srv/private/ansible/vars.yml
-   - /srv/private/ansible/files/openstack/passwords.yml
-   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-
-  pre_tasks:
-  - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
-  - name: set hostname (required by some services, at least postfix need it)
-    hostname: name="{{inventory_hostname}}"
-
-  roles:
-  - basessh