diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php
index 632ca69ec..53b10e113 100644
--- a/modules/monitoring/application/controllers/HostsController.php
+++ b/modules/monitoring/application/controllers/HostsController.php
@@ -171,8 +171,7 @@ class Monitoring_HostsController extends Controller
         $this->view->objectsInDowntime = $objectsInDowntime;
         $this->view->inDowntimeLink = Url::fromPath('monitoring/list/downtimes')
             ->setQueryString(Filter::matchAny($downtimeFilterExpressions)->toQueryString());
-        $this->view->commentsLink = Url::fromRequest()
-            ->setPath('monitoring/list/comments');
+        $this->view->commentsLink = Url::fromRequest()->setPath('monitoring/list/comments');
     }
 
     /**
diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index ab92a2f04..cc62ba0f8 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -1,7 +1,3 @@
-<?php
-use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
-?>
-
 <div class="controls">
 
     <?php if (! $this->compact): ?>
@@ -183,35 +179,6 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 
         </p>
 
-        <table>
-        <?php foreach ($objects as $service): ?>
-            <?php $service->fetchComments(); ?>
-            <?php foreach ($service->comments as $comment): ?>
-                <tr>
-                    <td style="vertical-align: top;" data-base-target="_self">
-                        <?php
-                        $delCommentForm = new DeleteCommentCommandForm();
-                        $delCommentForm->populate(
-                            array('comment_id' => $comment->id, 'redirect' => html_entity_decode($this->url))
-                        );
-                        $delCommentForm->setAction(
-                            $this->url(
-                                'monitoring/host/delete-comment',
-                                array('host' => $service->getName())
-                            )
-                        );
-                        echo $delCommentForm;
-                        ?>
-                        (<?= ucfirst($comment->type) ?>):
-                    </td>
-                    <td style="padding-left: .5em;">
-                        <?= nl2br($comment->comment) ?>
-                    </td>
-                </tr>
-            <?php endforeach ?>
-        <?php endforeach ?>
-        </table>
-
         <!--
         <p>
         <div><?= $this->qlink(
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 2abc968a9..ce6b1131c 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -1,7 +1,3 @@
-<?php
-use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
-?>
-
 <div class="controls">
 
     <?php if (! $this->compact): ?>
@@ -175,35 +171,6 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
     ); ?>
     <p>
 
-    <table>
-    <?php foreach ($objects as $service): ?>
-        <?php $service->fetchComments(); ?>
-        <?php foreach ($service->comments as $comment): ?>
-        <tr>
-        <td style="vertical-align: top;" data-base-target="_self">
-            <?php
-            $delCommentForm = new DeleteCommentCommandForm();
-            $delCommentForm->populate(
-                array('comment_id' => $comment->id, 'redirect' => html_entity_decode($this->url))
-            );
-            $delCommentForm->setAction(
-                $this->url(
-                    'monitoring/service/delete-comment',
-                    array('host' => $service->getHost()->getName(), 'service' => $service->getName())
-                )
-            );
-            echo $delCommentForm;
-            ?>
-            (<?= ucfirst($comment->type) ?>):
-        </td>
-        <td style="padding-left: .5em;">
-            <?= nl2br($comment->comment) ?>
-        </td>
-        </tr>
-        <?php endforeach ?>
-    <?php endforeach ?>
-    </table>
-
     <!--
     </p>
     <div><?= $this->qlink(