diff --git a/build/psalm-baseline-ocp.xml b/build/psalm-baseline-ocp.xml
index 40b69d00d31..d16f469a12d 100644
--- a/build/psalm-baseline-ocp.xml
+++ b/build/psalm-baseline-ocp.xml
@@ -58,31 +58,6 @@
       <code>IteratorAggregate</code>
     </MissingTemplateParam>
   </file>
-  <file src="lib/public/Federation/Exceptions/ActionNotSupportedException.php">
-    <UndefinedClass>
-      <code>\OC</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/public/Federation/Exceptions/AuthenticationFailedException.php">
-    <UndefinedClass>
-      <code>\OC</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/public/Federation/Exceptions/BadRequestException.php">
-    <UndefinedClass>
-      <code>\OC</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/public/Federation/Exceptions/ProviderAlreadyExistsException.php">
-    <UndefinedClass>
-      <code>\OC</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/public/Federation/Exceptions/ProviderDoesNotExistsException.php">
-    <UndefinedClass>
-      <code>\OC</code>
-    </UndefinedClass>
-  </file>
   <file src="lib/public/Files.php">
     <FalsableReturnStatement>
       <code>\OC_App::getStorage($app)</code>
@@ -96,36 +71,6 @@
       <code>ArrayAccess</code>
     </MissingTemplateParam>
   </file>
-  <file src="lib/public/Files/LockNotAcquiredException.php">
-    <UndefinedClass>
-      <code>\OC</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/public/Files/StorageAuthException.php">
-    <UndefinedClass>
-      <code>\OC</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/public/Files/StorageBadConfigException.php">
-    <UndefinedClass>
-      <code>\OC</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/public/Files/StorageConnectionException.php">
-    <UndefinedClass>
-      <code>\OC</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/public/Files/StorageNotAvailableException.php">
-    <UndefinedClass>
-      <code>\OC</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/public/Files/StorageTimeoutException.php">
-    <UndefinedClass>
-      <code>\OC</code>
-    </UndefinedClass>
-  </file>
   <file src="lib/public/L10N/ILanguageIterator.php">
     <MissingTemplateParam>
       <code>\Iterator</code>
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 81ca36f15a5..7145e48e7e4 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -312,7 +312,7 @@
     </RedundantCast>
     <RedundantCondition>
       <code><![CDATA[!empty($modified['old']) && is_array($modified['old'])]]></code>
-      <code><![CDATA[is_array($modified['old'])]]></code>
+      <code>is_array($modified['old'])</code>
     </RedundantCondition>
   </file>
   <file src="apps/dav/lib/CalDAV/Schedule/IMipService.php">
@@ -323,8 +323,8 @@
   </file>
   <file src="apps/dav/lib/CalDAV/Schedule/Plugin.php">
     <InvalidArgument>
-      <code><![CDATA[[$aclPlugin, 'propFind']]]></code>
-      <code><![CDATA[[$aclPlugin, 'propFind']]]></code>
+      <code>[$aclPlugin, 'propFind']</code>
+      <code>[$aclPlugin, 'propFind']</code>
     </InvalidArgument>
     <LessSpecificReturnStatement>
       <code><![CDATA[$vevent->DTEND]]></code>
@@ -359,12 +359,12 @@
   </file>
   <file src="apps/dav/lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php">
     <TypeDoesNotContainType>
-      <code><![CDATA[!is_array($newProps['filters']['comps'])]]></code>
-      <code><![CDATA[!is_array($newProps['filters']['params'])]]></code>
-      <code><![CDATA[!is_array($newProps['filters']['props'])]]></code>
-      <code><![CDATA[!isset($newProps['filters']['comps']) || !is_array($newProps['filters']['comps'])]]></code>
-      <code><![CDATA[!isset($newProps['filters']['params']) || !is_array($newProps['filters']['params'])]]></code>
-      <code><![CDATA[!isset($newProps['filters']['props']) || !is_array($newProps['filters']['props'])]]></code>
+      <code>!is_array($newProps['filters']['comps'])</code>
+      <code>!is_array($newProps['filters']['params'])</code>
+      <code>!is_array($newProps['filters']['props'])</code>
+      <code>!isset($newProps['filters']['comps']) || !is_array($newProps['filters']['comps'])</code>
+      <code>!isset($newProps['filters']['params']) || !is_array($newProps['filters']['params'])</code>
+      <code>!isset($newProps['filters']['props']) || !is_array($newProps['filters']['props'])</code>
     </TypeDoesNotContainType>
   </file>
   <file src="apps/dav/lib/CalDAV/WebcalCaching/RefreshWebcalService.php">
