diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 273c7ef470946..b48b91a166350 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="5.9.0@8b9ad1eb9e8b7d3101f949291da2b9f7767cd163">
   <file src="3rdparty/sabre/dav/lib/CalDAV/Calendar.php">
-    <MoreSpecificImplementedParamType>
-      <code>$calendarData</code>
-    </MoreSpecificImplementedParamType>
+    <MoreSpecificImplementedParamType/>
   </file>
   <file src="3rdparty/sabre/dav/lib/CalDAV/CalendarHome.php">
     <MoreSpecificImplementedParamType>
@@ -16,9 +14,7 @@
     </MoreSpecificImplementedParamType>
   </file>
   <file src="3rdparty/sabre/dav/lib/CardDAV/AddressBook.php">
-    <MoreSpecificImplementedParamType>
-      <code>$vcardData</code>
-    </MoreSpecificImplementedParamType>
+    <MoreSpecificImplementedParamType/>
   </file>
   <file src="3rdparty/sabre/dav/lib/CardDAV/AddressBookHome.php">
     <InvalidPropertyAssignmentValue>
@@ -105,11 +101,6 @@
       <code>$baseuri</code>
     </UndefinedGlobalVariable>
   </file>
-  <file src="apps/dav/lib/AppInfo/Application.php">
-    <InvalidArgument>
-      <code>CalendarDeletionDefaultUpdaterListener::class</code>
-    </InvalidArgument>
-  </file>
   <file src="apps/dav/lib/CalDAV/BirthdayService.php">
     <UndefinedMethod>
       <code>setDateTime</code>
@@ -122,11 +113,6 @@
       <code><![CDATA[$newCalendarData->VEVENT->SUMMARY]]></code>
     </UndefinedPropertyFetch>
   </file>
-  <file src="apps/dav/lib/CalDAV/CachedSubscription.php">
-    <ParamNameMismatch>
-      <code>$calendarData</code>
-    </ParamNameMismatch>
-  </file>
   <file src="apps/dav/lib/CalDAV/CachedSubscriptionObject.php">
     <NullableReturnStatement>
       <code><![CDATA[$this->objectData['calendardata']]]></code>
@@ -439,9 +425,6 @@
     </InvalidNullableReturnType>
   </file>
   <file src="apps/dav/lib/CardDAV/PhotoCache.php">
