diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index eddbeed05d5..892df7a38de 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -43,11 +43,6 @@
       <code>IEventListener</code>
     </MissingTemplateParam>
   </file>
-  <file src="apps/cloud_federation_api/lib/Controller/RequestHandlerController.php">
-    <TypeDoesNotContainType>
-      <code>!is_array($notification)</code>
-    </TypeDoesNotContainType>
-  </file>
   <file src="apps/comments/lib/Listener/CommentsEntityEventListener.php">
     <MissingTemplateParam>
       <code>IEventListener</code>
@@ -96,12 +91,6 @@
     </UndefinedGlobalVariable>
   </file>
   <file src="apps/dav/appinfo/v1/webdav.php">
-    <InvalidArgument>
-      <code><![CDATA['OCA\DAV\Connector\Sabre::addPlugin']]></code>
-    </InvalidArgument>
-    <TooManyArguments>
-      <code>dispatch</code>
-    </TooManyArguments>
     <UndefinedGlobalVariable>
       <code>$baseuri</code>
     </UndefinedGlobalVariable>
@@ -353,7 +342,7 @@
     </RedundantCast>
     <RedundantCondition>
       <code><![CDATA[!empty($modified['old']) && is_array($modified['old'])]]></code>
-      <code><![CDATA[is_array($modified['old'])]]></code>
+      <code>is_array($modified['old'])</code>
     </RedundantCondition>
   </file>
   <file src="apps/dav/lib/CalDAV/Schedule/IMipService.php">
@@ -364,8 +353,8 @@
   </file>
   <file src="apps/dav/lib/CalDAV/Schedule/Plugin.php">
     <InvalidArgument>
-      <code><![CDATA[[$aclPlugin, 'propFind']]]></code>
-      <code><![CDATA[[$aclPlugin, 'propFind']]]></code>
+      <code>[$aclPlugin, 'propFind']</code>
+      <code>[$aclPlugin, 'propFind']</code>
     </InvalidArgument>
     <LessSpecificReturnStatement>
       <code><![CDATA[$vevent->DTEND]]></code>
@@ -400,12 +389,12 @@
   </file>
   <file src="apps/dav/lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php">
     <TypeDoesNotContainType>
-      <code><![CDATA[!is_array($newProps['filters']['comps'])]]></code>
-      <code><![CDATA[!is_array($newProps['filters']['params'])]]></code>
-      <code><![CDATA[!is_array($newProps['filters']['props'])]]></code>
-      <code><![CDATA[!isset($newProps['filters']['comps']) || !is_array($newProps['filters']['comps'])]]></code>
-      <code><![CDATA[!isset($newProps['filters']['params']) || !is_array($newProps['filters']['params'])]]></code>
-      <code><![CDATA[!isset($newProps['filters']['props']) || !is_array($newProps['filters']['props'])]]></code>
+      <code>!is_array($newProps['filters']['comps'])</code>
+      <code>!is_array($newProps['filters']['params'])</code>
+      <code>!is_array($newProps['filters']['props'])</code>
+      <code>!isset($newProps['filters']['comps']) || !is_array($newProps['filters']['comps'])</code>
+      <code>!isset($newProps['filters']['params']) || !is_array($newProps['filters']['params'])</code>
+      <code>!isset($newProps['filters']['props']) || !is_array($newProps['filters']['props'])</code>
     </TypeDoesNotContainType>
   </file>
   <file src="apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php">
@@ -441,7 +430,7 @@
       <code>VCard</code>
     </MoreSpecificReturnType>
     <TypeDoesNotContainType>
-      <code><![CDATA[$addressBooks[$row['id']][$readOnlyPropertyName] === 0]]></code>
+      <code>$addressBooks[$row['id']][$readOnlyPropertyName] === 0</code>
     </TypeDoesNotContainType>
   </file>
   <file src="apps/dav/lib/CardDAV/MultiGetExportPlugin.php">
@@ -495,14 +484,6 @@
       <code>\Sabre\HTTP\toDate($value)</code>
     </UndefinedFunction>
   </file>