@@ -400,7 +400,7 @@
       <code>VCard</code>
     </MoreSpecificReturnType>
     <TypeDoesNotContainType>
-      <code><![CDATA[$addressBooks[$row['id']][$readOnlyPropertyName] === 0]]></code>
+      <code>$addressBooks[$row['id']][$readOnlyPropertyName] === 0</code>
     </TypeDoesNotContainType>
   </file>
   <file src="apps/dav/lib/CardDAV/MultiGetExportPlugin.php">
@@ -502,7 +502,7 @@
       <code>bool</code>
     </InvalidNullableReturnType>
     <TooManyArguments>
-      <code><![CDATA[new PreconditionFailed('Cannot filter by non-existing tag', 0, $e)]]></code>
+      <code>new PreconditionFailed('Cannot filter by non-existing tag', 0, $e)</code>
     </TooManyArguments>
     <UndefinedClass>
       <code>\OCA\Circles\Api\v1\Circles</code>
@@ -768,7 +768,7 @@
   </file>
   <file src="apps/encryption/lib/Crypto/Crypt.php">
     <TypeDoesNotContainType>
-      <code><![CDATA[get_class($res) === 'OpenSSLAsymmetricKey']]></code>
+      <code>get_class($res) === 'OpenSSLAsymmetricKey'</code>
     </TypeDoesNotContainType>
   </file>
   <file src="apps/encryption/lib/Crypto/Encryption.php">
@@ -783,7 +783,7 @@
   </file>
   <file src="apps/encryption/lib/Session.php">
     <TooManyArguments>
-      <code><![CDATA[new Exceptions\PrivateKeyMissingException('please try to log-out and log-in again', 0)]]></code>
+      <code>new Exceptions\PrivateKeyMissingException('please try to log-out and log-in again', 0)</code>
     </TooManyArguments>
   </file>
   <file src="apps/encryption/lib/Util.php">
@@ -811,7 +811,7 @@
       <code>$shareId</code>
       <code>$shareId</code>
       <code>$shareId</code>
-      <code><![CDATA[(int)$data['id']]]></code>
+      <code>(int)$data['id']</code>
     </InvalidArgument>
     <LessSpecificReturnStatement>
       <code>$nodes[0]</code>
@@ -841,7 +841,7 @@
       <code>string</code>
     </InvalidReturnType>
     <InvalidScalarArgument>
-      <code><![CDATA[(int)$share['id']]]></code>
+      <code>(int)$share['id']</code>
     </InvalidScalarArgument>
   </file>
   <file src="apps/federation/lib/DbHandler.php">
@@ -1069,7 +1069,7 @@
   </file>
   <file src="apps/files_sharing/templates/public.php">
     <RedundantCondition>
-      <code><![CDATA[$_['hideFileList'] !== true]]></code>
+      <code>$_['hideFileList'] !== true</code>
       <code><![CDATA[isset($_['hideFileList']) && $_['hideFileList'] !== true]]></code>
     </RedundantCondition>
   </file>
@@ -1206,7 +1206,7 @@
   <file src="apps/sharebymail/lib/ShareByMailProvider.php">
     <InvalidArgument>
       <code><![CDATA[$share->getId()]]></code>
-      <code><![CDATA[(int)$data['id']]]></code>
+      <code>(int)$data['id']</code>
     </InvalidArgument>
   </file>
   <file src="apps/systemtags/lib/Activity/Listener.php">
@@ -1716,7 +1716,7 @@
   </file>
   <file src="lib/private/AppFramework/Routing/RouteConfig.php">
     <InvalidArrayOffset>
-      <code><![CDATA[$action['url-postfix']]]></code>
+      <code>$action['url-postfix']</code>
     </InvalidArrayOffset>
   </file>
   <file src="lib/private/AppFramework/Services/AppConfig.php">
@@ -1946,7 +1946,7 @@
       <code>getParams</code>
     </InternalMethod>
     <InvalidArrayOffset>
