diff --git a/Admin/Installer.php b/Admin/Installer.php
index c1b2007..df9caef 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -14,8 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\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 66d9a2e..86c595a 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\RiskManagement\Models\PermissionState;
 use Modules\RiskManagement\Controller\BackendController;
+use Modules\RiskManagement\Models\PermissionState;
+use phpOMS\Account\PermissionType;
+use phpOMS\Router\RouteVerb;
 
 return [
     '^.*/backend/riskmanagement/cockpit.*$' => [
diff --git a/Admin/Status.php b/Admin/Status.php
index 0811a4d..507def8 100644
--- a/Admin/Status.php
+++ b/Admin/Status.php
@@ -14,9 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\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 b4bac7f..5ede2d2 100644
--- a/Admin/Uninstaller.php
+++ b/Admin/Uninstaller.php
@@ -16,8 +16,8 @@ namespace Modules\RiskManagement\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 3522f7f..5c395d7 100644
--- a/Admin/Updater.php
+++ b/Admin/Updater.php
@@ -14,10 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\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 d9091f4..63769c2 100644
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -14,23 +14,18 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\Controller;
 
-use Modules\Navigation\Models\Navigation;
-use Modules\Navigation\Views\NavigationView;
+use Modules\Organization\Models\UnitMapper;
+use Modules\RiskManagement\Models\CategoryMapper;
+use Modules\RiskManagement\Models\CauseMapper;
+use Modules\RiskManagement\Models\DepartmentMapper;
+use Modules\RiskManagement\Models\ProcessMapper;
+use Modules\RiskManagement\Models\ProjectMapper;
+use Modules\RiskManagement\Models\RiskMapper;
+use Modules\RiskManagement\Models\SolutionMapper;
 use phpOMS\Contract\RenderableInterface;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
-use phpOMS\Module\ModuleAbstract;
-use phpOMS\Module\WebInterface;
 use phpOMS\Views\View;
-use Modules\RiskManagement\Models\SolutionMapper;
-use Modules\RiskManagement\Models\CauseMapper;
-use Modules\RiskManagement\Models\RiskMapper;
-use Modules\RiskManagement\Models\DepartmentMapper;
-use Modules\RiskManagement\Models\CategoryMapper;
-use Modules\RiskManagement\Models\ProjectMapper;
-use Modules\RiskManagement\Models\ProcessMapper;
-use Modules\Organization\Models\UnitMapper;
-use Modules\Organization\Models\Unit;
 
 /**
  * Risk Management class.
diff --git a/Controller/Controller.php b/Controller/Controller.php
index 4913057..4285f52 100644
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -14,23 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\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;
-use Modules\RiskManagement\Models\SolutionMapper;
-use Modules\RiskManagement\Models\CauseMapper;
-use Modules\RiskManagement\Models\RiskMapper;
-use Modules\RiskManagement\Models\DepartmentMapper;
-use Modules\RiskManagement\Models\CategoryMapper;
-use Modules\RiskManagement\Models\ProjectMapper;
-use Modules\RiskManagement\Models\ProcessMapper;
-use Modules\Organization\Models\UnitMapper;
-use Modules\Organization\Models\Unit;
 
 /**
  * Risk Management class.
diff --git a/Models/CategoryMapper.php b/Models/CategoryMapper.php
index d6d8cb2..9e263c0 100644
--- a/Models/CategoryMapper.php
+++ b/Models/CategoryMapper.php
@@ -14,11 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\Models;
 
-use Modules\Media\Models\MediaMapper;
 use phpOMS\DataStorage\Database\DataMapperAbstract;
-use phpOMS\DataStorage\Database\Query\Builder;
-use phpOMS\DataStorage\Database\Query\Column;
-use phpOMS\DataStorage\Database\RelationType;
 
 final class CategoryMapper extends DataMapperAbstract
 {
diff --git a/Models/CauseMapper.php b/Models/CauseMapper.php
index 844e6a9..0ddd1ac 100644
--- a/Models/CauseMapper.php
+++ b/Models/CauseMapper.php
@@ -15,9 +15,6 @@ declare(strict_types=1);
 namespace Modules\RiskManagement\Models;
 
 use phpOMS\DataStorage\Database\DataMapperAbstract;
-use phpOMS\DataStorage\Database\Query\Builder;
-use phpOMS\DataStorage\Database\Query\Column;
-use phpOMS\DataStorage\Database\RelationType;
 
 final class CauseMapper extends DataMapperAbstract
 {
diff --git a/Models/DepartmentMapper.php b/Models/DepartmentMapper.php
index ca8c7f7..76987dd 100644
--- a/Models/DepartmentMapper.php
+++ b/Models/DepartmentMapper.php
@@ -14,11 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\Models;
 
-use Modules\Media\Models\MediaMapper;
 use phpOMS\DataStorage\Database\DataMapperAbstract;
-use phpOMS\DataStorage\Database\Query\Builder;
-use phpOMS\DataStorage\Database\Query\Column;
-use phpOMS\DataStorage\Database\RelationType;
 
 final class DepartmentMapper extends DataMapperAbstract
 {
diff --git a/Models/ProcessMapper.php b/Models/ProcessMapper.php
index c65adce..6ee1108 100644
--- a/Models/ProcessMapper.php
+++ b/Models/ProcessMapper.php
@@ -15,11 +15,7 @@ declare(strict_types=1);
 namespace Modules\RiskManagement\Models;
 
 use Modules\Organization\Models\UnitMapper;
-use Modules\Media\Models\MediaMapper;
 use phpOMS\DataStorage\Database\DataMapperAbstract;
-use phpOMS\DataStorage\Database\Query\Builder;
-use phpOMS\DataStorage\Database\Query\Column;
-use phpOMS\DataStorage\Database\RelationType;
 
 final class ProcessMapper extends DataMapperAbstract
 {
diff --git a/Models/ProjectMapper.php b/Models/ProjectMapper.php
index 1738b48..ce7925e 100644
--- a/Models/ProjectMapper.php
+++ b/Models/ProjectMapper.php
@@ -14,11 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\Models;
 
-use Modules\Media\Models\MediaMapper;
 use phpOMS\DataStorage\Database\DataMapperAbstract;
-use phpOMS\DataStorage\Database\Query\Builder;
-use phpOMS\DataStorage\Database\Query\Column;
-use phpOMS\DataStorage\Database\RelationType;
 
 final class ProjectMapper extends DataMapperAbstract
 {
diff --git a/Models/RiskMapper.php b/Models/RiskMapper.php
index c6d846d..9a0c8f7 100644
--- a/Models/RiskMapper.php
+++ b/Models/RiskMapper.php
@@ -16,11 +16,7 @@ namespace Modules\RiskManagement\Models;
 
 use Modules\Media\Models\MediaMapper;
 use Modules\Organization\Models\UnitMapper;
-use Modules\RiskManagement\Models\RiskObject;
 use phpOMS\DataStorage\Database\DataMapperAbstract;
-use phpOMS\DataStorage\Database\Query\Builder;
-use phpOMS\DataStorage\Database\Query\Column;
-use phpOMS\DataStorage\Database\RelationType;
 
 final class RiskMapper extends DataMapperAbstract
 {
diff --git a/Models/RiskObjectMapper.php b/Models/RiskObjectMapper.php
index f436243..89c27bd 100644
--- a/Models/RiskObjectMapper.php
+++ b/Models/RiskObjectMapper.php
@@ -14,12 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\Models;
 
-use Modules\Media\Models\MediaMapper;
-use Modules\RiskManagement\Models\Risk;
 use phpOMS\DataStorage\Database\DataMapperAbstract;
-use phpOMS\DataStorage\Database\Query\Builder;
-use phpOMS\DataStorage\Database\Query\Column;
-use phpOMS\DataStorage\Database\RelationType;
 
 final class RiskObjectMapper extends DataMapperAbstract
 {
diff --git a/Models/SolutionMapper.php b/Models/SolutionMapper.php
index 6be4cdd..3983a26 100644
--- a/Models/SolutionMapper.php
+++ b/Models/SolutionMapper.php
@@ -14,11 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\Models;
 
-use Modules\Media\Models\MediaMapper;
 use phpOMS\DataStorage\Database\DataMapperAbstract;
-use phpOMS\DataStorage\Database\Query\Builder;
-use phpOMS\DataStorage\Database\Query\Column;
-use phpOMS\DataStorage\Database\RelationType;
 
 final class SolutionMapper extends DataMapperAbstract
 {