diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 3d56f710237c1..1551261d18f89 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -878,9 +878,6 @@
     </MoreSpecificReturnType>
   </file>
   <file src="apps/encryption/lib/Crypto/Crypt.php">
-    <RedundantCondition>
-      <code>$userSession</code>
-    </RedundantCondition>
     <TypeDoesNotContainType>
       <code>get_class($res) === 'OpenSSLAsymmetricKey'</code>
     </TypeDoesNotContainType>
@@ -891,11 +888,6 @@
     </ImplementedParamTypeMismatch>
   </file>
   <file src="apps/encryption/lib/KeyManager.php">
-    <InvalidScalarArgument>
-      <code>time()</code>
-      <code>time()</code>
-      <code>time()</code>
-    </InvalidScalarArgument>
     <InvalidThrow>
       <code>throw $exception;</code>
     </InvalidThrow>
@@ -912,9 +904,6 @@
     <MoreSpecificReturnType>
       <code>\OC\Files\Storage\Storage|null</code>
     </MoreSpecificReturnType>
-    <RedundantCondition>
-      <code>$userSession</code>
-    </RedundantCondition>
   </file>
   <file src="apps/federatedfilesharing/lib/Controller/RequestHandlerController.php">
     <InvalidArgument>
@@ -1040,16 +1029,6 @@
       <code>open</code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="apps/files/lib/Controller/ViewController.php">
-    <InvalidArgument>
-      <code>$fileId</code>
-    </InvalidArgument>
-    <UndefinedInterfaceMethod>
-      <code>getById</code>
-      <code>getRelativePath</code>
-      <code>getRelativePath</code>
-    </UndefinedInterfaceMethod>
-  </file>
   <file src="apps/files/lib/Helper.php">
     <UndefinedInterfaceMethod>
       <code>$file</code>
@@ -1067,14 +1046,6 @@
       <code>$i</code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="apps/files/lib/Listener/LegacyLoadAdditionalScriptsAdapter.php">
-    <InvalidArgument>
-      <code>$legacyEvent</code>
-    </InvalidArgument>
-    <MissingTemplateParam>
-      <code>IEventListener</code>
-    </MissingTemplateParam>
-  </file>
   <file src="apps/files/lib/Listener/LoadSidebarListener.php">
     <MissingTemplateParam>
       <code>IEventListener</code>
@@ -1093,14 +1064,6 @@
       <code>isReadyForUser</code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="apps/files/lib/Service/TagService.php">
-    <InvalidArgument>
-      <code>self::class . '::' . $eventName</code>
-    </InvalidArgument>
-    <TooManyArguments>
-      <code>dispatch</code>
-    </TooManyArguments>
-  </file>
   <file src="apps/files_external/appinfo/routes.php">
     <InvalidScope>
       <code>$this</code>
@@ -1176,14 +1139,6 @@
       <code>test</code>
     </TooManyArguments>
   </file>
-  <file src="apps/files_external/lib/Service/BackendService.php">
-    <InvalidArgument>
-      <code>'OCA\\Files_External::loadAdditionalBackends'</code>
-    </InvalidArgument>
-    <TooManyArguments>
-      <code>dispatch</code>
-    </TooManyArguments>
-  </file>
   <file src="apps/files_sharing/lib/Controller/ShareAPIController.php">
     <RedundantCast>
       <code>(int)$code</code>
@@ -1218,14 +1173,6 @@
       <code>$cacheData</code>
     </MoreSpecificImplementedParamType>
   </file>
-  <file src="apps/files_sharing/lib/Listener/LegacyBeforeTemplateRenderedListener.php">
-    <InvalidArgument>
-      <code>$legacyEvent</code>
-    </InvalidArgument>
-    <MissingTemplateParam>
-      <code>IEventListener</code>
-    </MissingTemplateParam>
-  </file>
   <file src="apps/files_sharing/lib/Listener/LoadAdditionalListener.php">
     <MissingTemplateParam>
       <code>IEventListener</code>
@@ -1347,11 +1294,6 @@
       <code>ITrash</code>
     </InvalidReturnType>
   </file>
-  <file src="apps/files_trashbin/lib/Storage.php">
-    <InvalidOperand>
-      <code><![CDATA[$this->mountPoint]]></code>
-    </InvalidOperand>
-  </file>
   <file src="apps/files_trashbin/lib/Trash/LegacyTrashBackend.php">
     <RedundantCondition>
       <code>$trashFiles</code>
@@ -1848,11 +1790,6 @@
       <code>updateFilecache</code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="core/Command/Maintenance/Mimetype/UpdateJS.php">
-    <UndefinedInterfaceMethod>
-      <code>getAllAliases</code>
-    </UndefinedInterfaceMethod>
-  </file>
   <file src="core/Command/Maintenance/RepairShareOwnership.php">
     <LessSpecificReturnStatement>
       <code>$found</code>