-    <InvalidNullableReturnType>
-      <code>string</code>
-    </InvalidNullableReturnType>
     <LessSpecificReturnStatement>
       <code><![CDATA[[
 				'Content-Type' => $type,
@@ -451,23 +434,12 @@
     <MoreSpecificReturnType>
       <code>false|array{body: string, Content-Type: string}</code>
     </MoreSpecificReturnType>
-    <NullableReturnStatement>
-      <code>$type</code>
-    </NullableReturnStatement>
   </file>
   <file src="apps/dav/lib/CardDAV/Plugin.php">
     <ImplementedReturnTypeMismatch>
       <code>string|null</code>
     </ImplementedReturnTypeMismatch>
   </file>
-  <file src="apps/dav/lib/CardDAV/SystemAddressbook.php">
-    <InvalidNullableReturnType>
-      <code>getChanges</code>
-    </InvalidNullableReturnType>
-    <NullableReturnStatement>
-      <code>null</code>
-    </NullableReturnStatement>
-  </file>
   <file src="apps/dav/lib/CardDAV/UserAddressBooks.php">
     <InvalidArgument>
       <code><![CDATA[$this->principalUri]]></code>
@@ -541,7 +513,6 @@
   <file src="apps/dav/lib/Connector/Sabre/FilesReportPlugin.php">
     <InvalidArgument>
       <code>0</code>
-      <code>200</code>
     </InvalidArgument>
     <InvalidNullableReturnType>
       <code>bool</code>
@@ -1378,9 +1349,6 @@
     </InvalidReturnType>
   </file>
   <file src="apps/settings/lib/AppInfo/Application.php">
-    <InvalidArgument>
-      <code>AppPasswordCreatedActivityListener::class</code>
-    </InvalidArgument>
     <UndefinedInterfaceMethod>
       <code>getSettingsManager</code>
     </UndefinedInterfaceMethod>
@@ -1663,9 +1631,6 @@
     <InvalidReturnType>
       <code>string</code>
     </InvalidReturnType>
-    <ParamNameMismatch>
-      <code>$uid</code>
-    </ParamNameMismatch>
   </file>
   <file src="apps/workflowengine/lib/Listener/LoadAdditionalSettingsScriptsListener.php">
     <MissingTemplateParam>
@@ -1934,7 +1899,6 @@
     </InvalidReturnStatement>
     <InvalidReturnType>
       <code>\OCP\IServerContainer</code>
-      <code>mixed</code>
     </InvalidReturnType>
     <UndefinedInterfaceMethod>
       <code>getAppDataDir</code>
@@ -2016,39 +1980,6 @@
   <file src="lib/private/AppFramework/Utility/SimpleContainer.php">
     <LessSpecificReturnStatement>
       <code><![CDATA[$class->newInstance()]]></code>
-      <code><![CDATA[$class->newInstanceArgs(array_map(function (ReflectionParameter $parameter) {
-			$parameterType = $parameter->getType();
-
-			$resolveName = $parameter->getName();
-
-			// try to find out if it is a class or a simple parameter
-			if ($parameterType !== null && ($parameterType instanceof ReflectionNamedType) && !$parameterType->isBuiltin()) {
-				$resolveName = $parameterType->getName();
-			}
-
-			try {
-				$builtIn = $parameter->hasType() && ($parameter->getType() instanceof ReflectionNamedType)
-					&& $parameter->getType()->isBuiltin();
-				return $this->query($resolveName, !$builtIn);
-			} catch (QueryException $e) {
-				// Service not found, use the default value when available
-				if ($parameter->isDefaultValueAvailable()) {
-					return $parameter->getDefaultValue();
-				}
-
-				if ($parameterType !== null && ($parameterType instanceof ReflectionNamedType) && !$parameterType->isBuiltin()) {
-					$resolveName = $parameter->getName();
-					try {
-						return $this->query($resolveName);
-					} catch (QueryException $e2) {
-						// don't lose the error we got while trying to query by type
-						throw new QueryException($e->getMessage(), (int) $e->getCode(), $e);
-					}
-				}
-
-				throw $e;
-			}
-		}, $constructor->getParameters()))]]></code>
     </LessSpecificReturnStatement>
     <MissingTemplateParam>
       <code>ArrayAccess</code>
@@ -2201,17 +2132,7 @@
     </ParamNameMismatch>
   </file>
   <file src="lib/private/Command/ClosureJob.php">
-    <InvalidArgument>
-      <code>[LaravelClosure::class, OpisClosure::class]</code>
-    </InvalidArgument>
-    <ParamNameMismatch>
-      <code>$serializedCallable</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="lib/private/Command/CommandJob.php">
-    <ParamNameMismatch>
-      <code>$serializedCommand</code>
-    </ParamNameMismatch>
+    <InvalidArgument/>
   </file>
   <file src="lib/private/Comments/Manager.php">
     <RedundantCast>
@@ -2867,9 +2788,6 @@
     <LessSpecificReturnStatement>
       <code>$users</code>
     </LessSpecificReturnStatement>
-    <MoreSpecificImplementedParamType>
-      <code>$user</code>
-    </MoreSpecificImplementedParamType>
     <MoreSpecificReturnType>
       <code>\OC\User\User[]</code>
     </MoreSpecificReturnType>
@@ -3154,11 +3072,6 @@
       <code>$out</code>
     </ParamNameMismatch>
   </file>
-  <file src="lib/private/Repair/SqliteAutoincrement.php">
-    <ParamNameMismatch>
-      <code>$out</code>
-    </ParamNameMismatch>
-  </file>
   <file src="lib/private/Route/Router.php">
     <InvalidClass>
       <code>\OC_APP</code>