diff --git a/modules/puppet-fm/src/fm/manifests/api.pp b/modules/puppet-fm/src/fm/manifests/api.pp
index f29eaa7d7..470f431ef 100644
--- a/modules/puppet-fm/src/fm/manifests/api.pp
+++ b/modules/puppet-fm/src/fm/manifests/api.pp
@@ -27,7 +27,7 @@
 #   server functionality of fm-api.
 #
 # [*sync_db*]
-#   (optional) Run gnocchi-upgrade db sync on api nodes after installing the package.
+#   (optional) Run fm-dbsync on api nodes after installing the package.
 #   Defaults to false
 #
 # [*auth_strategy*]
diff --git a/puppet-manifests/src/modules/platform/templates/remotelogging.conf.erb b/puppet-manifests/src/modules/platform/templates/remotelogging.conf.erb
index 7d8734c4c..ec0d571a8 100644
--- a/puppet-manifests/src/modules/platform/templates/remotelogging.conf.erb
+++ b/puppet-manifests/src/modules/platform/templates/remotelogging.conf.erb
@@ -62,8 +62,6 @@ rewrite r_rewrite_set{
   set("<%= @system_name %> user.log ${HOST}", value("HOST") condition(filter(f_user)));
   set("<%= @system_name %> uucp.log ${HOST}", value("HOST") condition(filter(f_uucp)));
   set("<%= @system_name %> snmp-api.log ${HOST}", value("HOST") condition(filter(f_snmpat)));
-  set("<%= @system_name %> api.log ${HOST}", value("HOST") condition(filter(f_gnocchiapi)));
-  set("<%= @system_name %> metricd.log ${HOST}", value("HOST") condition(filter(f_gnocchimetricd)));
   # Most logs write log level to the message field. some writes it to the PRIORITY field
   # The priority field is not sent remotely. This is because tcp/udp destinations don't
   # work well with templates, which we use to write the priority field to log files on the