diff --git a/Admin/Installer.php b/Admin/Installer.php
index ffa439b..0a1190e 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -14,8 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\Support\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 b152bb1..3bf2903 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\Support\Models\PermissionState;
 use Modules\Support\Controller\BackendController;
+use Modules\Support\Models\PermissionState;
+use phpOMS\Account\PermissionType;
+use phpOMS\Router\RouteVerb;
 
 return [
     '^.*/backend/support/list.*$' => [
diff --git a/Admin/Status.php b/Admin/Status.php
index ceec286..742abe4 100644
--- a/Admin/Status.php
+++ b/Admin/Status.php
@@ -14,9 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Support\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 35325b3..f9b8632 100644
--- a/Admin/Uninstaller.php
+++ b/Admin/Uninstaller.php
@@ -14,9 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Support\Admin;
 
-use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\UninstallerAbstract;
-use phpOMS\Module\InfoManager;
 
 /**
  * Navigation class.
diff --git a/Admin/Updater.php b/Admin/Updater.php
index 06c18da..087058c 100644
--- a/Admin/Updater.php
+++ b/Admin/Updater.php
@@ -14,10 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Support\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 efb2025..9a554b6 100644
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -14,14 +14,11 @@ declare(strict_types=1);
 
 namespace Modules\Support\Controller;
 
+use Modules\Support\Models\TicketMapper;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
-use phpOMS\Module\ModuleAbstract;
-use phpOMS\Module\WebInterface;
-use phpOMS\Views\View;
 
-use Modules\Support\Models\Ticket;
-use Modules\Support\Models\TicketMapper;
+use phpOMS\Views\View;
 
 /**
  * Support controller class.
diff --git a/Controller/Controller.php b/Controller/Controller.php
index 2eda0aa..ec4556e 100644
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -14,14 +14,9 @@ declare(strict_types=1);
 
 namespace Modules\Support\Controller;
 
-use phpOMS\Message\RequestAbstract;
-use phpOMS\Message\ResponseAbstract;
 use phpOMS\Module\ModuleAbstract;
-use phpOMS\Module\WebInterface;
-use phpOMS\Views\View;
 
-use Modules\Support\Models\Ticket;
-use Modules\Support\Models\TicketMapper;
+use phpOMS\Module\WebInterface;
 
 /**
  * Support controller class.
diff --git a/Models/TicketMapper.php b/Models/TicketMapper.php
index 4dc6ea7..616fc97 100644
--- a/Models/TicketMapper.php
+++ b/Models/TicketMapper.php
@@ -14,12 +14,9 @@ declare(strict_types=1);
 
 namespace Modules\Support\Models;
 
-use phpOMS\DataStorage\Database\DataMapperAbstract;
-use phpOMS\DataStorage\Database\Query\Builder;
-use phpOMS\DataStorage\Database\Query\Column;
-use phpOMS\DataStorage\Database\RelationType;
-
 use Modules\Tasks\Models\TaskMapper;
+use phpOMS\DataStorage\Database\DataMapperAbstract;
+
 
 /**
  * Mapper class.