diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index e5c1ced4ba..d50ecf14ab 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -4535,16 +4535,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Import/Ajax.php
 
-		-
-			message: "#^Argument of an invalid type array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\SetOperation\\>\\|null supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: libraries/classes/Import/SimulateDml.php
-
-		-
-			message: "#^Parameter \\#2 \\$list of static method PhpMyAdmin\\\\SqlParser\\\\Utils\\\\Query\\:\\:getClause\\(\\) expects PhpMyAdmin\\\\SqlParser\\\\TokensList, PhpMyAdmin\\\\SqlParser\\\\TokensList\\|null given\\.$#"
-			count: 6
-			path: libraries/classes/Import/SimulateDml.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\Index\\:\\:__construct\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 913ee9b160..859ed96039 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -7943,39 +7943,6 @@
       <code>$_SESSION[$GLOBALS['SESSION_KEY']]</code>
     </PossiblyInvalidArrayOffset>
   </file>
-  <file src="libraries/classes/Import/SimulateDml.php">
-    <MixedArgument occurrences="1">
-      <code>$set-&gt;value</code>
-    </MixedArgument>
-    <MixedArgumentTypeCoercion occurrences="1">
-      <code>$columns</code>
-    </MixedArgumentTypeCoercion>
-    <MixedAssignment occurrences="2">
-      <code>$columns[]</code>
-      <code>$set</code>
-    </MixedAssignment>
-    <MixedOperand occurrences="1">
-      <code>$set-&gt;column</code>
-    </MixedOperand>
-    <MixedPropertyFetch occurrences="2">
-      <code>$set-&gt;column</code>
-      <code>$set-&gt;value</code>
-    </MixedPropertyFetch>
-    <PossiblyNullArgument occurrences="6">
-      <code>$parser-&gt;list</code>
-      <code>$parser-&gt;list</code>
-      <code>$parser-&gt;list</code>
-      <code>$parser-&gt;list</code>
-      <code>$parser-&gt;list</code>
-      <code>$parser-&gt;list</code>
-    </PossiblyNullArgument>
-    <PossiblyNullIterator occurrences="1">
-      <code>$statement-&gt;set</code>
-    </PossiblyNullIterator>
-    <RedundantCondition occurrences="1">
-      <code>empty($diff)</code>
-    </RedundantCondition>
-  </file>
   <file src="libraries/classes/Index.php">
     <DocblockTypeContradiction occurrences="1">
       <code>$this-&gt;packed === null</code>