diff --git a/modules/core/lib/Controller/Login.php b/modules/core/lib/Controller/Login.php
index 5e57eb09abe8cef52cebe246500daa89e2305bdd..b93114c3c192f159a1e82660c8e0564cc99130e8 100644
--- a/modules/core/lib/Controller/Login.php
+++ b/modules/core/lib/Controller/Login.php
@@ -111,7 +111,6 @@ class Login
         }
         $authStateId = $request->query->get('AuthState');
 
-        /** @var array $state */
         $state = $this->authState::loadState($authStateId, UserPassBase::STAGEID);
 
         /** @var \SimpleSAML\Module\core\Auth\UserPassBase|null $source */
@@ -327,7 +326,6 @@ class Login
         }
         $authStateId = $request->query->get('AuthState');
 
-        /** @var array $state */
         $state = $this->authState::loadState($authStateId, UserPassOrgBase::STAGEID);
 
         /** @var \SimpleSAML\Module\core\Auth\UserPassOrgBase $source */
diff --git a/modules/core/lib/Controller/Logout.php b/modules/core/lib/Controller/Logout.php
index 3e3ab60ff3accfb917734246cce3c51dae59db76..26298590c03f44b76a54513c7dee74934ed64569 100644
--- a/modules/core/lib/Controller/Logout.php
+++ b/modules/core/lib/Controller/Logout.php
@@ -126,7 +126,6 @@ class Logout
         }
         $id = $request->query->get('id');
 
-        /** @psalm-var array $state */
         $state = $this->authState::loadState($id, 'core:Logout-IFrame');
         $idp = IdP::getByState($state);
 
@@ -240,7 +239,6 @@ class Logout
 
         $bindings = [Constants::BINDING_HTTP_POST];
 
-        /** @var array $dst */
         $dst = $spMetadata->getDefaultEndpoint('SingleLogoutService', $bindings);
         $binding = Binding::getBinding($dst['Binding']);
         $lr->setDestination($dst['Location']);
@@ -274,7 +272,6 @@ class Logout
             Stats::log('core:idp:logout-iframe:page', ['type' => $type]);
         }
 
-        /** @psalm-var array $state */
         $state = $this->authState::loadState($id, 'core:Logout-IFrame');
         $idp = IdP::getByState($state);
         $mdh = MetaDataStorageHandler::getMetadataHandler();
@@ -407,7 +404,6 @@ class Logout
         }
         $id = $request->query->get('id');
 
-        /** @psalm-var array $state */
         $state = $this->authState::loadState($id, 'core:Logout:afterbridge');
         $idp = IdP::getByState($state);
 
diff --git a/tests/modules/core/lib/Controller/LoginTest.php b/tests/modules/core/lib/Controller/LoginTest.php
index 52d3ed18dda1ce84f8eff1b041130cb628f9cd45..5c4b875b2d136d36b399f031d35045e0b7811163 100644
--- a/tests/modules/core/lib/Controller/LoginTest.php
+++ b/tests/modules/core/lib/Controller/LoginTest.php
@@ -64,7 +64,6 @@ class LoginTest extends ClearStateTestCase
     {
         $c = new Controller\Login($this->config);
 
-        /** @var \SimpleSAML\XHTML\Template $response */
         $response = $c->welcome();
 
         $this->assertInstanceOf(Template::class, $response);
@@ -132,7 +131,6 @@ class LoginTest extends ClearStateTestCase
             }
         });
 
-        /** @var \SimpleSAML\XHTML\Template $response */
         $response = $c->loginuserpass($request);
 
         $this->assertInstanceOf(Template::class, $response);
@@ -203,7 +201,6 @@ class LoginTest extends ClearStateTestCase
             }
         });
 
-        // @var \SimpleSAML\XHTML\Template $response
         $response = $c->loginuserpassorg($request);
 
         $this->assertInstanceOf(Template::class, $response);