diff --git a/main.yml b/main.yml
index 6f95b8d362..70a21d50d0 100644
--- a/main.yml
+++ b/main.yml
@@ -1,4 +1,4 @@
-#---
+---
 ##
 ## This is the master playbook. It includes all the other playbooks.
 ## Usually you would call it with a -t tagname to only run a specific tag
@@ -8,15 +8,13 @@
 ## -t fedmsgconfig -> runs fedmsg/base config over all playbooks
 ## -t apache -> run when tasks/apache.yml changes.
 ##
-#
+##
 ##
 ## group playbooks
 ##
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/backup-server.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/badges-backend.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/badges-web.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/basset.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/bastion_stg.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/bastion.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/batcave.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/blockerbugs.yml
@@ -35,7 +33,6 @@
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/debuginfod.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/dns.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/download.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/fas.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/fedimg.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/fedocal.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/github2fedmsg.yml
@@ -60,12 +57,9 @@
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/odcs.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/openqa-workers.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/openqa.yml
-  #- import_playbook: /srv/web/infra/ansible/playbooks/groups/osbs-cluster.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/osbs/deploy-cluster.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/osbs/configure-osbs.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/os-cluster.yml
-#- import_playbook: /srv/web/infra/ansible/playbooks/groups/os-proxies.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/packages.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/pagure.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/pdc.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/people.yml
diff --git a/playbooks/groups/bastion_stg.yml b/playbooks/groups/bastion_stg.yml
deleted file mode 100644
index 8832aa9ce6..0000000000
--- a/playbooks/groups/bastion_stg.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bastion_stg"
-
-- name: make the boxen be real for real
-  hosts: bastion_stg
-  user: root
-  gather_facts: True
-
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - "/srv/private/ansible/vars.yml"
-   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-
-  roles:
-  - base
-  - rkhunter
-  - nagios_client
-  - hosts
-  #- { role: openvpn/client, when: inventory_hostname.startswith('bastion13') }
-  - ipa/client
-  - sudo
-  #- collectd/base
-  #- { role: openvpn/server, when: not inventory_hostname.startswith('bastion-comm01') or inventory_hostname.startswith('bastion13') }
-  #- { role: packager_alias, when: not inventory_hostname.startswith('bastion-comm01') or inventory_hostname.startswith('bastion13') }
-  #- opendkim
-
-  pre_tasks:
-  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-
-  tasks:
-  - import_tasks: "{{ tasks_path }}/motd.yml"
-
-  handlers:
-  - import_tasks: "{{ handlers_path }}/restart_services.yml"
diff --git a/playbooks/groups/fas.yml b/playbooks/groups/fas.yml
deleted file mode 100644
index 2533a73a70..0000000000
--- a/playbooks/groups/fas.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-# create a new fas server
-
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=fas:fas_stg"
-
-- name: make the box be real
-  hosts: fas_stg:fas
-  user: root
-  gather_facts: True
-
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - "/srv/private/ansible/vars.yml"
-
-  roles:
-  - base
-  - hosts
-  - rkhunter
-  - nagios_client
-  - fas_client
-  - collectd/base
-  - rsyncd
-  - memcached
-  - mod_wsgi
-  - fas_server
-  - fedmsg/base
-  - sudo
-  - yubikey
-  - totpcgi
-  - { role: openvpn/client, when: env != "staging" }
-
-  pre_tasks:
-  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-
-  tasks:
-  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - import_tasks: "{{ tasks_path }}/motd.yml"
-
-  handlers:
-  - import_tasks: "{{ handlers_path }}/restart_services.yml"
diff --git a/playbooks/groups/packages.yml b/playbooks/groups/packages.yml
deleted file mode 100644
index 4d98ba2f58..0000000000
--- a/playbooks/groups/packages.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-# create a new packages server
-# NOTE: should be used with --limit most of the time
-# NOTE: make sure there is room/space for this server on the vmhost
-# NOTE: most of these vars_path come from group_vars/packages* or from hostvars
-
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=packages:packages_stg"
-
-- name: make the box be real
-  hosts: packages:packages_stg
-  user: root
-  gather_facts: True
-
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - "/srv/private/ansible/vars.yml"
-   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-
-  pre_tasks:
-  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-
-  roles:
-  - base
-  - rkhunter
-  - nagios_client
-  - hosts
-  - { role: openvpn/client,
-      when: env != "staging" }
-  - ipa/client
-  - collectd/base
-  - rsyncd
-  - sudo
-  - mod_wsgi
-
-  tasks:
-  - import_tasks: "{{ tasks_path }}/motd.yml"
-
-  handlers:
-  - import_tasks: "{{ handlers_path }}/restart_services.yml"
-
-- name: dole out the new service specific config
-  hosts: packages:packages_stg
-  user: root
-  gather_facts: True
-
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - "/srv/private/ansible/vars.yml"
-   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-
-  roles:
-  - role: nfs/client
-    mnt_dir: /var/cache/fedoracommunity
-    nfs_src_dir: fedora_app_packages
-    when: env == "production"
-  - fedmsg/base
-  - fedmsg/hub
-  - packages3/web
-  - role: collectd/fedmsg-service
-    process: fedmsg-hub
-
-  handlers:
-  - import_tasks: "{{ handlers_path }}/restart_services.yml"