diff --git a/src/Broker/Topic.php b/src/Broker/Topic.php
index 23e3dc8..20564da 100644
--- a/src/Broker/Topic.php
+++ b/src/Broker/Topic.php
@@ -28,7 +28,7 @@ class Topic
 
     public function publish(Message $message)
     {
-        // TODO check if message id has already been published
+        // check if message id has already been published
         if (isset($this->messages[$message->id])) return;
 
         $this->messages[$message->id] = $message;
diff --git a/src/Http/Middleware/MercureHandler.php b/src/Http/Middleware/MercureHandler.php
index 2f883ae..0e8d9ce 100644
--- a/src/Http/Middleware/MercureHandler.php
+++ b/src/Http/Middleware/MercureHandler.php
@@ -64,14 +64,6 @@ class MercureHandler
      */
     private function handleMercureClient(ServerRequestInterface $request): ResponseInterface
     {
-        $tok = $request->getAttribute('authorization');
-        if ($tok instanceof JWTToken) {
-            $claims = $tok->claims->getAll();
-            if (isset($claims['mercure']['subscribe'])) {
-                $subscribeClaims = $claims['mercure']['subscribe'];
-                // TODO check topic against subscribeClaims
-            }            
-        }
 
         $responseStream = new ThroughStream();