diff --git a/system/Commands/Generators/ValidationGenerator.php b/system/Commands/Generators/ValidationGenerator.php
index 13fe3e2d0fc1..9a79d47f09fe 100644
--- a/system/Commands/Generators/ValidationGenerator.php
+++ b/system/Commands/Generators/ValidationGenerator.php
@@ -12,7 +12,6 @@
 namespace CodeIgniter\Commands\Generators;
 
 use CodeIgniter\CLI\BaseCommand;
-use CodeIgniter\CLI\CLI;
 use CodeIgniter\CLI\GeneratorTrait;
 
 /**
diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
index c7b6b1da28e8..9c8e42f794d2 100755
--- a/system/Database/SQLSRV/Connection.php
+++ b/system/Database/SQLSRV/Connection.php
@@ -11,7 +11,6 @@
 
 namespace CodeIgniter\Database\SQLSRV;
 
-use CodeIgniter\Database\Query;
 use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use Exception;
diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php
index 3bdf1fa8d18a..4547ad7c5937 100644
--- a/system/Database/SQLite3/Connection.php
+++ b/system/Database/SQLite3/Connection.php
@@ -11,7 +11,6 @@
 
 namespace CodeIgniter\Database\SQLite3;
 
-use CodeIgniter\Database\Query;
 use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use ErrorException;
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 560b6523e86c..422f5b9151d6 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -14,7 +14,6 @@
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\HTTP\Files\FileCollection;
 use CodeIgniter\HTTP\Files\UploadedFile;
-use CodeIgniter\HTTP\URI;
 use Config\App;
 use Config\Services;
 use InvalidArgumentException;
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 4cd4f207c173..b7d586e48907 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -13,7 +13,6 @@
 
 use Closure;
 use CodeIgniter\Autoloader\FileLocator;
-use CodeIgniter\HTTP\Request;
 use CodeIgniter\Router\Exceptions\RouterException;
 use Config\Modules;
 use Config\Services;
diff --git a/system/Test/DatabaseTestTrait.php b/system/Test/DatabaseTestTrait.php
index 0d2949af4806..2c8ba23a795d 100644
--- a/system/Test/DatabaseTestTrait.php
+++ b/system/Test/DatabaseTestTrait.php
@@ -12,10 +12,7 @@
 namespace CodeIgniter\Test;
 
 use CodeIgniter\Database\BaseBuilder;
-use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\Database\Exceptions\DatabaseException;
-use CodeIgniter\Database\MigrationRunner;
-use CodeIgniter\Database\Seeder;
 use CodeIgniter\Test\Constraints\SeeInDatabase;
 use Config\Database;
 use Config\Migrations;
diff --git a/system/Test/Fabricator.php b/system/Test/Fabricator.php
index ef2294e0acbf..48cb2309cdd1 100644
--- a/system/Test/Fabricator.php
+++ b/system/Test/Fabricator.php
@@ -12,7 +12,6 @@
 namespace CodeIgniter\Test;
 
 use CodeIgniter\Exceptions\FrameworkException;
-use CodeIgniter\Model;
 use Faker\Factory;
 use Faker\Generator;
 use InvalidArgumentException;
diff --git a/system/Test/Mock/MockServices.php b/system/Test/Mock/MockServices.php
index 3fa1a142aea0..58fac0c1ad68 100644
--- a/system/Test/Mock/MockServices.php
+++ b/system/Test/Mock/MockServices.php
@@ -11,7 +11,7 @@
 
 namespace CodeIgniter\Test\Mock;
 
-use \CodeIgniter\Config\BaseService;
+use CodeIgniter\Config\BaseService;
 use CodeIgniter\Autoloader\FileLocator;
 
 class MockServices extends BaseService
diff --git a/system/Test/TestResponse.php b/system/Test/TestResponse.php
index 4c7a655457c8..a1bacdaacd2c 100644
--- a/system/Test/TestResponse.php
+++ b/system/Test/TestResponse.php
@@ -16,7 +16,6 @@
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;
 use Exception;
-use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
 
 /**