diff --git a/system/src/Grav/Framework/Flex/Storage/AbstractFilesystemStorage.php b/system/src/Grav/Framework/Flex/Storage/AbstractFilesystemStorage.php
index 76dae57b9..ed08e4608 100644
--- a/system/src/Grav/Framework/Flex/Storage/AbstractFilesystemStorage.php
+++ b/system/src/Grav/Framework/Flex/Storage/AbstractFilesystemStorage.php
@@ -15,8 +15,6 @@ use Grav\Common\File\CompiledJsonFile;
 use Grav\Common\File\CompiledMarkdownFile;
 use Grav\Common\File\CompiledYamlFile;
 use Grav\Common\Grav;
-use Grav\Common\Helpers\Base32;
-use Grav\Common\Utils;
 use Grav\Framework\File\Formatter\FormatterInterface;
 use Grav\Framework\File\Formatter\JsonFormatter;
 use Grav\Framework\File\Formatter\MarkdownFormatter;
diff --git a/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php b/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php
index 2012291d2..907eccec0 100644
--- a/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php
+++ b/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php
@@ -14,7 +14,7 @@ use Grav\Common\Filesystem\Folder;
 use Grav\Common\Grav;
 use Grav\Common\Media\Traits\MediaTrait;
 use Grav\Common\Utils;
-use Grav\Plugin\Form\FormFlashFile;
+use Grav\Framework\Form\FormFlashFile;
 use Psr\Http\Message\UploadedFileInterface;
 use RocketTheme\Toolbox\File\YamlFile;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
diff --git a/system/src/Grav/Framework/Psr7/Request.php b/system/src/Grav/Framework/Psr7/Request.php
index 7e1fd6b93..f6c26ae4d 100644
--- a/system/src/Grav/Framework/Psr7/Request.php
+++ b/system/src/Grav/Framework/Psr7/Request.php
@@ -1,3 +1,3 @@
 <?php
 
-class_alias('Nyholm\Psr7\Request', 'Grav\Framework\Psr7\Request');
+class_alias(Nyholm\Psr7\Request::class, Grav\Framework\Psr7\Request::class);
diff --git a/system/src/Grav/Framework/Psr7/Response.php b/system/src/Grav/Framework/Psr7/Response.php
index 222312c5e..00270e42a 100644
--- a/system/src/Grav/Framework/Psr7/Response.php
+++ b/system/src/Grav/Framework/Psr7/Response.php
@@ -1,3 +1,3 @@
 <?php
 
-class_alias('Nyholm\Psr7\Response', 'Grav\Framework\Psr7\Response');
+class_alias(Nyholm\Psr7\Response::class, Grav\Framework\Psr7\Response::class);
diff --git a/system/src/Grav/Framework/Psr7/ServerRequest.php b/system/src/Grav/Framework/Psr7/ServerRequest.php
index e217b536d..0e55052b9 100644
--- a/system/src/Grav/Framework/Psr7/ServerRequest.php
+++ b/system/src/Grav/Framework/Psr7/ServerRequest.php
@@ -1,3 +1,3 @@
 <?php
 
-class_alias('Nyholm\Psr7\ServerRequest', 'Grav\Framework\Psr7\ServerRequest');
+class_alias(Nyholm\Psr7\ServerRequest::class, Grav\Framework\Psr7\ServerRequest::class);
diff --git a/system/src/Grav/Framework/Psr7/Stream.php b/system/src/Grav/Framework/Psr7/Stream.php
index eb2661404..470491f18 100644
--- a/system/src/Grav/Framework/Psr7/Stream.php
+++ b/system/src/Grav/Framework/Psr7/Stream.php
@@ -1,3 +1,3 @@
 <?php
 
-class_alias('Nyholm\Psr7\Stream', 'Grav\Framework\Psr7\Stream');
+class_alias(Nyholm\Psr7\Stream::class, Grav\Framework\Psr7\Stream::class);
diff --git a/system/src/Grav/Framework/Psr7/UploadedFile.php b/system/src/Grav/Framework/Psr7/UploadedFile.php
index 52989905f..9c057ddcf 100644
--- a/system/src/Grav/Framework/Psr7/UploadedFile.php
+++ b/system/src/Grav/Framework/Psr7/UploadedFile.php
@@ -1,3 +1,3 @@
 <?php
 
-class_alias('Nyholm\Psr7\UploadedFile', 'Grav\Framework\Psr7\UploadedFile');
+class_alias(Nyholm\Psr7\UploadedFile::class, Grav\Framework\Psr7\UploadedFile::class);
diff --git a/system/src/Grav/Framework/Psr7/Uri.php b/system/src/Grav/Framework/Psr7/Uri.php
index 6676dc2d7..ebf46728f 100644
--- a/system/src/Grav/Framework/Psr7/Uri.php
+++ b/system/src/Grav/Framework/Psr7/Uri.php
@@ -1,3 +1,3 @@
 <?php
 
-class_alias('Nyholm\Psr7\Uri', 'Grav\Framework\Psr7\Uri');
+class_alias(Nyholm\Psr7\Uri::class, Grav\Framework\Psr7\Uri::class);
diff --git a/system/src/Grav/Framework/RequestHandler/Exception/NotHandledException.php b/system/src/Grav/Framework/RequestHandler/Exception/NotHandledException.php
index b5d08148f..f36680165 100644
--- a/system/src/Grav/Framework/RequestHandler/Exception/NotHandledException.php
+++ b/system/src/Grav/Framework/RequestHandler/Exception/NotHandledException.php
@@ -11,17 +11,6 @@ declare(strict_types=1);
 
 namespace Grav\Framework\RequestHandler\Exception;
 
-use Psr\Http\Message\ServerRequestInterface;
-
 class NotHandledException extends NotFoundException
 {
-    /**
-     * NotFoundException constructor.
-     * @param ServerRequestInterface $request
-     * @param \Throwable|null $previous
-     */
-    public function __construct(ServerRequestInterface $request, \Throwable $previous = null)
-    {
-        parent::__construct($request, $previous);
-    }
 }
diff --git a/system/src/Grav/Framework/Session/SessionInterface.php b/system/src/Grav/Framework/Session/SessionInterface.php
index be3462015..a63d54c45 100644
--- a/system/src/Grav/Framework/Session/SessionInterface.php
+++ b/system/src/Grav/Framework/Session/SessionInterface.php
@@ -111,7 +111,7 @@ interface SessionInterface extends \IteratorAggregate
     /**
      * Checks if the session was started.
      *
-     * @return Boolean
+     * @return bool
      */
     public function isStarted();