diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 6106ee03..0528ed61 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -2,13 +2,13 @@
 
 namespace Icinga\Module\Director\Controllers;
 
+use Icinga\Module\Director\Core\CoreApi;
+use Icinga\Module\Director\Core\RestApiClient;
 use Icinga\Module\Director\IcingaConfig\IcingaConfig;
 use Icinga\Module\Director\Util;
 use Icinga\Module\Director\Web\Controller\ActionController;
-use Icinga\Web\Url;
-use Icinga\Module\Director\Core\RestApiClient;
-use Icinga\Module\Director\Core\CoreApi;
 use Icinga\Web\Notification;
+use Icinga\Web\Url;
 
 class ConfigController extends ActionController
 {
diff --git a/application/controllers/ImportrunController.php b/application/controllers/ImportrunController.php
index 0b88c3b1..c058a5cf 100644
--- a/application/controllers/ImportrunController.php
+++ b/application/controllers/ImportrunController.php
@@ -3,12 +3,6 @@
 namespace Icinga\Module\Director\Controllers;
 
 use Icinga\Module\Director\Web\Controller\ActionController;
-use Icinga\Module\Director\Web\Hook\ImportSourceHook;
-use Icinga\Module\Director\Util;
-use Icinga\Module\Director\Objects\ImportSource;
-use Icinga\Module\Director\Import\Import;
-use Icinga\Exception\InvalidPropertyException;
-use Icinga\Web\Notification;
 
 class ImportrunController extends ActionController
 {
diff --git a/application/controllers/ImportsourceController.php b/application/controllers/ImportsourceController.php
index 6fd351eb..4aff7632 100644
--- a/application/controllers/ImportsourceController.php
+++ b/application/controllers/ImportsourceController.php
@@ -3,10 +3,8 @@
 namespace Icinga\Module\Director\Controllers;
 
 use Icinga\Module\Director\Web\Controller\ActionController;
-use Icinga\Module\Director\Web\Hook\ImportSourceHook;
 use Icinga\Module\Director\Objects\ImportSource;
 use Icinga\Module\Director\Import\Import;
-use Icinga\Exception\InvalidPropertyException;
 use Icinga\Web\Notification;
 use Icinga\Web\Url;
 
diff --git a/application/controllers/SettingsController.php b/application/controllers/SettingsController.php
index ad1e24b8..3bafc5f0 100644
--- a/application/controllers/SettingsController.php
+++ b/application/controllers/SettingsController.php
@@ -2,7 +2,6 @@
 
 namespace Icinga\Module\Director\Controllers;
 
-use Icinga\Forms\ConfigForm;
 use Icinga\Module\Director\Web\Controller\ActionController;
 
 class SettingsController extends ActionController
diff --git a/application/controllers/ShowController.php b/application/controllers/ShowController.php
index c640a85c..1cd81057 100644
--- a/application/controllers/ShowController.php
+++ b/application/controllers/ShowController.php
@@ -2,11 +2,9 @@
 
 namespace Icinga\Module\Director\Controllers;
 
-use Icinga\Module\Director\IcingaConfig\IcingaConfig;
-use Icinga\Module\Director\Objects\IcingaObject;
 use Icinga\Module\Director\ConfigDiff;
-use Icinga\Module\Director\Util;
 use Icinga\Module\Director\Web\Controller\ActionController;
+use Icinga\Module\Director\Util;
 
 class ShowController extends ActionController
 {
diff --git a/application/controllers/SyncpropertyController.php b/application/controllers/SyncpropertyController.php
index 49793dbb..ac653a77 100644
--- a/application/controllers/SyncpropertyController.php
+++ b/application/controllers/SyncpropertyController.php
@@ -3,10 +3,6 @@
 namespace Icinga\Module\Director\Controllers;
 
 use Icinga\Module\Director\Web\Controller\ActionController;
-use Icinga\Module\Director\Objects\SyncProperty;
-use Icinga\Module\Director\Sync\Sync;
-use Icinga\Exception\InvalidPropertyException;
-use Icinga\Web\Notification;
 
 class SyncpropertyController extends ActionController
 {
diff --git a/application/controllers/SyncruleController.php b/application/controllers/SyncruleController.php
index baee8979..c236b838 100644
--- a/application/controllers/SyncruleController.php
+++ b/application/controllers/SyncruleController.php
@@ -6,7 +6,6 @@ use Icinga\Module\Director\Web\Controller\ActionController;
 use Icinga\Module\Director\Objects\SyncRule;
 use Icinga\Module\Director\Import\Sync;
 use Icinga\Data\Filter\Filter;
-use Icinga\Exception\InvalidPropertyException;
 use Icinga\Web\Notification;
 
 class SyncruleController extends ActionController