diff --git a/src/AuthorizationServer.php b/src/AuthorizationServer.php
index 4a2899a9..91dbe572 100644
--- a/src/AuthorizationServer.php
+++ b/src/AuthorizationServer.php
@@ -13,7 +13,6 @@ namespace League\OAuth2\Server;
 
 use League\OAuth2\Server\Grant\GrantTypeInterface;
 use League\OAuth2\Server\TokenType\Bearer;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * OAuth 2.0 authorization server class
diff --git a/src/Entity/SessionEntity.php b/src/Entity/SessionEntity.php
index 3ec7a5e6..399bd6fb 100644
--- a/src/Entity/SessionEntity.php
+++ b/src/Entity/SessionEntity.php
@@ -12,8 +12,7 @@
 namespace League\OAuth2\Server\Entity;
 
 use League\OAuth2\Server\AbstractServer;
-use League\OAuth2\Server\Event;
-use Symfony\Component\HttpFoundation\ParameterBag;
+use League\OAuth2\Server\Event\SessionOwnerEvent;
 
 /**
  * Session entity grant
@@ -229,7 +228,7 @@ class SessionEntity
         $this->ownerType = $type;
         $this->ownerId = $id;
 
-        $this->server->getEventEmitter()->emit(new Event\SessionOwnerEvent($this));
+        $this->server->getEventEmitter()->emit(new SessionOwnerEvent($this));
 
         return $this;
     }
diff --git a/src/Exception/OAuthException.php b/src/Exception/OAuthException.php
index 84a534db..1242ec04 100644
--- a/src/Exception/OAuthException.php
+++ b/src/Exception/OAuthException.php
@@ -11,6 +11,7 @@
 
 namespace League\OAuth2\Server\Exception;
 
+use League\OAuth2\Server\Util\RedirectUri;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -58,7 +59,7 @@ class OAuthException extends \Exception
      */
     public function getRedirectUri()
     {
-        return \League\OAuth2\Server\Util\RedirectUri::make(
+        return RedirectUri::make(
             $this->redirectUri,
             [
                 'error' =>  $this->errorType,
diff --git a/src/ResourceServer.php b/src/ResourceServer.php
index c24c2e7e..ded35cbc 100644
--- a/src/ResourceServer.php
+++ b/src/ResourceServer.php
@@ -17,7 +17,6 @@ use League\OAuth2\Server\Storage\ClientInterface;
 use League\OAuth2\Server\Storage\ScopeInterface;
 use League\OAuth2\Server\Storage\SessionInterface;
 use League\OAuth2\Server\TokenType\Bearer;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * OAuth 2.0 Resource Server