diff --git a/etc/trove/trove-taskmanager.conf.sample b/etc/trove/trove-taskmanager.conf.sample
index 7751288792..a535e628ae 100644
--- a/etc/trove/trove-taskmanager.conf.sample
+++ b/etc/trove/trove-taskmanager.conf.sample
@@ -33,9 +33,9 @@ trove_auth_url = http://0.0.0.0/identity/v2.0
 #swift_url = http://localhost:8080/v1/AUTH_
 #neutron_url = http://localhost:9696/
 
-# nova_compute_url, cinder_url, swift_url, and heat_url can all be fetched
+# nova_compute_url, cinder_url, swift_url, and can all be fetched
 # from Keystone. To fetch from Keystone, comment out nova_compute_url,
-# cinder_url, swift_url, and heat_url and optionally uncomment the lines below.
+# cinder_url, swift_url, and and optionally uncomment the lines below.
 
 # Region name of this node. Used when searching catalog. Default value is None.
 #os_region_name = RegionOne
@@ -46,8 +46,6 @@ trove_auth_url = http://0.0.0.0/identity/v2.0
 # Service type to use when searching catalog.
 #swift_service_type = object-store
 # Service type to use when searching catalog.
-#heat_service_type = orchestration
-# Service type to use when searching catalog.
 #neutron_service_type = network
 
 # Config options for enabling volume service
diff --git a/etc/trove/trove.conf.sample b/etc/trove/trove.conf.sample
index 2b88d41e4a..b0f91cd39b 100644
--- a/etc/trove/trove.conf.sample
+++ b/etc/trove/trove.conf.sample
@@ -43,9 +43,9 @@ trove_auth_url = http://0.0.0.0/identity/v2.0
 #swift_url = http://localhost:8080/v1/AUTH_
 #neutron_url = http://localhost:9696/
 
-# nova_compute_url, cinder_url, swift_url, and heat_url can all be fetched
+# nova_compute_url, cinder_url, swift_url, and can all be fetched
 # from Keystone. To fetch from Keystone, comment out nova_compute_url,
-# cinder_url, swift_url, and heat_url and optionally uncomment the lines below.
+# cinder_url, swift_url, and and optionally uncomment the lines below.
 
 # Region name of this node. Used when searching catalog. Default value is None.
 #os_region_name = RegionOne
@@ -56,8 +56,6 @@ trove_auth_url = http://0.0.0.0/identity/v2.0
 # Service type to use when searching catalog.
 #swift_service_type = object-store
 # Service type to use when searching catalog.
-#heat_service_type = orchestration
-# Service type to use when searching catalog.
 #neutron_service_type = network
 
 # Config option for showing the IP address that nova doles out