-  <file src="apps/dav/lib/Comments/RootCollection.php">
-    <InvalidArgument>
-      <code>CommentsEntityEvent::EVENT_ENTITY</code>
-    </InvalidArgument>
-    <TooManyArguments>
-      <code>dispatch</code>
-    </TooManyArguments>
-  </file>
   <file src="apps/dav/lib/Connector/Sabre/AnonymousOptionsPlugin.php">
     <InvalidNullableReturnType>
       <code>bool</code>
@@ -566,7 +547,7 @@
       <code>bool</code>
     </InvalidNullableReturnType>
     <TooManyArguments>
-      <code><![CDATA[new PreconditionFailed('Cannot filter by non-existing tag', 0, $e)]]></code>
+      <code>new PreconditionFailed('Cannot filter by non-existing tag', 0, $e)</code>
     </TooManyArguments>
     <UndefinedClass>
       <code>\OCA\Circles\Api\v1\Circles</code>
@@ -835,16 +816,6 @@
       <code>hasTime</code>
     </UndefinedMethod>
   </file>
-  <file src="apps/dav/lib/Server.php">
-    <InvalidArgument>
-      <code><![CDATA['OCA\DAV\Connector\Sabre::addPlugin']]></code>
-      <code><![CDATA['OCA\DAV\Connector\Sabre::authInit']]></code>
-    </InvalidArgument>
-    <TooManyArguments>
-      <code>dispatch</code>
-      <code>dispatch</code>
-    </TooManyArguments>
-  </file>
   <file src="apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php">
     <ParamNameMismatch>
       <code>$tagId</code>
@@ -919,7 +890,7 @@
       <code>$userSession</code>
     </RedundantCondition>
     <TypeDoesNotContainType>
-      <code><![CDATA[get_class($res) === 'OpenSSLAsymmetricKey']]></code>
+      <code>get_class($res) === 'OpenSSLAsymmetricKey'</code>
     </TypeDoesNotContainType>
   </file>
   <file src="apps/encryption/lib/Crypto/Encryption.php">
@@ -939,7 +910,7 @@
   </file>
   <file src="apps/encryption/lib/Session.php">
     <TooManyArguments>
-      <code><![CDATA[new Exceptions\PrivateKeyMissingException('please try to log-out and log-in again', 0)]]></code>
+      <code>new Exceptions\PrivateKeyMissingException('please try to log-out and log-in again', 0)</code>
     </TooManyArguments>
   </file>
   <file src="apps/encryption/lib/Util.php">
@@ -970,7 +941,7 @@
       <code>$shareId</code>
       <code>$shareId</code>
       <code>$shareId</code>
-      <code><![CDATA[(int)$data['id']]]></code>
+      <code>(int)$data['id']</code>
     </InvalidArgument>
     <LessSpecificReturnStatement>
       <code>$nodes[0]</code>
@@ -1005,7 +976,7 @@
       <code>string</code>
     </InvalidReturnType>
     <InvalidScalarArgument>
-      <code><![CDATA[(int)$share['id']]]></code>
+      <code>(int)$share['id']</code>
     </InvalidScalarArgument>
   </file>
   <file src="apps/federation/lib/DbHandler.php">
@@ -1138,7 +1109,7 @@
   </file>
   <file src="apps/files/lib/Service/TagService.php">
     <InvalidArgument>
-      <code><![CDATA[self::class . '::' . $eventName]]></code>
+      <code>self::class . '::' . $eventName</code>
     </InvalidArgument>
     <TooManyArguments>
       <code>dispatch</code>
@@ -1226,7 +1197,7 @@
   </file>
   <file src="apps/files_external/lib/Service/BackendService.php">
     <InvalidArgument>
-      <code><![CDATA['OCA\\Files_External::loadAdditionalBackends']]></code>
+      <code>'OCA\\Files_External::loadAdditionalBackends'</code>
     </InvalidArgument>
     <TooManyArguments>
       <code>dispatch</code>
