diff --git a/build/psalm-baseline-ocp.xml b/build/psalm-baseline-ocp.xml
index d16f469a12d..09110c58190 100644
--- a/build/psalm-baseline-ocp.xml
+++ b/build/psalm-baseline-ocp.xml
@@ -37,11 +37,6 @@
       <code>\OC</code>
     </UndefinedClass>
   </file>
-  <file src="lib/public/Cache/CappedMemoryCache.php">
-    <MissingTemplateParam>
-      <code>\ArrayAccess</code>
-    </MissingTemplateParam>
-  </file>
   <file src="lib/public/Defaults.php">
     <UndefinedClass>
       <code>\OC</code>
@@ -66,11 +61,6 @@
       <code>\OC</code>
     </UndefinedClass>
   </file>
-  <file src="lib/public/Files/Cache/ICacheEntry.php">
-    <MissingTemplateParam>
-      <code>ArrayAccess</code>
-    </MissingTemplateParam>
-  </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 7145e48e7e4..02124739c8f 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -1670,9 +1670,6 @@
     </InvalidReturnType>
   </file>
   <file src="lib/private/AppFramework/Http/Request.php">
-    <MissingTemplateParam>
-      <code>\ArrayAccess</code>
-    </MissingTemplateParam>
     <NullableReturnStatement>
       <code>$name</code>
       <code>$remoteAddress</code>
@@ -1838,12 +1835,6 @@
       <code><![CDATA[$this->providers]]></code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="lib/private/BackgroundJob/QueuedJob.php">
-    <MoreSpecificImplementedParamType>
-      <code>$jobList</code>
-      <code>$jobList</code>
-    </MoreSpecificImplementedParamType>
-  </file>
   <file src="lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php">
     <InvalidArgument>
       <code>$image</code>
@@ -2207,11 +2198,6 @@
       <code>array{int, string, int}</code>
     </MoreSpecificReturnType>
   </file>
-  <file src="lib/private/Files/FileInfo.php">
-    <MissingTemplateParam>
-      <code>\ArrayAccess</code>
-    </MissingTemplateParam>
-  </file>
   <file src="lib/private/Files/Filesystem.php">
     <LessSpecificReturnStatement>
       <code><![CDATA[$mount->getStorage()]]></code>
@@ -2745,14 +2731,6 @@
       <code>mixed</code>
       <code>mixed</code>
     </LessSpecificImplementedReturnType>
-    <MissingTemplateParam>
-      <code>\ArrayAccess</code>
-    </MissingTemplateParam>
-  </file>
-  <file src="lib/private/Memcache/ProfilerWrapperCache.php">
-    <MissingTemplateParam>
-      <code>\ArrayAccess</code>
-    </MissingTemplateParam>
   </file>
   <file src="lib/private/Preview/BackgroundCleanupJob.php">
     <InvalidReturnStatement>
@@ -2822,9 +2800,6 @@
     <ParamNameMismatch>
       <code>$arguments</code>
     </ParamNameMismatch>
-    <TypeDoesNotContainType>
-      <code>$counter % 100 === 0</code>
-    </TypeDoesNotContainType>
   </file>
   <file src="lib/private/Repair/RemoveLinkShares.php">
     <InvalidPropertyAssignmentValue>
@@ -2934,11 +2909,6 @@
       <code><![CDATA[return $this->appContainers[$namespace];]]></code>
     </NoValue>
   </file>
-  <file src="lib/private/Session/CryptoSessionData.php">
-    <MissingTemplateParam>
-      <code>\ArrayAccess</code>
-    </MissingTemplateParam>
-  </file>
   <file src="lib/private/Session/Internal.php">
     <MoreSpecificImplementedParamType>
       <code>$value</code>
@@ -2949,11 +2919,6 @@
       <code>$value</code>
     </MoreSpecificImplementedParamType>
   </file>
-  <file src="lib/private/Session/Session.php">
-    <MissingTemplateParam>
-      <code>\ArrayAccess</code>
-    </MissingTemplateParam>
-  </file>
   <file src="lib/private/Setup.php">
     <RedundantCondition>
       <code>$type === 'pdo'</code>
@@ -3272,11 +3237,6 @@
       <code>WIPE_TOKEN</code>
     </AmbiguousConstantInheritance>
   </file>
-  <file src="lib/public/Cache/CappedMemoryCache.php">
-    <MissingTemplateParam>
-      <code>\ArrayAccess</code>
-    </MissingTemplateParam>
-  </file>
   <file src="lib/public/Color.php">
     <LessSpecificReturnStatement>
       <code>$step</code>
@@ -3301,11 +3261,6 @@
       <code>\OC_App::getStorage($app)</code>
     </FalsableReturnStatement>
   </file>
-  <file src="lib/public/Files/Cache/ICacheEntry.php">
-    <MissingTemplateParam>
-      <code>ArrayAccess</code>
-    </MissingTemplateParam>
-  </file>
   <file src="lib/public/Files/Storage.php">
     <InvalidParamDefault>
       <code>array</code>