diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 72b94dc35d7bc..378e2bf083416 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -16,9 +16,6 @@
     </MoreSpecificImplementedParamType>
   </file>
   <file src="3rdparty/sabre/dav/lib/CardDAV/AddressBook.php">
-    <LessSpecificImplementedReturnType>
-      <code>array</code>
-    </LessSpecificImplementedReturnType>
     <MoreSpecificImplementedParamType>
       <code>$vcardData</code>
     </MoreSpecificImplementedParamType>
@@ -32,7 +29,7 @@
     </MoreSpecificImplementedParamType>
   </file>
   <file src="3rdparty/sabre/dav/lib/CardDAV/Card.php">
-    <MoreSpecificImplementedParamType occurrences="1">
+    <MoreSpecificImplementedParamType>
       <code>$cardData</code>
     </MoreSpecificImplementedParamType>
   </file>
@@ -858,11 +855,6 @@
       <code>getSize</code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="apps/encryption/lib/Command/ScanLegacyFormat.php">
-    <InvalidOperand>
-      <code><![CDATA[$this->scanFolder($output, '/' . $user)]]></code>
-    </InvalidOperand>
-  </file>
   <file src="apps/encryption/lib/Crypto/Crypt.php">
     <RedundantCondition>
       <code>$userSession</code>
@@ -984,11 +976,6 @@
       <code><![CDATA[$this->fileIsEncrypted]]></code>
     </TypeDoesNotContainType>
   </file>
-  <file src="apps/files/lib/Command/Scan.php">
-    <NullArgument>
-      <code>null</code>
-    </NullArgument>
-  </file>
   <file src="apps/files/lib/Command/ScanAppData.php">
     <NullArgument>
       <code>null</code>
@@ -2699,9 +2686,6 @@
     </InvalidReturnStatement>
   </file>
   <file src="lib/private/Files/Node/Node.php">
-    <ImplementedReturnTypeMismatch>
-      <code>Node</code>
-    </ImplementedReturnTypeMismatch>
     <InvalidArgument>
       <code>'\OCP\Files::' . $hook</code>
     </InvalidArgument>
@@ -2726,9 +2710,6 @@
     </UndefinedInterfaceMethod>
   </file>
   <file src="lib/private/Files/Node/Root.php">
-    <ImplementedReturnTypeMismatch>
-      <code>Node</code>
-    </ImplementedReturnTypeMismatch>
     <InvalidNullableReturnType>
       <code>\OC\User\User</code>
     </InvalidNullableReturnType>
@@ -2744,11 +2725,6 @@
       <code>false|string</code>
     </ImplementedReturnTypeMismatch>
   </file>
-  <file src="lib/private/Files/ObjectStore/NoopScanner.php">
-    <MoreSpecificImplementedParamType>
-      <code>$cacheData</code>
-    </MoreSpecificImplementedParamType>
-  </file>
   <file src="lib/private/Files/ObjectStore/ObjectStoreStorage.php">
     <InvalidScalarArgument>
       <code>$source</code>
@@ -3186,20 +3162,6 @@
       <code>\ArrayAccess</code>
     </MissingTemplateParam>
   </file>
-  <file src="lib/private/Memcache/Redis.php">
-    <InvalidMethodCall>
-      <code>exec</code>
-      <code>exec</code>
-    </InvalidMethodCall>
-  </file>
-  <file src="lib/private/Metadata/Provider/ExifProvider.php">
-    <InvalidReturnStatement>
-      <code>$exifData</code>
-    </InvalidReturnStatement>
-    <InvalidReturnType>
-      <code>array{'gps': FileMetadata, 'size': FileMetadata}</code>
-    </InvalidReturnType>
-  </file>
   <file src="lib/private/NavigationManager.php">
     <ParamNameMismatch>
       <code>$id</code>