diff --git a/Admin/Installer.php b/Admin/Installer.php
index f5222bd..36d3338 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -14,8 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\QA\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 9ee88d4..4fa8e55 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\QA\Models\PermissionState;
 use Modules\QA\Controller\BackendController;
+use Modules\QA\Models\PermissionState;
+use phpOMS\Account\PermissionType;
+use phpOMS\Router\RouteVerb;
 
 return [
     '^.*/backend/qa.*$' => [
diff --git a/Admin/Status.php b/Admin/Status.php
index c18cbab..9e5c7b7 100644
--- a/Admin/Status.php
+++ b/Admin/Status.php
@@ -14,9 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\QA\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 f88bf47..f70decd 100644
--- a/Admin/Uninstaller.php
+++ b/Admin/Uninstaller.php
@@ -14,10 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\QA\Admin;
 
-use phpOMS\DataStorage\Database\DatabasePool;
-use phpOMS\DataStorage\Database\Schema\Builder;
 use phpOMS\Module\UninstallerAbstract;
-use phpOMS\Module\InfoManager;
 
 /**
  * Navigation class.
diff --git a/Admin/Updater.php b/Admin/Updater.php
index 9af3189..6ac9f0d 100644
--- a/Admin/Updater.php
+++ b/Admin/Updater.php
@@ -14,10 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\QA\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/ApiController.php b/Controller/ApiController.php
index 08d093b..341dcac 100644
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -14,15 +14,11 @@ declare(strict_types=1);
 
 namespace Modules\QA\Controller;
 
+use Modules\QA\Models\QABadgeMapper;
+use Modules\QA\Models\QAQuestionMapper;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
-use phpOMS\Module\ModuleAbstract;
-use phpOMS\Module\WebInterface;
-use phpOMS\Views\View;
-use phpOMS\Asset\AssetType;
 
-use Modules\QA\Models\QAQuestionMapper;
-use Modules\QA\Models\QABadgeMapper;
 
 /**
  * Task class.
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 9227491..ac8ab02 100644
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -14,15 +14,13 @@ declare(strict_types=1);
 
 namespace Modules\QA\Controller;
 
+use Modules\QA\Models\QABadgeMapper;
+use Modules\QA\Models\QAQuestionMapper;
+use phpOMS\Asset\AssetType;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
-use phpOMS\Module\ModuleAbstract;
-use phpOMS\Module\WebInterface;
-use phpOMS\Views\View;
-use phpOMS\Asset\AssetType;
 
-use Modules\QA\Models\QAQuestionMapper;
-use Modules\QA\Models\QABadgeMapper;
+use phpOMS\Views\View;
 
 /**
  * Task class.
diff --git a/Controller/Controller.php b/Controller/Controller.php
index 0270fe5..930f6ce 100644
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -14,15 +14,9 @@ declare(strict_types=1);
 
 namespace Modules\QA\Controller;
 
-use phpOMS\Message\RequestAbstract;
-use phpOMS\Message\ResponseAbstract;
 use phpOMS\Module\ModuleAbstract;
-use phpOMS\Module\WebInterface;
-use phpOMS\Views\View;
-use phpOMS\Asset\AssetType;
 
-use Modules\QA\Models\QAQuestionMapper;
-use Modules\QA\Models\QABadgeMapper;
+use phpOMS\Module\WebInterface;
 
 /**
  * Task class.
diff --git a/Models/QAAnswerMapper.php b/Models/QAAnswerMapper.php
index 7d15768..dd13da7 100644
--- a/Models/QAAnswerMapper.php
+++ b/Models/QAAnswerMapper.php
@@ -16,9 +16,6 @@ namespace Modules\QA\Models;
 
 use Modules\Profile\Models\ProfileMapper;
 use phpOMS\DataStorage\Database\DataMapperAbstract;
-use phpOMS\DataStorage\Database\Query\Builder;
-use phpOMS\DataStorage\Database\Query\Column;
-use phpOMS\DataStorage\Database\RelationType;
 
 /**
  * Mapper class.
diff --git a/Models/QABadgeMapper.php b/Models/QABadgeMapper.php
index 8e10dde..8dd6f86 100644
--- a/Models/QABadgeMapper.php
+++ b/Models/QABadgeMapper.php
@@ -15,9 +15,6 @@ declare(strict_types=1);
 namespace Modules\QA\Models;
 
 use phpOMS\DataStorage\Database\DataMapperAbstract;
-use phpOMS\DataStorage\Database\Query\Builder;
-use phpOMS\DataStorage\Database\Query\Column;
-use phpOMS\DataStorage\Database\RelationType;
 
 /**
  * Mapper class.
diff --git a/Models/QACategoryMapper.php b/Models/QACategoryMapper.php
index 1a13fc0..c23e509 100644
--- a/Models/QACategoryMapper.php
+++ b/Models/QACategoryMapper.php
@@ -15,9 +15,6 @@ declare(strict_types=1);
 namespace Modules\QA\Models;
 
 use phpOMS\DataStorage\Database\DataMapperAbstract;
-use phpOMS\DataStorage\Database\Query\Builder;
-use phpOMS\DataStorage\Database\Query\Column;
-use phpOMS\DataStorage\Database\RelationType;
 
 /**
  * Mapper class.
diff --git a/Models/QAQuestionMapper.php b/Models/QAQuestionMapper.php
index 3f8b6dd..5bc44e6 100644
--- a/Models/QAQuestionMapper.php
+++ b/Models/QAQuestionMapper.php
@@ -16,9 +16,6 @@ namespace Modules\QA\Models;
 
 use Modules\Profile\Models\ProfileMapper;
 use phpOMS\DataStorage\Database\DataMapperAbstract;
-use phpOMS\DataStorage\Database\Query\Builder;
-use phpOMS\DataStorage\Database\Query\Column;
-use phpOMS\DataStorage\Database\RelationType;
 
 /**
  * Mapper class.