diff --git a/manifests/object.pp b/manifests/object.pp
index 84dd7e36..9e0c5340 100644
--- a/manifests/object.pp
+++ b/manifests/object.pp
@@ -27,8 +27,6 @@ class cloud::object(
   $swift_hash_suffix = undef
 ) {
 
-  class { 'ssh::server::install': }
-
   class { 'swift':
     swift_hash_suffix => $swift_hash_suffix,
   }
diff --git a/manifests/object/ringbuilder.pp b/manifests/object/ringbuilder.pp
index 4889b978..ddfe72cc 100644
--- a/manifests/object/ringbuilder.pp
+++ b/manifests/object/ringbuilder.pp
@@ -22,6 +22,8 @@ class cloud::object::ringbuilder(
     $swift_rsync_max_connections = 5,
 ) {
 
+  include cloud::object
+
   Ring_object_device <<| |>>
   Ring_container_device <<| |>>
   Ring_account_device <<| |>>
diff --git a/manifests/object/storage.pp b/manifests/object/storage.pp
index 2d2ae33e..04593016 100644
--- a/manifests/object/storage.pp
+++ b/manifests/object/storage.pp
@@ -73,12 +73,9 @@ allow_versions = on
     log_facility     => 'LOG_LOCAL6',
   }
 
-  swift::storage::filter::recon { 'object': }
-  swift::storage::filter::recon { 'container': }
-  swift::storage::filter::recon { 'account': }
-  swift::storage::filter::healthcheck { 'object': }
-  swift::storage::filter::healthcheck { 'container': }
-  swift::storage::filter::healthcheck { 'account': }
+  $swift_components = ['account', 'container', 'object']
+  swift::storage::filter::recon { $swift_components : }
+  swift::storage::filter::healthcheck { $swift_components : }
 
   $object_nodes = flatten([ range('sdc','sdd')])
   swift::storage::xfs { $object_nodes: }
@@ -100,12 +97,6 @@ allow_versions = on
     weight      => '100.0',
   }
 
-  class{
-    ['swift::storage::object',
-    'swift::storage::container',
-    'swift::storage::account']:
-  }
-
   Swift::Ringsync<<| |>> ->
     Swift::Storage::Server[$container_port] ->
     Swift::Storage::Server[$account_port] ->