diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index b1a38b6730a..7ce93ebff71 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -823,23 +823,12 @@
     </InvalidOperand>
   </file>
   <file src="apps/encryption/lib/Crypto/Crypt.php">
-    <InvalidArgument occurrences="2">
-      <code>$res</code>
-      <code>$res</code>
-    </InvalidArgument>
-    <InvalidReturnStatement occurrences="1">
-      <code>openssl_pkey_new($config)</code>
-    </InvalidReturnStatement>
-    <InvalidReturnType occurrences="1">
-      <code>resource</code>
-    </InvalidReturnType>
     <RedundantCondition occurrences="2">
       <code>$userSession</code>
       <code>$userSession</code>
     </RedundantCondition>
     <TypeDoesNotContainType occurrences="2">
       <code>get_class($res) === 'OpenSSLAsymmetricKey'</code>
-      <code>is_resource($res)</code>
     </TypeDoesNotContainType>
   </file>
   <file src="apps/encryption/lib/Crypto/EncryptAll.php">
@@ -1077,12 +1066,6 @@
       <code>addServiceListener</code>
     </InvalidArgument>
   </file>
-  <file src="apps/files_external/lib/Lib/Storage/FtpConnection.php">
-    <UndefinedConstant occurrences="2">
-      <code>FTP_BINARY</code>
-      <code>FTP_BINARY</code>
-    </UndefinedConstant>
-  </file>
   <file src="apps/files_external/lib/Lib/Storage/SFTP.php">
     <InternalMethod occurrences="1">
       <code>put</code>
@@ -1767,9 +1750,6 @@
     <InvalidScalarArgument occurrences="1">
       <code>$levelNum</code>
     </InvalidScalarArgument>
-    <TypeDoesNotContainType occurrences="1">
-      <code>$identifier === false</code>
-    </TypeDoesNotContainType>
   </file>
   <file src="core/Command/Maintenance/DataFingerprint.php">
     <InvalidScalarArgument occurrences="1">
@@ -3762,12 +3742,6 @@
       <code>\Test\Util\User\Dummy</code>
     </UndefinedClass>
   </file>
-  <file src="lib/private/legacy/OC_Util.php">
-    <InvalidOperand occurrences="2">
-      <code>$version</code>
-      <code>$version</code>
-    </InvalidOperand>
-  </file>
   <file src="lib/public/AppFramework/ApiController.php">
     <NoInterfaceProperties occurrences="1">
       <code>$this-&gt;request-&gt;server</code>