@@ -1349,7 +1320,7 @@
   </file>
   <file src="apps/files_sharing/templates/public.php">
     <RedundantCondition>
-      <code><![CDATA[$_['hideFileList'] !== true]]></code>
+      <code>$_['hideFileList'] !== true</code>
       <code><![CDATA[isset($_['hideFileList']) && $_['hideFileList'] !== true]]></code>
     </RedundantCondition>
   </file>
@@ -1396,15 +1367,9 @@
     </InvalidReturnType>
   </file>
   <file src="apps/files_trashbin/lib/Storage.php">
-    <InvalidArgument>
-      <code><![CDATA['OCA\Files_Trashbin::moveToTrash']]></code>
-    </InvalidArgument>
     <InvalidOperand>
       <code><![CDATA[$this->mountPoint]]></code>
     </InvalidOperand>
-    <TooManyArguments>
-      <code>dispatch</code>
-    </TooManyArguments>
   </file>
   <file src="apps/files_trashbin/lib/Trash/LegacyTrashBackend.php">
     <RedundantCondition>
@@ -1507,18 +1472,6 @@
       <code>ignoreNextcloudRequirementForApp</code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="apps/settings/lib/Controller/CheckSetupController.php">
-    <InvalidArgument>
-      <code>IDBConnection::CHECK_MISSING_COLUMNS_EVENT</code>
-      <code>IDBConnection::CHECK_MISSING_INDEXES_EVENT</code>
-      <code>IDBConnection::CHECK_MISSING_PRIMARY_KEYS_EVENT</code>
-    </InvalidArgument>
-    <TooManyArguments>
-      <code>dispatch</code>
-      <code>dispatch</code>
-      <code>dispatch</code>
-    </TooManyArguments>
-  </file>
   <file src="apps/settings/lib/Hooks.php">
     <InvalidArrayOffset>
       <code><![CDATA[[$user->getEMailAddress() => $user->getDisplayName()]]]></code>
@@ -1552,7 +1505,7 @@
   <file src="apps/sharebymail/lib/ShareByMailProvider.php">
     <InvalidArgument>
       <code><![CDATA[$share->getId()]]></code>
-      <code><![CDATA[(int)$data['id']]]></code>
+      <code>(int)$data['id']</code>
     </InvalidArgument>
     <LessSpecificReturnStatement>
       <code>$nodes[0]</code>
@@ -1652,7 +1605,7 @@
   </file>
   <file src="apps/user_ldap/lib/AppInfo/Application.php">
     <InvalidArgument>
-      <code><![CDATA['OCA\\User_LDAP\\User\\User::postLDAPBackendAdded']]></code>
+      <code>'OCA\\User_LDAP\\User\\User::postLDAPBackendAdded'</code>
     </InvalidArgument>
     <TooManyArguments>
       <code>dispatch</code>
@@ -1823,9 +1776,6 @@
   <file src="apps/workflowengine/lib/Manager.php">
     <InvalidArgument>
       <code>$missingCheck</code>
-      <code>IManager::EVENT_NAME_REG_CHECK</code>
-      <code>IManager::EVENT_NAME_REG_ENTITY</code>
-      <code>IManager::EVENT_NAME_REG_OPERATION</code>
     </InvalidArgument>
     <InvalidOperand>
       <code>$result</code>
@@ -1836,11 +1786,6 @@
     <InvalidReturnType>
       <code>bool</code>
     </InvalidReturnType>
-    <TooManyArguments>
-      <code>dispatch</code>
-      <code>dispatch</code>
-      <code>dispatch</code>
-    </TooManyArguments>
   </file>
   <file src="apps/workflowengine/lib/Service/RuleMatcher.php">
     <UndefinedInterfaceMethod>
@@ -1895,30 +1840,6 @@
       <code>getFilteredValues</code>
     </TooManyArguments>
   </file>
