diff --git a/Admin/Installer.php b/Admin/Installer.php
index 0418d36..915bc45 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -14,8 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\Messages\Admin;
 
-use phpOMS\DataStorage\Database\DatabaseType;
 use phpOMS\DataStorage\Database\DatabasePool;
+use phpOMS\DataStorage\Database\DatabaseType;
 use phpOMS\Module\InfoManager;
 use phpOMS\Module\InstallerAbstract;
 
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index a38a773..e7510ac 100644
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -1,9 +1,9 @@
 <?php
 
-use phpOMS\Router\RouteVerb;
-use phpOMS\Account\PermissionType;
-use Modules\Messages\Models\PermissionState;
 use Modules\Messages\Controller\BackendController;
+use Modules\Messages\Models\PermissionState;
+use phpOMS\Account\PermissionType;
+use phpOMS\Router\RouteVerb;
 
 return [
     '^.*/backend/messages/dashboard.*$' => [
diff --git a/Admin/Status.php b/Admin/Status.php
index e6445a9..42a1a88 100644
--- a/Admin/Status.php
+++ b/Admin/Status.php
@@ -14,9 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Messages\Admin;
 
-use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\StatusAbstract;
-use phpOMS\Module\InfoManager;
 
 /**
  * Navigation class.
diff --git a/Admin/Uninstaller.php b/Admin/Uninstaller.php
index 96bca07..33383e2 100644
--- a/Admin/Uninstaller.php
+++ b/Admin/Uninstaller.php
@@ -16,8 +16,8 @@ namespace Modules\Messages\Admin;
 
 use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\DataStorage\Database\Schema\Builder;
-use phpOMS\Module\UninstallerAbstract;
 use phpOMS\Module\InfoManager;
+use phpOMS\Module\UninstallerAbstract;
 
 /**
  * Navigation class.
diff --git a/Admin/Updater.php b/Admin/Updater.php
index dd24f6f..f8ce670 100644
--- a/Admin/Updater.php
+++ b/Admin/Updater.php
@@ -14,10 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Messages\Admin;
 
-use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\UpdaterAbstract;
-use phpOMS\System\File\Local\Directory;
-use phpOMS\Module\InfoManager;
 
 /**
  * Updater class.
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index ee82c39..c7493d9 100644
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -14,13 +14,9 @@ declare(strict_types=1);
 
 namespace Modules\Messages\Controller;
 
-use Modules\Navigation\Models\Navigation;
-use Modules\Navigation\Views\NavigationView;
 use phpOMS\Contract\RenderableInterface;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
-use phpOMS\Module\ModuleAbstract;
-use phpOMS\Module\WebInterface;
 use phpOMS\Views\View;
 
 /**
diff --git a/Controller/Controller.php b/Controller/Controller.php
index 876dc08..30d295d 100644
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -14,14 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\Messages\Controller;
 
-use Modules\Navigation\Models\Navigation;
-use Modules\Navigation\Views\NavigationView;
-use phpOMS\Contract\RenderableInterface;
-use phpOMS\Message\RequestAbstract;
-use phpOMS\Message\ResponseAbstract;
 use phpOMS\Module\ModuleAbstract;
 use phpOMS\Module\WebInterface;
-use phpOMS\Views\View;
 
 /**
  * Messages controller class.