diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php
index 5e937d91b..9a20755c9 100644
--- a/application/controllers/ListController.php
+++ b/application/controllers/ListController.php
@@ -1,15 +1,14 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use Icinga\Web\Controller;
-use Icinga\Web\Url;
-use Icinga\Web\Widget\Tabextension\DashboardAction;
-use Icinga\Web\Widget\Tabextension\OutputFormat;
 use Icinga\Application\Config;
 use Icinga\Application\Logger;
 use Icinga\Data\ConfigObject;
 use Icinga\Protocol\File\FileReader;
-use \Zend_Controller_Action_Exception as ActionError;
+use Icinga\Web\Controller;
+use Icinga\Web\Url;
+use Icinga\Web\Widget\Tabextension\DashboardAction;
+use Icinga\Web\Widget\Tabextension\OutputFormat;
 
 /**
  * Class ListController
@@ -40,7 +39,7 @@ class ListController extends Controller
     public function applicationlogAction()
     {
         if (! Logger::writesToFile()) {
-            throw new ActionError('Site not found', 404);
+            $this->httpNotFound('Page not found');
         }
 
         $this->addTitleTab('application log');
diff --git a/application/views/helpers/FormTriStateCheckbox.php b/application/views/helpers/FormTriStateCheckbox.php
index 61089cc51..293da78d8 100644
--- a/application/views/helpers/FormTriStateCheckbox.php
+++ b/application/views/helpers/FormTriStateCheckbox.php
@@ -1,8 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use \Zend_View_Helper_FormElement;
-
 /**
  * Helper to generate a "datetime" element
  */
diff --git a/modules/doc/application/controllers/IcingawebController.php b/modules/doc/application/controllers/IcingawebController.php
index 31819239a..8af8b97ff 100644
--- a/modules/doc/application/controllers/IcingawebController.php
+++ b/modules/doc/application/controllers/IcingawebController.php
@@ -1,7 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use \Zend_Controller_Action_Exception;
 use Icinga\Application\Icinga;
 use Icinga\Module\Doc\DocController;
 
@@ -25,10 +24,7 @@ class Doc_IcingawebController extends DocController
                 return $path;
             }
         }
-        throw new Zend_Controller_Action_Exception(
-            $this->translate('Documentation for Icinga Web 2 is not available'),
-            404
-        );
+        $this->httpNotFound($this->translate('Documentation for Icinga Web 2 is not available'));
     }
 
     /**
diff --git a/modules/doc/application/controllers/ModuleController.php b/modules/doc/application/controllers/ModuleController.php
index eb9f4dcf1..753da45cc 100644
--- a/modules/doc/application/controllers/ModuleController.php
+++ b/modules/doc/application/controllers/ModuleController.php
@@ -1,7 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use \Zend_Controller_Action_Exception;
 use Icinga\Application\Icinga;
 use Icinga\Module\Doc\DocController;
 use Icinga\Module\Doc\Exception\DocException;
diff --git a/modules/doc/application/controllers/SearchController.php b/modules/doc/application/controllers/SearchController.php
index 5df4ffeb3..e896c31f6 100644
--- a/modules/doc/application/controllers/SearchController.php
+++ b/modules/doc/application/controllers/SearchController.php
@@ -1,7 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use \Zend_Controller_Action_Exception;
 use Icinga\Application\Icinga;
 use Icinga\Module\Doc\DocController;
 use Icinga\Module\Doc\DocParser;
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php
index f6fe05d8f..6554b9b88 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php
@@ -4,7 +4,7 @@
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
 use Icinga\Module\Monitoring\Command\Object\DeleteCommentCommand;
-use \Icinga\Module\Monitoring\Forms\Command\CommandForm;
+use Icinga\Module\Monitoring\Forms\Command\CommandForm;
 use Icinga\Web\Notification;
 
 /**
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
index efdc72250..c58179fe6 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php
@@ -4,7 +4,7 @@
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
 use Icinga\Module\Monitoring\Command\Object\DeleteDowntimeCommand;
-use \Icinga\Module\Monitoring\Forms\Command\CommandForm;
+use Icinga\Module\Monitoring\Forms\Command\CommandForm;
 use Icinga\Web\Notification;
 
 /**
diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php
index 472ca8f9e..b5f7d8c08 100644
--- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php
@@ -4,7 +4,7 @@
 namespace Icinga\Module\Monitoring\Forms\Command\Object;
 
 use Icinga\Module\Monitoring\Command\Object\DeleteDowntimeCommand;
-use \Icinga\Module\Monitoring\Forms\Command\CommandForm;
+use Icinga\Module\Monitoring\Forms\Command\CommandForm;
 use Icinga\Web\Notification;
 
 /**
diff --git a/modules/monitoring/application/forms/EventOverviewForm.php b/modules/monitoring/application/forms/EventOverviewForm.php
index bb230232f..b835b77e0 100644
--- a/modules/monitoring/application/forms/EventOverviewForm.php
+++ b/modules/monitoring/application/forms/EventOverviewForm.php
@@ -3,9 +3,7 @@
 
 namespace Icinga\Module\Monitoring\Forms;
 
-use Icinga\Data\Filter\FilterNot;
 use Icinga\Web\Url;
-use \Zend_Form;
 use Icinga\Web\Form;
 use Icinga\Data\Filter\Filter;
 
@@ -15,7 +13,7 @@ use Icinga\Data\Filter\Filter;
 class EventOverviewForm extends Form
 {
     /**
-     * Initialize this form
+     * {@inheritdoc}
      */
     public function init()
     {
@@ -28,7 +26,7 @@ class EventOverviewForm extends Form
     }
 
     /**
-     * @see Form::createElements()
+     * {@inheritdoc}
      */
     public function createElements(array $formData)
     {
diff --git a/modules/monitoring/application/forms/StatehistoryForm.php b/modules/monitoring/application/forms/StatehistoryForm.php
index 730e3f43b..f6c148d8c 100644
--- a/modules/monitoring/application/forms/StatehistoryForm.php
+++ b/modules/monitoring/application/forms/StatehistoryForm.php
@@ -3,7 +3,6 @@
 
 namespace Icinga\Module\Monitoring\Forms;
 
-use \Zend_Form;
 use Icinga\Web\Form;
 use Icinga\Data\Filter\Filter;
 
@@ -13,7 +12,7 @@ use Icinga\Data\Filter\Filter;
 class StatehistoryForm extends Form
 {
     /**
-     * Initialize this form
+     * {@inheritdoc}
      */
     public function init()
     {
@@ -56,7 +55,7 @@ class StatehistoryForm extends Form
     }
 
     /**
-     * @see Form::createElements()
+     * {@inheritdoc}
      */
     public function createElements(array $formData)
     {