diff --git a/Admin/Installer.php b/Admin/Installer.php
index 0af8de1..d1e57f4 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -14,8 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\ClientManagement\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 01aa328..cbbbb10 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\ClientManagement\Models\PermissionState;
 use Modules\ClientManagement\Controller\BackendController;
+use Modules\ClientManagement\Models\PermissionState;
+use phpOMS\Account\PermissionType;
+use phpOMS\Router\RouteVerb;
 
 
 return [
diff --git a/Admin/Status.php b/Admin/Status.php
index ca59762..cf66814 100644
--- a/Admin/Status.php
+++ b/Admin/Status.php
@@ -14,9 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\ClientManagement\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 651b9f6..4a3bde1 100644
--- a/Admin/Uninstaller.php
+++ b/Admin/Uninstaller.php
@@ -14,9 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\ClientManagement\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 f0f7631..dcfb240 100644
--- a/Admin/Updater.php
+++ b/Admin/Updater.php
@@ -14,10 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\ClientManagement\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 fef0583..2c88aa1 100644
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -14,15 +14,10 @@ declare(strict_types=1);
 
 namespace Modules\ClientManagement\Controller;
 
-use Modules\Navigation\Models\Navigation;
-use Modules\Navigation\Views\NavigationView;
-use Modules\ClientManagement\Models\Client;
 use Modules\ClientManagement\Models\ClientMapper;
 use phpOMS\Contract\RenderableInterface;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
-use phpOMS\Module\ModuleAbstract;
-use phpOMS\Module\WebInterface;
 use phpOMS\Views\View;
 
 /**
diff --git a/Controller/Controller.php b/Controller/Controller.php
index cfdc4c0..bd2df60 100644
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -14,16 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\ClientManagement\Controller;
 
-use Modules\Navigation\Models\Navigation;
-use Modules\Navigation\Views\NavigationView;
-use Modules\ClientManagement\Models\Client;
-use Modules\ClientManagement\Models\ClientMapper;
-use phpOMS\Contract\RenderableInterface;
-use phpOMS\Message\RequestAbstract;
-use phpOMS\Message\ResponseAbstract;
 use phpOMS\Module\ModuleAbstract;
 use phpOMS\Module\WebInterface;
-use phpOMS\Views\View;
 
 /**
  * ClientManagement class.
diff --git a/Models/ClientMapper.php b/Models/ClientMapper.php
index 975cf64..3a403b1 100644
--- a/Models/ClientMapper.php
+++ b/Models/ClientMapper.php
@@ -15,14 +15,10 @@ declare(strict_types=1);
 namespace Modules\ClientManagement\Models;
 
 use Modules\Media\Models\MediaMapper;
-use Modules\Profile\Models\ProfileMapper;
-use Modules\Profile\Models\ContactElement;
 use Modules\Profile\Models\ContactElementMapper;
-use Modules\Profile\Models\ContactMapper;
+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;
 
 final class ClientMapper extends DataMapperAbstract
 {