diff --git a/manifests/site.pp b/manifests/site.pp
index a5ed3fe3fa..e2c5cdd9bf 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -662,16 +662,6 @@ node 'salt-trigger.slave.openstack.org' {
   }
 }
 
-node /^precise-?\d+.*\.slave\.openstack\.org$/ {
-  include openstack_project
-  include openstack_project::puppet_cron
-  class { 'openstack_project::slave':
-    certname  => 'precise.slave.openstack.org',
-    ssh_key   => $openstack_project::jenkins_ssh_key,
-    sysadmins => hiera('sysadmins'),
-  }
-}
-
 node /^precise-dev\d+.*\.slave\.openstack\.org$/ {
   include openstack_project
   include openstack_project::puppet_cron
@@ -681,17 +671,6 @@ node /^precise-dev\d+.*\.slave\.openstack\.org$/ {
   }
 }
 
-node /^precisepy3k-?\d+.*\.slave\.openstack\.org$/ {
-  include openstack_project
-  include openstack_project::puppet_cron
-  class { 'openstack_project::slave':
-    ssh_key      => $openstack_project::jenkins_ssh_key,
-    sysadmins    => hiera('sysadmins'),
-    python3      => true,
-    include_pypy => true,
-  }
-}
-
 node /^precisepy3k-dev\d+.*\.slave\.openstack\.org$/ {
   include openstack_project
   include openstack_project::puppet_cron
@@ -703,16 +682,6 @@ node /^precisepy3k-dev\d+.*\.slave\.openstack\.org$/ {
   }
 }
 
-node /^centos6-?\d+\.slave\.openstack\.org$/ {
-  include openstack_project
-  include openstack_project::puppet_cron
-  class { 'openstack_project::slave':
-    certname  => 'centos6.slave.openstack.org',
-    ssh_key   => $openstack_project::jenkins_ssh_key,
-    sysadmins => hiera('sysadmins'),
-  }
-}
-
 node /^centos6-dev\d+\.slave\.openstack\.org$/ {
   include openstack_project
   include openstack_project::puppet_cron
@@ -722,17 +691,6 @@ node /^centos6-dev\d+\.slave\.openstack\.org$/ {
   }
 }
 
-node /^fedora18-?\d+\.slave\.openstack\.org$/ {
-  include openstack_project
-  include openstack_project::puppet_cron
-  class { 'openstack_project::slave':
-    certname  => 'fedora18.slave.openstack.org',
-    ssh_key   => $openstack_project::jenkins_ssh_key,
-    sysadmins => hiera('sysadmins'),
-    python3   => true,
-  }
-}
-
 node /^fedora18-dev\d+\.slave\.openstack\.org$/ {
   include openstack_project
   include openstack_project::puppet_cron