diff --git a/Admin/Installer.php b/Admin/Installer.php
index b518c9a..8d37636 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -14,8 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\Comments\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/Api.php b/Admin/Routes/Web/Api.php
index ccd7694..a72a250 100644
--- a/Admin/Routes/Web/Api.php
+++ b/Admin/Routes/Web/Api.php
@@ -1,6 +1,5 @@
 <?php
 
-use phpOMS\Router\RouteVerb;
 
 return [
 ];
diff --git a/Admin/Status.php b/Admin/Status.php
index 40b3f9f..59e16cc 100644
--- a/Admin/Status.php
+++ b/Admin/Status.php
@@ -14,9 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Comments\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 badfb01..354bf6a 100644
--- a/Admin/Uninstaller.php
+++ b/Admin/Uninstaller.php
@@ -14,9 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Comments\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 580eca7..86036c3 100644
--- a/Admin/Updater.php
+++ b/Admin/Updater.php
@@ -14,10 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Comments\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 5ba8b19..7b54fe0 100644
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -14,14 +14,9 @@ declare(strict_types=1);
 
 namespace Modules\Comments\Controller;
 
-use Modules\Navigation\Models\Navigation;
-use Modules\Navigation\Views\NavigationView;
 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;
 
 /**
diff --git a/Controller/Controller.php b/Controller/Controller.php
index 9ffa0a0..c175374 100644
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -14,15 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\Comments\Controller;
 
-use Modules\Navigation\Models\Navigation;
-use Modules\Navigation\Views\NavigationView;
-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;
 
 /**
  * Calendar controller class.
diff --git a/Models/CommentListMapper.php b/Models/CommentListMapper.php
index cff9664..0335a99 100644
--- a/Models/CommentListMapper.php
+++ b/Models/CommentListMapper.php
@@ -14,11 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Comments\Models;
 
-use Modules\Comments\Models\CommentMapper;
 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/CommentMapper.php b/Models/CommentMapper.php
index 93b81ca..93eb22e 100644
--- a/Models/CommentMapper.php
+++ b/Models/CommentMapper.php
@@ -15,9 +15,6 @@ declare(strict_types=1);
 namespace Modules\Comments\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.