@@ -1926,14 +1863,6 @@
       <code>$restrictions</code>
     </InvalidArgument>
   </file>
-  <file src="lib/private/Accounts/AccountManager.php">
-    <InvalidArgument>
-      <code>'OC\AccountManager::userUpdated'</code>
-    </InvalidArgument>
-    <TooManyArguments>
-      <code>dispatch</code>
-    </TooManyArguments>
-  </file>
   <file src="lib/private/Activity/Event.php">
     <ParamNameMismatch>
       <code>$affectedUser</code>
@@ -2524,35 +2453,6 @@
       <code>bool</code>
     </ImplementedReturnTypeMismatch>
   </file>
-  <file src="lib/private/EventDispatcher/EventDispatcher.php">
-    <TooManyArguments>
-      <code>dispatch</code>
-    </TooManyArguments>
-  </file>
-  <file src="lib/private/EventDispatcher/GenericEventWrapper.php">
-    <LessSpecificReturnStatement>
-      <code><![CDATA[$this->event->setArgument($key, $value)]]></code>
-      <code><![CDATA[$this->event->setArguments($args)]]></code>
-    </LessSpecificReturnStatement>
-    <MoreSpecificReturnType>
-      <code>setArgument</code>
-      <code>setArguments</code>
-    </MoreSpecificReturnType>
-  </file>
-  <file src="lib/private/EventDispatcher/SymfonyAdapter.php">
-    <ImplementedParamTypeMismatch>
-      <code>$eventName</code>
-    </ImplementedParamTypeMismatch>
-    <NoValue>
-      <code>$listener</code>
-    </NoValue>
-    <ParamNameMismatch>
-      <code>$eventName</code>
-    </ParamNameMismatch>
-    <TooManyArguments>
-      <code>dispatch</code>
-    </TooManyArguments>
-  </file>
   <file src="lib/private/Federation/CloudFederationProviderManager.php">
     <ParamNameMismatch>
       <code>$providerId</code>
@@ -2752,9 +2652,6 @@
     </MoreSpecificReturnType>
   </file>
   <file src="lib/private/Files/Node/Node.php">
-    <InvalidArgument>
-      <code>'\OCP\Files::' . $hook</code>
-    </InvalidArgument>
     <InvalidNullableReturnType>
       <code>FileInfo</code>
     </InvalidNullableReturnType>
@@ -2773,9 +2670,6 @@
     <ParamNameMismatch>
       <code>$type</code>
     </ParamNameMismatch>
-    <TooManyArguments>
-      <code>dispatch</code>
-    </TooManyArguments>
     <UndefinedInterfaceMethod>
       <code><![CDATA[$this->fileInfo]]></code>
       <code><![CDATA[$this->fileInfo]]></code>
@@ -3109,7 +3003,6 @@
       <code><![CDATA[$x509->getDN(true)['CN']]]></code>
     </InvalidArrayAccess>
     <UndefinedInterfaceMethod>
-      <code>getAllAliases</code>
       <code>getOnlyDefaultAliases</code>
     </UndefinedInterfaceMethod>
   </file>
@@ -3505,20 +3398,8 @@
   <file src="lib/private/Share20/Manager.php">
     <InvalidArgument>
       <code>$id</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>
-      <code>dispatch</code>
-      <code>dispatch</code>
-      <code>dispatch</code>
-      <code>dispatch</code>
-      <code>dispatch</code>
       <code>update</code>
     </TooManyArguments>
     <UndefinedClass>
@@ -3684,16 +3565,10 @@
     <ImplementedReturnTypeMismatch>
       <code>boolean|null</code>
     </ImplementedReturnTypeMismatch>
-    <InvalidArgument>
-      <code>IUser::class . '::firstLogin'</code>
-    </InvalidArgument>
     <NoInterfaceProperties>
       <code><![CDATA[$request->server]]></code>
       <code><![CDATA[$request->server]]></code>
     </NoInterfaceProperties>
-    <TooManyArguments>
-      <code>dispatch</code>
-    </TooManyArguments>
   </file>
   <file src="lib/private/User/User.php">
     <UndefinedInterfaceMethod>
@@ -3715,7 +3590,6 @@
   <file src="lib/private/legacy/OC_App.php">
     <InvalidArgument>
       <code>$groupsList</code>
-      <code>ManagerEvent::EVENT_APP_UPDATE</code>
     </InvalidArgument>
     <InvalidArrayOffset>
       <code>$dir['path']</code>
@@ -3727,9 +3601,6 @@
     <NullableReturnStatement>
       <code>null</code>
     </NullableReturnStatement>
-    <TooManyArguments>
-      <code>dispatch</code>
-    </TooManyArguments>
     <TypeDoesNotContainNull>
       <code>$appId === null</code>
       <code>$appId === null</code>