diff --git a/manifests/cinder/client.pp b/manifests/cinder/client.pp
deleted file mode 100644
index 0521f6e..0000000
--- a/manifests/cinder/client.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class kickstack::cinder::client inherits kickstack {
-
-  kickstack::client { 'cinder': }
-
-}
diff --git a/manifests/client.pp b/manifests/client.pp
deleted file mode 100644
index 77bb6d0..0000000
--- a/manifests/client.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-define kickstack::client {
-
-  $servicename = $name
-  $classname = "::${servicename}::client"
-
-  class { $classname: }
-
-}
diff --git a/manifests/glance/client.pp b/manifests/glance/client.pp
deleted file mode 100644
index 98bf745..0000000
--- a/manifests/glance/client.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class kickstack::glance::client inherits kickstack {
-
-  kickstack::client { 'glance': }
-
-}
diff --git a/manifests/keystone/client.pp b/manifests/keystone/client.pp
deleted file mode 100644
index c0ea0c7..0000000
--- a/manifests/keystone/client.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class kickstack::keystone::client inherits kickstack {
-
-  kickstack::client { 'keystone': }
-
-}
diff --git a/manifests/node/client.pp b/manifests/node/client.pp
index b176b57..aa08edc 100644
--- a/manifests/node/client.pp
+++ b/manifests/node/client.pp
@@ -1,6 +1,7 @@
 class kickstack::node::client inherits kickstack {
-  include kickstack::keystone::client
-  include kickstack::glance::client
-  include kickstack::cinder::client
-  include kickstack::quantum::client
+  include ::keystone::client
+  include ::glance::client
+  include ::cinder::client
+  include ::neutron::client
+  include ::heat::client
 }
diff --git a/manifests/nova/client.pp b/manifests/nova/client.pp
deleted file mode 100644
index 2971c25..0000000
--- a/manifests/nova/client.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class kickstack::nova::client inherits kickstack {
-
-  kickstack::client { 'nova': }
-
-}