diff --git a/manifests/profile/base/glance/api.pp b/manifests/profile/base/glance/api.pp
index 9cb546e16..29c6890b9 100644
--- a/manifests/profile/base/glance/api.pp
+++ b/manifests/profile/base/glance/api.pp
@@ -193,11 +193,9 @@ class tripleo::profile::base::glance::api (
     $http_store = ['http']
     $glance_store = concat($http_store, $backend_store)
 
-    # TODO: notifications, scrubber, etc.
     include ::glance
     include ::glance::config
     include ::glance::api::logging
-    # TODO(jaosorior): Remove bind_host when we set it up conditionally in t-h-t
     class { '::glance::api':
       stores  => $glance_store,
       sync_db => $sync_db,
diff --git a/manifests/profile/base/ironic_inspector.pp b/manifests/profile/base/ironic_inspector.pp
index abc1476ed..1b0b1f871 100644
--- a/manifests/profile/base/ironic_inspector.pp
+++ b/manifests/profile/base/ironic_inspector.pp
@@ -73,17 +73,9 @@ class tripleo::profile::base::ironic_inspector (
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
     include ::ironic::inspector::cors
-    # TODO(hjensas): Once https://review.openstack.org/557465 is merged remove
-    # the condition.
-    if $inspection_subnets != [] {
-      class { '::ironic::inspector':
-        sync_db            => $sync_db,
-        dnsmasq_ip_subnets => $inspection_subnets_real,
-      }
-    } else {
-      class { '::ironic::inspector':
-        sync_db => $sync_db,
-      }
+    class { '::ironic::inspector':
+      sync_db            => $sync_db,
+      dnsmasq_ip_subnets => $inspection_subnets_real,
     }
 
     include ::ironic::inspector::pxe_filter
diff --git a/manifests/profile/base/rabbitmq.pp b/manifests/profile/base/rabbitmq.pp
index d18badf70..2e2925d2c 100644
--- a/manifests/profile/base/rabbitmq.pp
+++ b/manifests/profile/base/rabbitmq.pp
@@ -113,7 +113,7 @@
 class tripleo::profile::base::rabbitmq (
   $certificate_specs             = {},
   $config_variables              = hiera('rabbitmq_config_variables'),
-  $enable_internal_tls           = undef,  # TODO(jaosorior): pass this via t-h-t
+  $enable_internal_tls           = undef,
   $environment                   = hiera('rabbitmq_environment'),
   $ssl_versions                  = undef,
   # lint:ignore:140chars
diff --git a/manifests/profile/base/zaqar.pp b/manifests/profile/base/zaqar.pp
index 4e558a43a..eac8274c5 100644
--- a/manifests/profile/base/zaqar.pp
+++ b/manifests/profile/base/zaqar.pp
@@ -119,9 +119,7 @@ class tripleo::profile::base::zaqar (
 
     # TODO (bcrochet): At some point, the transports should be split out to
     # separate services.
-    class { '::zaqar::server':
-      service_name => 'httpd', # TODO cleanup when passed by t-h-t.
-    }
+    include ::zaqar::server
     class { '::zaqar::wsgi::apache':
       ssl_cert => $tls_certfile,
       ssl_key  => $tls_keyfile,