diff --git a/src/Cache/FileSystemCache.php b/src/Cache/FileSystemCache.php
index 5e9f523..d6d4410 100644
--- a/src/Cache/FileSystemCache.php
+++ b/src/Cache/FileSystemCache.php
@@ -3,7 +3,6 @@ declare(strict_types = 1);
 
 namespace LanguageServer\Cache;
 
-use LanguageServer\LanguageClient;
 use Sabre\Event\Promise;
 
 /**
diff --git a/src/Client/TextDocument.php b/src/Client/TextDocument.php
index 176c4fd..f163d60 100644
--- a/src/Client/TextDocument.php
+++ b/src/Client/TextDocument.php
@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer\Client;
 
 use LanguageServer\ClientHandler;
-use LanguageServer\Protocol\{Message, TextDocumentItem, TextDocumentIdentifier};
+use LanguageServer\Protocol\{TextDocumentItem, TextDocumentIdentifier};
 use Sabre\Event\Promise;
 use JsonMapper;
 
diff --git a/src/Client/Window.php b/src/Client/Window.php
index 053f306..c3558f5 100644
--- a/src/Client/Window.php
+++ b/src/Client/Window.php
@@ -4,7 +4,6 @@ declare(strict_types = 1);
 namespace LanguageServer\Client;
 
 use LanguageServer\ClientHandler;
-use LanguageServer\Protocol\Message;
 use Sabre\Event\Promise;
 
 /**
diff --git a/src/Client/XCache.php b/src/Client/XCache.php
index 3004e58..b3ce5a5 100644
--- a/src/Client/XCache.php
+++ b/src/Client/XCache.php
@@ -4,7 +4,6 @@ declare(strict_types = 1);
 namespace LanguageServer\Client;
 
 use LanguageServer\ClientHandler;
-use LanguageServer\Protocol\Message;
 use Sabre\Event\Promise;
 
 /**
diff --git a/src/Definition.php b/src/Definition.php
index 0d157cb..1600408 100644
--- a/src/Definition.php
+++ b/src/Definition.php
@@ -6,7 +6,6 @@ namespace LanguageServer;
 use LanguageServer\Index\ReadableIndex;
 use phpDocumentor\Reflection\{Types, Type, Fqsen, TypeResolver};
 use LanguageServer\Protocol\SymbolInformation;
-use Exception;
 use Generator;
 
 /**
@@ -69,7 +68,7 @@ class Definition
     public $canBeInstantiated;
 
     /**
-     * @var Protocol\SymbolInformation
+     * @var SymbolInformation
      */
     public $symbolInformation;
 
diff --git a/src/FqnUtilities.php b/src/FqnUtilities.php
index b5d01a9..fcd6027 100644
--- a/src/FqnUtilities.php
+++ b/src/FqnUtilities.php
@@ -3,7 +3,6 @@
 namespace LanguageServer\FqnUtilities;
 
 use phpDocumentor\Reflection\{Type, Types};
-use Microsoft\PhpParser;
 
 /**
  * Returns all possible FQNs in a type
diff --git a/src/Indexer.php b/src/Indexer.php
index 2618d43..a556d4d 100644
--- a/src/Indexer.php
+++ b/src/Indexer.php
@@ -6,10 +6,8 @@ namespace LanguageServer;
 use LanguageServer\Cache\Cache;
 use LanguageServer\FilesFinder\FilesFinder;
 use LanguageServer\Index\{DependenciesIndex, Index};
-use LanguageServer\Protocol\Message;
 use LanguageServer\Protocol\MessageType;
 use Webmozart\PathUtil\Path;
-use Composer\Semver\VersionParser;
 use Sabre\Event\Promise;
 use function Sabre\Event\coroutine;
 
diff --git a/src/Protocol/SymbolInformation.php b/src/Protocol/SymbolInformation.php
index 6b4d39e..499e417 100644
--- a/src/Protocol/SymbolInformation.php
+++ b/src/Protocol/SymbolInformation.php
@@ -4,7 +4,6 @@ namespace LanguageServer\Protocol;
 
 use Microsoft\PhpParser;
 use Microsoft\PhpParser\Node;
-use Exception;
 
 /**
  * Represents information about programming constructs like variables, classes,
diff --git a/src/ProtocolStreamWriter.php b/src/ProtocolStreamWriter.php
index 3f51e14..f004a5f 100644
--- a/src/ProtocolStreamWriter.php
+++ b/src/ProtocolStreamWriter.php
@@ -8,7 +8,6 @@ use Sabre\Event\{
     Loop,
     Promise
 };
-use RuntimeException;
 
 class ProtocolStreamWriter implements ProtocolWriter
 {
diff --git a/src/Server/TextDocument.php b/src/Server/TextDocument.php
index 371ad36..e5657b3 100644
--- a/src/Server/TextDocument.php
+++ b/src/Server/TextDocument.php
@@ -23,7 +23,6 @@ use LanguageServer\Protocol\{
     VersionedTextDocumentIdentifier,
     CompletionContext
 };
-use Microsoft\PhpParser;
 use Microsoft\PhpParser\Node;
 use Sabre\Event\Promise;
 use Sabre\Uri;
diff --git a/src/Server/Workspace.php b/src/Server/Workspace.php
index fe1dda6..082c502 100644
--- a/src/Server/Workspace.php
+++ b/src/Server/Workspace.php
@@ -3,18 +3,16 @@ declare(strict_types = 1);
 
 namespace LanguageServer\Server;
 
-use LanguageServer\{LanguageClient, Project, PhpDocumentLoader};
+use LanguageServer\{LanguageClient, PhpDocumentLoader};
 use LanguageServer\Index\{ProjectIndex, DependenciesIndex, Index};
 use LanguageServer\Protocol\{
     FileChangeType,
     FileEvent,
     SymbolInformation,
     SymbolDescriptor,
-    PackageDescriptor,
     ReferenceInformation,
     DependencyReference,
-    Location,
-    MessageType
+    Location
 };
 use Sabre\Event\Promise;
 use function Sabre\Event\coroutine;
diff --git a/src/SignatureHelpProvider.php b/src/SignatureHelpProvider.php
index aba02b4..439be9c 100644
--- a/src/SignatureHelpProvider.php
+++ b/src/SignatureHelpProvider.php
@@ -7,10 +7,8 @@ use LanguageServer\Index\ReadableIndex;
 use LanguageServer\Protocol\{
     Position,
     SignatureHelp,
-    SignatureInformation,
     ParameterInformation
 };
-use Microsoft\PhpParser;
 use Microsoft\PhpParser\Node;
 use Sabre\Event\Promise;
 use function Sabre\Event\coroutine;
diff --git a/src/TreeAnalyzer.php b/src/TreeAnalyzer.php
index 465f5bb..03ad539 100644
--- a/src/TreeAnalyzer.php
+++ b/src/TreeAnalyzer.php
@@ -3,10 +3,8 @@ declare(strict_types = 1);
 
 namespace LanguageServer;
 
-use LanguageServer\Protocol\{Diagnostic, DiagnosticSeverity, Range, Position, TextEdit};
-use LanguageServer\Index\Index;
+use LanguageServer\Protocol\{Diagnostic, DiagnosticSeverity, Range, Position};
 use phpDocumentor\Reflection\DocBlockFactory;
-use Sabre\Uri;
 use Microsoft\PhpParser;
 use Microsoft\PhpParser\Node;
 use Microsoft\PhpParser\Token;