-  <file src="core/Command/Db/AddMissingColumns.php">
-    <InvalidArgument>
-      <code>IDBConnection::ADD_MISSING_COLUMNS_EVENT</code>
-    </InvalidArgument>
-    <TooManyArguments>
-      <code>dispatch</code>
-    </TooManyArguments>
-  </file>
-  <file src="core/Command/Db/AddMissingIndices.php">
-    <InvalidArgument>
-      <code>IDBConnection::ADD_MISSING_INDEXES_EVENT</code>
-    </InvalidArgument>
-    <TooManyArguments>
-      <code>dispatch</code>
-    </TooManyArguments>
-  </file>
-  <file src="core/Command/Db/AddMissingPrimaryKeys.php">
-    <InvalidArgument>
-      <code>IDBConnection::ADD_MISSING_PRIMARY_KEYS_EVENT</code>
-    </InvalidArgument>
-    <TooManyArguments>
-      <code>dispatch</code>
-    </TooManyArguments>
-  </file>
   <file src="core/Command/Db/ConvertType.php">
     <InvalidScalarArgument>
       <code>0</code>
@@ -2034,7 +1955,7 @@
   </file>
   <file src="lib/private/Accounts/AccountManager.php">
     <InvalidArgument>
-      <code><![CDATA['OC\AccountManager::userUpdated']]></code>
+      <code>'OC\AccountManager::userUpdated'</code>
     </InvalidArgument>
     <TooManyArguments>
       <code>dispatch</code>
@@ -2218,7 +2139,7 @@
   </file>
   <file src="lib/private/AppFramework/Routing/RouteConfig.php">
     <InvalidArrayOffset>
-      <code><![CDATA[$action['url-postfix']]]></code>
+      <code>$action['url-postfix']</code>
     </InvalidArrayOffset>
   </file>
   <file src="lib/private/AppFramework/Services/AppConfig.php">
@@ -2452,15 +2373,9 @@
     </UndefinedVariable>
   </file>
   <file src="lib/private/Console/Application.php">
-    <InvalidArgument>
-      <code>ConsoleEvent::EVENT_RUN</code>
-    </InvalidArgument>
     <NoInterfaceProperties>
       <code><![CDATA[$this->request->server]]></code>
     </NoInterfaceProperties>
-    <TooManyArguments>
-      <code>dispatch</code>
-    </TooManyArguments>
   </file>
   <file src="lib/private/ContactsManager.php">
     <InvalidArgument>
@@ -2496,7 +2411,7 @@
       <code>getParams</code>
     </InternalMethod>
     <InvalidArrayOffset>
-      <code><![CDATA[$params['collation']]]></code>
+      <code>$params['collation']</code>
     </InvalidArrayOffset>
   </file>
   <file src="lib/private/DB/Connection.php">
@@ -2507,8 +2422,8 @@
       <code>$params</code>
     </InvalidArgument>
     <InvalidArrayOffset>
-      <code><![CDATA[$params['adapter']]]></code>
-      <code><![CDATA[$params['tablePrefix']]]></code>
+      <code>$params['adapter']</code>
+      <code>$params['tablePrefix']</code>
     </InvalidArrayOffset>
     <InvalidReturnStatement>
       <code><![CDATA[$this->adapter->lastInsertId($seqName)]]></code>
@@ -2560,7 +2475,7 @@
       <code>getParams</code>
     </InternalMethod>
     <InvalidArrayOffset>
-      <code><![CDATA[$params['collation']]]></code>
+      <code>$params['collation']</code>
     </InvalidArrayOffset>
   </file>
   <file src="lib/private/DB/QueryBuilder/QueryBuilder.php">
@@ -2784,10 +2699,10 @@
       <code>$user</code>
     </InvalidOperand>
     <RedundantCondition>
-      <code><![CDATA[get_class($provider) !== 'OCA\Files_Sharing\MountProvider']]></code>
+      <code>get_class($provider) !== 'OCA\Files_Sharing\MountProvider'</code>
     </RedundantCondition>
     <TypeDoesNotContainType>
