diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index dfb28f1ffc..423ec3c004 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -855,16 +855,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Database/Events.php
 
-		-
-			message: "#^Cannot access offset 'item_name' on array\\|true\\.$#"
-			count: 1
-			path: libraries/classes/Database/Events.php
-
-		-
-			message: "#^Cannot access offset 'item_original_name' on array\\|true\\.$#"
-			count: 1
-			path: libraries/classes/Database/Events.php
-
 		-
 			message: "#^Cannot access offset 'EVENT_NAME' on \\(array\\)\\|true\\.$#"
 			count: 1
@@ -945,31 +935,11 @@ parameters:
 			count: 1
 			path: libraries/classes/Database/Qbe.php
 
-		-
-			message: "#^Cannot access offset 'item_name' on array\\|true\\.$#"
-			count: 1
-			path: libraries/classes/Database/Routines.php
-
-		-
-			message: "#^Cannot access offset 'item_original_name' on array\\|true\\.$#"
-			count: 1
-			path: libraries/classes/Database/Routines.php
-
 		-
 			message: "#^Parameter \\#1 \\$mode of method PhpMyAdmin\\\\Database\\\\Routines\\:\\:getEditorForm\\(\\) expects string, string\\|null given\\.$#"
 			count: 1
 			path: libraries/classes/Database/Routines.php
 
-		-
-			message: "#^Parameter \\#3 \\$routine of method PhpMyAdmin\\\\Database\\\\Routines\\:\\:getEditorForm\\(\\) expects array, array\\|null given\\.$#"
-			count: 1
-			path: libraries/classes/Database/Routines.php
-
-		-
-			message: "#^Offset 'item_type' does not exist on array\\|null\\.$#"
-			count: 1
-			path: libraries/classes/Database/Routines.php
-
 		-
 			message: "#^Parameter \\#2 \\$create_routine of method PhpMyAdmin\\\\Database\\\\Routines\\:\\:create\\(\\) expects string, string\\|null given\\.$#"
 			count: 1
@@ -1016,7 +986,7 @@ parameters:
 			path: libraries/classes/Database/Routines.php
 
 		-
-			message: "#^Cannot access offset 'item_name' on array\\|bool\\.$#"
+			message: "#^Offset 'item_name' does not exist on array\\|null\\.$#"
 			count: 1
 			path: libraries/classes/Database/Routines.php
 
@@ -1026,7 +996,7 @@ parameters:
 			path: libraries/classes/Database/Routines.php
 
 		-
-			message: "#^Cannot access offset 'item_type' on array\\|bool\\.$#"
+			message: "#^Offset 'item_type' does not exist on array\\|null\\.$#"
 			count: 1
 			path: libraries/classes/Database/Routines.php
 
@@ -1036,27 +1006,12 @@ parameters:
 			path: libraries/classes/Database/Routines.php
 
 		-
-			message: "#^Parameter \\#1 \\$routine of method PhpMyAdmin\\\\Database\\\\Routines\\:\\:getExecuteForm\\(\\) expects array, array\\|true given\\.$#"
-			count: 1
-			path: libraries/classes/Database/Routines.php
-
-		-
-			message: "#^Cannot access offset 'create' on array\\|bool\\.$#"
+			message: "#^Offset 'create' does not exist on array\\|null\\.$#"
 			count: 1
 			path: libraries/classes/Database/Triggers.php
 
 		-
-			message: "#^Cannot access offset 'drop' on array\\|bool\\.$#"
-			count: 1
-			path: libraries/classes/Database/Triggers.php
-
-		-
-			message: "#^Cannot access offset 'item_name' on array\\|true\\.$#"
-			count: 1
-			path: libraries/classes/Database/Triggers.php
-
-		-
-			message: "#^Cannot access offset 'item_original_name' on array\\|true\\.$#"
+			message: "#^Offset 'drop' does not exist on array\\|null\\.$#"
 			count: 1
 			path: libraries/classes/Database/Triggers.php
 
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index ed26c0f220..02c63c37ce 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -716,11 +716,7 @@
     </TypeDoesNotContainNull>
   </file>
   <file src="libraries/classes/Database/Events.php">
-    <PossiblyInvalidArgument occurrences="1">
-      <code>$item</code>
-    </PossiblyInvalidArgument>
-    <PossiblyInvalidArrayAccess occurrences="13">
-      <code>$item['item_name']</code>
+    <PossiblyInvalidArrayAccess occurrences="12">
       <code>$item['EVENT_NAME']</code>
       <code>$item['STATUS']</code>
       <code>$item['EVENT_TYPE']</code>
@@ -734,9 +730,6 @@
       <code>$item['DEFINER']</code>
       <code>$item['EVENT_COMMENT']</code>
     </PossiblyInvalidArrayAccess>
-    <PossiblyInvalidArrayAssignment occurrences="1">
-      <code>$item['item_original_name']</code>
-    </PossiblyInvalidArrayAssignment>
     <PossiblyNullArgument occurrences="1">
       <code>$create_item</code>
     </PossiblyNullArgument>
@@ -758,17 +751,12 @@
     </PossiblyNullPropertyAssignmentValue>
   </file>
   <file src="libraries/classes/Database/Routines.php">
-    <PossiblyInvalidArgument occurrences="5">
-      <code>$routine</code>
+    <PossiblyInvalidArgument occurrences="3">
       <code>$routine['item_type_toggle']</code>
       <code>$routine['item_returntype']</code>
       <code>$row</code>
-      <code>$routine</code>
     </PossiblyInvalidArgument>
-    <PossiblyInvalidArrayAccess occurrences="13">
-      <code>$routine['item_name']</code>
-      <code>$routine['item_type']</code>
-      <code>$routine['item_type']</code>
+    <PossiblyInvalidArrayAccess occurrences="8">
       <code>$routine['SPECIFIC_NAME']</code>
       <code>$routine['ROUTINE_TYPE']</code>
       <code>$routine['ROUTINE_DEFINITION']</code>
@@ -777,15 +765,7 @@
       <code>$routine['SECURITY_TYPE']</code>
       <code>$routine['SQL_DATA_ACCESS']</code>
       <code>$routine['ROUTINE_COMMENT']</code>
-      <code>$routine['item_type']</code>
-      <code>$routine['item_type']</code>
-      <code>$routine['item_name']</code>
-      <code>$routine['item_name']</code>
     </PossiblyInvalidArrayAccess>
-    <PossiblyInvalidArrayAssignment occurrences="2">
-      <code>$routine['item_original_name']</code>
-      <code>$routine['item_original_type']</code>
-    </PossiblyInvalidArrayAssignment>
     <PossiblyNullArgument occurrences="4">
       <code>$mode</code>
       <code>$create_routine</code>
@@ -801,19 +781,6 @@
       <code>$this-&gt;searchTypes[$_POST['criteriaSearchType']]</code>
     </InvalidArrayOffset>
   </file>
-  <file src="libraries/classes/Database/Triggers.php">
-    <PossiblyInvalidArgument occurrences="1">
-      <code>$item</code>
-    </PossiblyInvalidArgument>
-    <PossiblyInvalidArrayAccess occurrences="3">
-      <code>$trigger['create']</code>
-      <code>$trigger['drop']</code>
-      <code>$item['item_name']</code>
-    </PossiblyInvalidArrayAccess>
-    <PossiblyInvalidArrayAssignment occurrences="1">
-      <code>$item['item_original_name']</code>
-    </PossiblyInvalidArrayAssignment>
-  </file>
   <file src="libraries/classes/DatabaseInterface.php">
     <EmptyArrayAccess occurrences="1">
       <code>$result_target[]</code>