diff --git a/build/psalm-baseline-ocp.xml b/build/psalm-baseline-ocp.xml
index 5490f505886..208be393e1f 100644
--- a/build/psalm-baseline-ocp.xml
+++ b/build/psalm-baseline-ocp.xml
@@ -1,21 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="4.18.1@dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb">
-  <file src="lib/private/legacy/OC_Image.php">
-    <ImplementedReturnTypeMismatch occurrences="1">
-      <code>null|string</code>
-    </ImplementedReturnTypeMismatch>
-  </file>
   <file src="lib/private/legacy/OC_Template.php">
     <UndefinedClass occurrences="1">
       <code>OC</code>
     </UndefinedClass>
   </file>
-  <file src="lib/public/App.php">
-    <UndefinedClass occurrences="2">
-      <code>\OC</code>
-      <code>\OC</code>
-    </UndefinedClass>
-  </file>
   <file src="lib/public/AppFramework/ApiController.php">
     <NoInterfaceProperties occurrences="1">
       <code>$this-&gt;request-&gt;server</code>
@@ -66,23 +55,6 @@
       <code>\OC</code>
     </UndefinedClass>
   </file>
-  <file src="lib/public/AppFramework/Http/ZipResponse.php">
-    <InvalidArrayAccess occurrences="5">
-      <code>$resource['internalName']</code>
-      <code>$resource['resource']</code>
-      <code>$resource['size']</code>
-      <code>$resource['size']</code>
-      <code>$resource['time']</code>
-    </InvalidArrayAccess>
-    <InvalidPropertyAssignmentValue occurrences="1">
-      <code>$this-&gt;resources</code>
-    </InvalidPropertyAssignmentValue>
-  </file>
-  <file src="lib/public/BackgroundJob/Job.php">
-    <UndefinedClass occurrences="1">
-      <code>\OC</code>
-    </UndefinedClass>
-  </file>
   <file src="lib/public/BackgroundJob/TimedJob.php">
     <MoreSpecificImplementedParamType occurrences="1">
       <code>$jobList</code>
@@ -169,44 +141,12 @@
       <code>\OC</code>
     </UndefinedClass>
   </file>
-  <file src="lib/public/FullTextSearch/Model/ISearchRequest.php">
-    <InvalidClass occurrences="1">
-      <code>IsearchRequest</code>
-    </InvalidClass>
-  </file>
-  <file src="lib/public/IAddressBook.php">
-    <InvalidDocblock occurrences="1">
-      <code>public function getUri(): string;</code>
-    </InvalidDocblock>
-  </file>
-  <file src="lib/public/IAvatar.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>Color</code>
-    </UndefinedDocblockClass>
-  </file>
   <file src="lib/public/IContainer.php">
     <InvalidThrow occurrences="2">
       <code>ContainerExceptionInterface</code>
       <code>ContainerExceptionInterface</code>
     </InvalidThrow>
   </file>
-  <file src="lib/public/IDBConnection.php">
-    <InvalidClass occurrences="1">
-      <code>PreconditionNotMetException</code>
-    </InvalidClass>
-  </file>
-  <file src="lib/public/Search/SearchResult.php">
-    <InvalidArgument occurrences="1">
-      <code>$cursor</code>
-    </InvalidArgument>
-  </file>
-  <file src="lib/public/Share.php">
-    <InvalidReturnType occurrences="3">
-      <code>array</code>
-      <code>array|bool</code>
-      <code>mixed</code>
-    </InvalidReturnType>
-  </file>
   <file src="lib/public/Template.php">
     <UndefinedFunction occurrences="7">
       <code>\html_select_options($options, $selected, $params)</code>
@@ -219,12 +159,6 @@
     </UndefinedFunction>
   </file>
   <file src="lib/public/Util.php">
-    <InvalidReturnStatement occurrences="1">
-      <code>\OC_Helper::computerFileSize($str)</code>
-    </InvalidReturnStatement>
-    <InvalidReturnType occurrences="1">
-      <code>float</code>
-    </InvalidReturnType>
     <UndefinedClass occurrences="14">
       <code>\OC</code>
       <code>\OC</code>