-      <code><![CDATA[get_class($provider) === 'OCA\Files_Sharing\MountProvider']]></code>
+      <code>get_class($provider) === 'OCA\Files_Sharing\MountProvider'</code>
     </TypeDoesNotContainType>
   </file>
   <file src="lib/private/Files/Config/UserMountCache.php">
@@ -2865,19 +2780,19 @@
   </file>
   <file src="lib/private/Files/Node/HookConnector.php">
     <InvalidArgument>
-      <code><![CDATA['\OCP\Files::postCopy']]></code>
-      <code><![CDATA['\OCP\Files::postCreate']]></code>
-      <code><![CDATA['\OCP\Files::postDelete']]></code>
-      <code><![CDATA['\OCP\Files::postRename']]></code>
-      <code><![CDATA['\OCP\Files::postTouch']]></code>
-      <code><![CDATA['\OCP\Files::postWrite']]></code>
-      <code><![CDATA['\OCP\Files::preCopy']]></code>
-      <code><![CDATA['\OCP\Files::preCreate']]></code>
-      <code><![CDATA['\OCP\Files::preDelete']]></code>
-      <code><![CDATA['\OCP\Files::preRename']]></code>
-      <code><![CDATA['\OCP\Files::preTouch']]></code>
-      <code><![CDATA['\OCP\Files::preWrite']]></code>
-      <code><![CDATA['\OCP\Files::read']]></code>
+      <code>'\OCP\Files::postCopy'</code>
+      <code>'\OCP\Files::postCreate'</code>
+      <code>'\OCP\Files::postDelete'</code>
+      <code>'\OCP\Files::postRename'</code>
+      <code>'\OCP\Files::postTouch'</code>
+      <code>'\OCP\Files::postWrite'</code>
+      <code>'\OCP\Files::preCopy'</code>
+      <code>'\OCP\Files::preCreate'</code>
+      <code>'\OCP\Files::preDelete'</code>
+      <code>'\OCP\Files::preRename'</code>
+      <code>'\OCP\Files::preTouch'</code>
+      <code>'\OCP\Files::preWrite'</code>
+      <code>'\OCP\Files::read'</code>
     </InvalidArgument>
     <TooManyArguments>
       <code>dispatch</code>
@@ -2925,7 +2840,7 @@
   </file>
   <file src="lib/private/Files/Node/Node.php">
     <InvalidArgument>
-      <code><![CDATA['\OCP\Files::' . $hook]]></code>
+      <code>'\OCP\Files::' . $hook</code>
     </InvalidArgument>
     <InvalidNullableReturnType>
       <code>FileInfo</code>
@@ -2998,7 +2913,7 @@
       <code>Promise\promise_for(
 					new Credentials($key, $secret)
 				)</code>
-      <code><![CDATA[\Aws\or_chain([self::class, 'legacySignatureProvider'], ClientResolver::_default_signature_provider())]]></code>
+      <code>\Aws\or_chain([self::class, 'legacySignatureProvider'], ClientResolver::_default_signature_provider())</code>
     </UndefinedFunction>
   </file>
   <file src="lib/private/Files/ObjectStore/S3ObjectTrait.php">
@@ -3215,12 +3130,12 @@
   </file>
   <file src="lib/private/Group/Group.php">
     <InvalidArgument>
-      <code><![CDATA[IGroup::class . '::postAddUser']]></code>
-      <code><![CDATA[IGroup::class . '::postDelete']]></code>
-      <code><![CDATA[IGroup::class . '::postRemoveUser']]></code>
-      <code><![CDATA[IGroup::class . '::preAddUser']]></code>
-      <code><![CDATA[IGroup::class . '::preDelete']]></code>
-      <code><![CDATA[IGroup::class . '::preRemoveUser']]></code>
+      <code>IGroup::class . '::postAddUser'</code>
+      <code>IGroup::class . '::postDelete'</code>
+      <code>IGroup::class . '::postRemoveUser'</code>
+      <code>IGroup::class . '::preAddUser'</code>
+      <code>IGroup::class . '::preDelete'</code>
+      <code>IGroup::class . '::preRemoveUser'</code>
       <code>bool</code>
     </InvalidArgument>
     <InvalidOperand>