-      <code><![CDATA[$params['collation']]]></code>
+      <code>$params['collation']</code>
     </InvalidArrayOffset>
   </file>
   <file src="lib/private/DB/Connection.php">
@@ -1957,8 +1957,8 @@
       <code>$params</code>
     </InvalidArgument>
     <InvalidArrayOffset>
-      <code><![CDATA[$params['adapter']]]></code>
-      <code><![CDATA[$params['tablePrefix']]]></code>
+      <code>$params['adapter']</code>
+      <code>$params['tablePrefix']</code>
     </InvalidArrayOffset>
   </file>
   <file src="lib/private/DB/Exceptions/DbalException.php">
@@ -1991,7 +1991,7 @@
       <code>getParams</code>
     </InternalMethod>
     <InvalidArrayOffset>
-      <code><![CDATA[$params['collation']]]></code>
+      <code>$params['collation']</code>
     </InvalidArrayOffset>
   </file>
   <file src="lib/private/DB/QueryBuilder/QueryBuilder.php">
@@ -2186,10 +2186,10 @@
       <code>$user</code>
     </InvalidOperand>
     <RedundantCondition>
-      <code><![CDATA[get_class($provider) !== 'OCA\Files_Sharing\MountProvider']]></code>
+      <code>get_class($provider) !== 'OCA\Files_Sharing\MountProvider'</code>
     </RedundantCondition>
     <TypeDoesNotContainType>
-      <code><![CDATA[get_class($provider) === 'OCA\Files_Sharing\MountProvider']]></code>
+      <code>get_class($provider) === 'OCA\Files_Sharing\MountProvider'</code>
     </TypeDoesNotContainType>
   </file>
   <file src="lib/private/Files/Config/UserMountCache.php">
@@ -2342,11 +2342,6 @@
       <code>remove</code>
     </UndefinedMethod>
   </file>
-  <file src="lib/private/Files/ObjectStore/HomeObjectStoreStorage.php">
-    <ImplementedReturnTypeMismatch>
-      <code>false|string</code>
-    </ImplementedReturnTypeMismatch>
-  </file>
   <file src="lib/private/Files/ObjectStore/ObjectStoreStorage.php">
     <InvalidScalarArgument>
       <code>$source</code>
@@ -2364,7 +2359,7 @@
       <code>Promise\promise_for(
 					new Credentials($key, $secret)
 				)</code>
-      <code><![CDATA[\Aws\or_chain([self::class, 'legacySignatureProvider'], ClientResolver::_default_signature_provider())]]></code>
+      <code>\Aws\or_chain([self::class, 'legacySignatureProvider'], ClientResolver::_default_signature_provider())</code>
     </UndefinedFunction>
   </file>
   <file src="lib/private/Files/ObjectStore/S3ObjectTrait.php">
@@ -2612,8 +2607,8 @@
       <code>false</code>
     </InvalidArgument>
     <InvalidArrayOffset>
-      <code><![CDATA[$app['path']]]></code>
-      <code><![CDATA[$app['path']]]></code>
+      <code>$app['path']</code>
+      <code>$app['path']</code>
     </InvalidArrayOffset>
     <NullArgument>
       <code>null</code>
@@ -2961,7 +2956,7 @@
   </file>
   <file src="lib/private/Setup.php">
     <RedundantCondition>
-      <code><![CDATA[$type === 'pdo']]></code>
+      <code>$type === 'pdo'</code>
     </RedundantCondition>
     <UndefinedVariable>
       <code>$vendor</code>
@@ -2991,7 +2986,7 @@
     <InvalidArgument>
       <code><![CDATA[$share->getId()]]></code>
       <code><![CDATA[$share->getId()]]></code>
-      <code><![CDATA[(int)$data['id']]]></code>
+      <code>(int)$data['id']</code>
     </InvalidArgument>
     <TooManyArguments>
       <code>set</code>
@@ -3189,8 +3184,8 @@
       <code>$groupsList</code>
     </InvalidArgument>
     <InvalidArrayOffset>
-      <code><![CDATA[$dir['path']]]></code>
-      <code><![CDATA[$dir['url']]]></code>
+      <code>$dir['path']</code>
+      <code>$dir['url']</code>
     </InvalidArrayOffset>
     <NullArgument>
       <code>null</code>