diff --git a/Admin/Installer.php b/Admin/Installer.php
index 28a552c..50d31a9 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -14,8 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\Knowledgebase\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 5179007..b9b4987 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\Knowledgebase\Models\PermissionState;
 use Modules\Knowledgebase\Controller\BackendController;
+use Modules\Knowledgebase\Models\PermissionState;
+use phpOMS\Account\PermissionType;
+use phpOMS\Router\RouteVerb;
 
 return [
     '^.*/backend/wiki.*$' => [
diff --git a/Admin/Status.php b/Admin/Status.php
index 57360c9..e5831c7 100644
--- a/Admin/Status.php
+++ b/Admin/Status.php
@@ -14,9 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Knowledgebase\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 67a7f97..96d8718 100644
--- a/Admin/Uninstaller.php
+++ b/Admin/Uninstaller.php
@@ -14,10 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Knowledgebase\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 3de1447..2365356 100644
--- a/Admin/Updater.php
+++ b/Admin/Updater.php
@@ -14,10 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Knowledgebase\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 de7b0fe..e00bd89 100644
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -14,25 +14,15 @@ declare(strict_types=1);
 
 namespace Modules\Knowledgebase\Controller;
 
+use Modules\Knowledgebase\Models\WikiBadge;
+use Modules\Knowledgebase\Models\WikiCategory;
+use Modules\Knowledgebase\Models\WikiCategoryMapper;
+use Modules\Knowledgebase\Models\WikiDoc;
+use Modules\Knowledgebase\Models\WikiDocMapper;
+
+use Modules\Knowledgebase\Models\WikiStatus;
 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 phpOMS\Account\PermissionType;
-use phpOMS\Message\Http\RequestStatusCode;
-
-use Modules\Knowledgebase\Models\WikiCategoryMapper;
-use Modules\Knowledgebase\Models\NullWikiCategory;
-use Modules\Knowledgebase\Models\WikiDocMapper;
-use Modules\Knowledgebase\Models\NullWikiDoc;
-use Modules\Knowledgebase\Models\WikiStatus;
-use Modules\Knowledgebase\Models\WikiStatusMapper;
-use Modules\Knowledgebase\Models\WikiDoc;
-use Modules\Knowledgebase\Models\WikiCategory;
-use Modules\Knowledgebase\Models\WikiBadge;
-use Modules\Knowledgebase\Models\PermissionState;
 
 /**
  * Task class.
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 7575bda..f1eb117 100644
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -14,25 +14,18 @@ declare(strict_types=1);
 
 namespace Modules\Knowledgebase\Controller;
 
+use Modules\Knowledgebase\Models\NullWikiCategory;
+use Modules\Knowledgebase\Models\NullWikiDoc;
+use Modules\Knowledgebase\Models\PermissionState;
+use Modules\Knowledgebase\Models\WikiCategoryMapper;
+use Modules\Knowledgebase\Models\WikiDocMapper;
+
+use phpOMS\Account\PermissionType;
+use phpOMS\Asset\AssetType;
+use phpOMS\Message\Http\RequestStatusCode;
 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 phpOMS\Account\PermissionType;
-use phpOMS\Message\Http\RequestStatusCode;
-
-use Modules\Knowledgebase\Models\WikiCategoryMapper;
-use Modules\Knowledgebase\Models\NullWikiCategory;
-use Modules\Knowledgebase\Models\WikiDocMapper;
-use Modules\Knowledgebase\Models\NullWikiDoc;
-use Modules\Knowledgebase\Models\WikiStatus;
-use Modules\Knowledgebase\Models\WikiStatusMapper;
-use Modules\Knowledgebase\Models\WikiDoc;
-use Modules\Knowledgebase\Models\WikiCategory;
-use Modules\Knowledgebase\Models\WikiBadge;
-use Modules\Knowledgebase\Models\PermissionState;
 
 /**
  * Task class.
diff --git a/Controller/Controller.php b/Controller/Controller.php
index 5110693..47d9b5d 100644
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -14,25 +14,9 @@ declare(strict_types=1);
 
 namespace Modules\Knowledgebase\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 phpOMS\Account\PermissionType;
-use phpOMS\Message\Http\RequestStatusCode;
-
-use Modules\Knowledgebase\Models\WikiCategoryMapper;
-use Modules\Knowledgebase\Models\NullWikiCategory;
-use Modules\Knowledgebase\Models\WikiDocMapper;
-use Modules\Knowledgebase\Models\NullWikiDoc;
-use Modules\Knowledgebase\Models\WikiStatus;
-use Modules\Knowledgebase\Models\WikiStatusMapper;
-use Modules\Knowledgebase\Models\WikiDoc;
-use Modules\Knowledgebase\Models\WikiCategory;
-use Modules\Knowledgebase\Models\WikiBadge;
-use Modules\Knowledgebase\Models\PermissionState;
 
 /**
  * Task class.
diff --git a/Models/WikiBadgeMapper.php b/Models/WikiBadgeMapper.php
index 3a56ac4..96cd844 100644
--- a/Models/WikiBadgeMapper.php
+++ b/Models/WikiBadgeMapper.php
@@ -15,9 +15,6 @@ declare(strict_types=1);
 namespace Modules\Knowledgebase\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/WikiCategoryMapper.php b/Models/WikiCategoryMapper.php
index f484da4..e781f05 100644
--- a/Models/WikiCategoryMapper.php
+++ b/Models/WikiCategoryMapper.php
@@ -15,9 +15,6 @@ declare(strict_types=1);
 namespace Modules\Knowledgebase\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/WikiDocMapper.php b/Models/WikiDocMapper.php
index edc9d25..6fb53c9 100644
--- a/Models/WikiDocMapper.php
+++ b/Models/WikiDocMapper.php
@@ -15,9 +15,6 @@ declare(strict_types=1);
 namespace Modules\Knowledgebase\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.