diff --git a/manifests/site.pp b/manifests/site.pp
index f156f55bb4..3f1785c97f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,12 +1,3 @@
-#
-# Default: should at least behave like an openstack server
-#
-node default {
-  class { 'openstack_project::server':
-  }
-}
-
-
 # Node-OS: xenial
 # Puppet-Version: !3
 node /^grafana\d*\.open.*\.org$/ {
@@ -881,12 +872,6 @@ node /^openstackid-dev\d*\.openstack\.org$/ {
   }
 }
 
-# Node-OS: xenial
-# Used for testing all-in-one deployments
-node 'single-node-ci.test.only' {
-  include ::openstackci::single_node_ci
-}
-
 # Node-OS: xenial
 node /^kdc03\.open.*\.org$/ {
   class { 'openstack_project::server': }