diff --git a/build/psalm-baseline-ocp.xml b/build/psalm-baseline-ocp.xml
index 5490f5058862a..e6b751dd0aec9 100644
--- a/build/psalm-baseline-ocp.xml
+++ b/build/psalm-baseline-ocp.xml
@@ -10,12 +10,6 @@
       <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 +60,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 +146,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 +164,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>
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 85a71d7456702..407ff8a60142d 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -509,9 +509,6 @@
     </UndefinedInterfaceMethod>
   </file>
   <file src="apps/dav/lib/Connector/Sabre/Node.php">
-    <InvalidArgument occurrences="1">
-      <code>$this</code>
-    </InvalidArgument>
     <InvalidNullableReturnType occurrences="2">
       <code>int</code>
       <code>integer</code>
@@ -1548,11 +1545,6 @@
       <code>\Sabre\Uri\split($this-&gt;principalInfo['uri'])</code>
     </UndefinedFunction>
   </file>
-  <file src="apps/files_versions/lib/Storage.php">
-    <InvalidScalarArgument occurrences="1">
-      <code>$timestamp</code>
-    </InvalidScalarArgument>
-  </file>
   <file src="apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php">
     <InvalidScalarArgument occurrences="1">
       <code>$this-&gt;retries + 1</code>
@@ -2020,11 +2012,6 @@
       <code>$this-&gt;timeFactory-&gt;getTime()</code>
     </InvalidScalarArgument>
   </file>
-  <file src="core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php">
-    <InvalidArrayAccess occurrences="1">
-      <code>$k[0]</code>
-    </InvalidArrayAccess>
-  </file>
   <file src="core/Command/Maintenance/Mimetype/UpdateDB.php">
     <UndefinedInterfaceMethod occurrences="2">
       <code>getAllMappings</code>
@@ -3732,10 +3719,9 @@
       <code>FederatedShareProvider</code>
       <code>ShareByMailProvider</code>
     </InvalidNullableReturnType>
-    <InvalidReturnStatement occurrences="4">
+    <InvalidReturnStatement occurrences="3">
       <code>$provider</code>
       <code>$provider</code>
-      <code>$this-&gt;roomShareProvider</code>
       <code>$this-&gt;shareByCircleProvider</code>
     </InvalidReturnStatement>
     <InvalidReturnType occurrences="1">