@@ -3290,8 +3205,8 @@
       <code>false</code>
     </InvalidArgument>
     <InvalidArrayOffset>
-      <code><![CDATA[$app['path']]]></code>
-      <code><![CDATA[$app['path']]]></code>
+      <code>$app['path']</code>
+      <code>$app['path']</code>
     </InvalidArrayOffset>
     <NullArgument>
       <code>null</code>
@@ -3664,8 +3579,8 @@
   </file>
   <file src="lib/private/Setup.php">
     <RedundantCondition>
-      <code><![CDATA[$content !== '']]></code>
-      <code><![CDATA[$type === 'pdo']]></code>
+      <code>$content !== ''</code>
+      <code>$type === 'pdo'</code>
     </RedundantCondition>
     <UndefinedVariable>
       <code>$vendor</code>
@@ -3695,7 +3610,7 @@
     <InvalidArgument>
       <code><![CDATA[$share->getId()]]></code>
       <code><![CDATA[$share->getId()]]></code>
-      <code><![CDATA[(int)$data['id']]]></code>
+      <code>(int)$data['id']</code>
     </InvalidArgument>
     <TooManyArguments>
       <code>set</code>
@@ -3707,12 +3622,12 @@
   <file src="lib/private/Share20/Manager.php">
     <InvalidArgument>
       <code>$id</code>
-      <code><![CDATA['OCP\Share::postAcceptShare']]></code>
-      <code><![CDATA['OCP\Share::postShare']]></code>
-      <code><![CDATA['OCP\Share::postUnshare']]></code>
-      <code><![CDATA['OCP\Share::postUnshareFromSelf']]></code>
-      <code><![CDATA['OCP\Share::preShare']]></code>
-      <code><![CDATA['OCP\Share::preUnshare']]></code>
+      <code>'OCP\Share::postAcceptShare'</code>
+      <code>'OCP\Share::postShare'</code>
+      <code>'OCP\Share::postUnshare'</code>
+      <code>'OCP\Share::postUnshareFromSelf'</code>
+      <code>'OCP\Share::preShare'</code>
+      <code>'OCP\Share::preUnshare'</code>
     </InvalidArgument>
     <TooManyArguments>
       <code>dispatch</code>
@@ -3909,7 +3824,7 @@
       <code>boolean|null</code>
     </ImplementedReturnTypeMismatch>
     <InvalidArgument>
-      <code><![CDATA[IUser::class . '::firstLogin']]></code>
+      <code>IUser::class . '::firstLogin'</code>
     </InvalidArgument>
     <NoInterfaceProperties>
       <code><![CDATA[$request->server]]></code>
@@ -3921,11 +3836,11 @@
   </file>
   <file src="lib/private/User/User.php">
     <InvalidArgument>
-      <code><![CDATA[IUser::class . '::changeUser']]></code>
-      <code><![CDATA[IUser::class . '::postDelete']]></code>
-      <code><![CDATA[IUser::class . '::postSetPassword']]></code>
-      <code><![CDATA[IUser::class . '::preDelete']]></code>
-      <code><![CDATA[IUser::class . '::preSetPassword']]></code>
+      <code>IUser::class . '::changeUser'</code>
+      <code>IUser::class . '::postDelete'</code>
+      <code>IUser::class . '::postSetPassword'</code>
+      <code>IUser::class . '::preDelete'</code>
+      <code>IUser::class . '::preSetPassword'</code>
     </InvalidArgument>
     <TooManyArguments>
       <code>dispatch</code>
@@ -3956,8 +3871,8 @@
       <code>ManagerEvent::EVENT_APP_UPDATE</code>
     </InvalidArgument>
     <InvalidArrayOffset>
-      <code><![CDATA[$dir['path']]]></code>
-      <code><![CDATA[$dir['url']]]></code>
+      <code>$dir['path']</code>
+      <code>$dir['url']</code>
     </InvalidArrayOffset>
     <NullArgument>
       <code>null</code>