diff --git a/app/Api/User.php b/app/Api/User.php
index 078c82f13..06e305f21 100644
--- a/app/Api/User.php
+++ b/app/Api/User.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Api;
 
-use Kanboard\Auth\Ldap;
+use LogicException;
 use Kanboard\Core\Security\Role;
 use Kanboard\Core\Ldap\Client as LdapClient;
 use Kanboard\Core\Ldap\ClientException as LdapException;
diff --git a/app/Controller/Base.php b/app/Controller/Base.php
index 76948a0f2..35ceee096 100644
--- a/app/Controller/Base.php
+++ b/app/Controller/Base.php
@@ -2,7 +2,6 @@
 
 namespace Kanboard\Controller;
 
-use Pimple\Container;
 use Kanboard\Core\Security\Role;
 
 /**
diff --git a/app/Controller/Customfilter.php b/app/Controller/Customfilter.php
index ef75a8371..12cc8e782 100644
--- a/app/Controller/Customfilter.php
+++ b/app/Controller/Customfilter.php
@@ -2,6 +2,8 @@
 
 namespace Kanboard\Controller;
 
+use Kanboard\Core\Security\Role;
+
 /**
  * Custom Filter management
  *
diff --git a/app/Core/Security/AuthenticationManager.php b/app/Core/Security/AuthenticationManager.php
index cced58c0b..dbc41b09d 100644
--- a/app/Core/Security/AuthenticationManager.php
+++ b/app/Core/Security/AuthenticationManager.php
@@ -4,7 +4,6 @@ namespace Kanboard\Core\Security;
 
 use LogicException;
 use Kanboard\Core\Base;
-use Kanboard\Core\User\UserProviderInterface;
 use Kanboard\Event\AuthFailureEvent;
 use Kanboard\Event\AuthSuccessEvent;
 
diff --git a/app/Core/Session/SessionManager.php b/app/Core/Session/SessionManager.php
index 750711b04..776d02da7 100644
--- a/app/Core/Session/SessionManager.php
+++ b/app/Core/Session/SessionManager.php
@@ -3,7 +3,6 @@
 namespace Kanboard\Core\Session;
 
 use Kanboard\Core\Base;
-use Kanboard\Core\Http\Request;
 
 /**
  * Session Manager
diff --git a/app/Helper/Url.php b/app/Helper/Url.php
index 3658ef5f6..6ada80688 100644
--- a/app/Helper/Url.php
+++ b/app/Helper/Url.php
@@ -2,7 +2,6 @@
 
 namespace Kanboard\Helper;
 
-use Kanboard\Core\Http\Request;
 use Kanboard\Core\Base;
 
 /**
diff --git a/app/Helper/User.php b/app/Helper/User.php
index b242dbb4d..101d8dbe3 100644
--- a/app/Helper/User.php
+++ b/app/Helper/User.php
@@ -2,8 +2,6 @@
 
 namespace Kanboard\Helper;
 
-use Kanboard\Core\Security\Role;
-
 /**
  * User helpers
  *
diff --git a/app/Model/ProjectDailyColumnStats.php b/app/Model/ProjectDailyColumnStats.php
index 4b75fff22..7c89283db 100644
--- a/app/Model/ProjectDailyColumnStats.php
+++ b/app/Model/ProjectDailyColumnStats.php
@@ -2,8 +2,6 @@
 
 namespace Kanboard\Model;
 
-use PicoDb\Database;
-
 /**
  * Project Daily Column Stats
  *
diff --git a/app/Model/ProjectDailyStats.php b/app/Model/ProjectDailyStats.php
index 7ec1ee2cb..e79af3724 100644
--- a/app/Model/ProjectDailyStats.php
+++ b/app/Model/ProjectDailyStats.php
@@ -2,8 +2,6 @@
 
 namespace Kanboard\Model;
 
-use PicoDb\Database;
-
 /**
  * Project Daily Stats
  *
diff --git a/app/User/DatabaseUserProvider.php b/app/User/DatabaseUserProvider.php
index b6d411868..9a0047b22 100644
--- a/app/User/DatabaseUserProvider.php
+++ b/app/User/DatabaseUserProvider.php
@@ -3,7 +3,6 @@
 namespace Kanboard\User;
 
 use Kanboard\Core\User\UserProviderInterface;
-use Kanboard\Core\Security\Role;
 
 /**
  * Database User Provider
diff --git a/app/User/OAuthUserProvider.php b/app/User/OAuthUserProvider.php
index 3879fa76a..527fefdea 100644
--- a/app/User/OAuthUserProvider.php
+++ b/app/User/OAuthUserProvider.php
@@ -3,7 +3,6 @@
 namespace Kanboard\User;
 
 use Kanboard\Core\User\UserProviderInterface;
-use Kanboard\Core\Security\Role;
 
 /**
  * OAuth User Provider