diff --git a/Admin/Installer.php b/Admin/Installer.php
index 9813dac..cd26cdf 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -14,8 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\ProjectManagement\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 12c0d30..dbf6cc4 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\ProjectManagement\Models\PermissionState;
 use Modules\ProjectManagement\Controller\BackendController;
+use Modules\ProjectManagement\Models\PermissionState;
+use phpOMS\Account\PermissionType;
+use phpOMS\Router\RouteVerb;
 
 return [
     '^.*/backend/projectmanagement/list.*$' => [
diff --git a/Admin/Status.php b/Admin/Status.php
index a524fa2..1a607a0 100644
--- a/Admin/Status.php
+++ b/Admin/Status.php
@@ -14,9 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\ProjectManagement\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 68287a9..74c0db5 100644
--- a/Admin/Uninstaller.php
+++ b/Admin/Uninstaller.php
@@ -14,9 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\ProjectManagement\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 9a86b4a..efdbe64 100644
--- a/Admin/Updater.php
+++ b/Admin/Updater.php
@@ -14,10 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\ProjectManagement\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 ad675be..5b413c2 100644
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -14,17 +14,12 @@ declare(strict_types=1);
 
 namespace Modules\ProjectManagement\Controller;
 
-use Modules\Navigation\Models\Navigation;
-use Modules\Navigation\Views\NavigationView;
+use Modules\ProjectManagement\Models\ProjectMapper;
+use phpOMS\Asset\AssetType;
 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\ProjectManagement\Models\ProjectMapper;
-use Modules\ProjectManagement\Models\Project;
-use phpOMS\Asset\AssetType;
 
 /**
  * Event Management controller class.
diff --git a/Controller/Controller.php b/Controller/Controller.php
index ef86265..b92eb57 100644
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -14,17 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\ProjectManagement\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\ProjectManagement\Models\ProjectMapper;
-use Modules\ProjectManagement\Models\Project;
-use phpOMS\Asset\AssetType;
 
 /**
  * Event Management controller class.
diff --git a/Models/ProjectMapper.php b/Models/ProjectMapper.php
index bbad57b..a7b66aa 100644
--- a/Models/ProjectMapper.php
+++ b/Models/ProjectMapper.php
@@ -15,12 +15,9 @@ declare(strict_types=1);
 namespace Modules\ProjectManagement\Models;
 
 use Modules\Calendar\Models\CalendarMapper;
-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 Modules\Media\Models\MediaMapper;
+use Modules\Tasks\Models\TaskMapper;
+use phpOMS\DataStorage\Database\DataMapperAbstract;
 
 /**
  * Mapper class.