diff --git a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
index 67de7a02dc..8b4c2d0a00 100644
--- a/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
+++ b/modules/monitoring/library/Monitoring/Command/Renderer/IcingaCommandFileCommandRenderer.php
@@ -322,22 +322,10 @@ public function renderToggleObjectFeature(ToggleObjectFeatureCommand $command)
 
     public function renderDeleteComment(DeleteCommentCommand $command)
     {
-        $object = $command->getObject();
         if ($command->getObject()->getType() === $command::TYPE_HOST) {
-            /** @var \Icinga\Module\Monitoring\Object\Host $object */
-            $commandString = sprintf(
-                '%s;%s',
-                'DEL_HOST_DOWNTIME',
-                $object->getName()
-            );
+            $commandString = 'DEL_HOST_COMMENT';
         } else {
-            /** @var \Icinga\Module\Monitoring\Object\Service $object */
-            $commandString = sprintf(
-                '%s;%s;%s',
-                'DEL_SVC_COMMENT',
-                $object->getHost()->getName(),
-                $object->getName()
-            );
+            $commandString = 'DEL_SVC_COMMENT';
         }
         return sprintf(
             '%s;%u',
@@ -348,22 +336,10 @@ public function renderDeleteComment(DeleteCommentCommand $command)
 
     public function renderDeleteDowntime(DeleteDowntimeCommand $command)
     {
-        $object = $command->getObject();
         if ($command->getObject()->getType() === $command::TYPE_HOST) {
-            /** @var \Icinga\Module\Monitoring\Object\Host $object */
-            $commandString = sprintf(
-                '%s;%s',
-                'DEL_HOST_DOWNTIME',
-                $object->getName()
-            );
+            $commandString = 'DEL_HOST_DOWNTIME';
         } else {
-            /** @var \Icinga\Module\Monitoring\Object\Service $object */
-            $commandString = sprintf(
-                '%s;%s;%s',
-                'DEL_SVC_DOWNTIME',
-                $object->getHost()->getName(),
-                $object->getName()
-            );
+            $commandString = 'DEL_SVC_DOWNTIME';
         }
         return sprintf(
             '%s;%u',