diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 1f29b310d4..f60f4f61c3 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -290,11 +290,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Controllers/Table/ZoomSearchController.php
 
-		-
-			message: "#^Variable \\$error_handler in PHPDoc tag @var does not exist\\.$#"
-			count: 1
-			path: libraries/classes/Core.php
-
 		-
 			message: "#^Comparison operation \"\\<\" between 1 and 43 is always true\\.$#"
 			count: 1
@@ -310,11 +305,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Database/CentralColumns.php
 
-		-
-			message: "#^Variable \\$dbi in PHPDoc tag @var does not exist\\.$#"
-			count: 1
-			path: libraries/classes/Database/Designer.php
-
 		-
 			message: "#^Offset 'DTN' does not exist on array\\('C_NAME' \\=\\> array\\<int, string\\>, \\?'DCN' \\=\\> array\\<int, string\\>&nonEmpty, \\?'DTN' \\=\\> array\\<int, string\\>&nonEmpty, \\?'SCN' \\=\\> array\\<int, string\\>&nonEmpty, \\?'STN' \\=\\> array\\<int, string\\>&nonEmpty\\)\\.$#"
 			count: 1
@@ -1060,31 +1050,16 @@ parameters:
 			count: 1
 			path: libraries/classes/Linter.php
 
-		-
-			message: "#^Variable \\$dbi in PHPDoc tag @var does not exist\\.$#"
-			count: 4
-			path: libraries/classes/Menu.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\Menu\\:\\:getAllowedTabs\\(\\) should return array but returns array\\|null\\.$#"
 			count: 1
 			path: libraries/classes/Menu.php
 
-		-
-			message: "#^Variable \\$PMA_Theme in PHPDoc tag @var does not exist\\.$#"
-			count: 1
-			path: libraries/classes/Navigation/Navigation.php
-
 		-
 			message: "#^Unreachable statement \\- code above always terminates\\.$#"
 			count: 1
 			path: libraries/classes/Navigation/Nodes/Node.php
 
-		-
-			message: "#^Variable \\$dbi in PHPDoc tag @var does not exist\\.$#"
-			count: 5
-			path: libraries/classes/Navigation/Nodes/Node.php
-
 		-
 			message: "#^Cannot access property \\$realName on PhpMyAdmin\\\\Navigation\\\\Nodes\\\\Node\\|false\\.$#"
 			count: 1
@@ -1940,11 +1915,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Replication.php
 
-		-
-			message: "#^Variable \\$dbi in PHPDoc tag @var does not exist\\.$#"
-			count: 1
-			path: libraries/classes/ReplicationGui.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\Sanitize\\:\\:sanitizeFilename\\(\\) should return string but returns string\\|null\\.$#"
 			count: 1
@@ -2435,11 +2405,6 @@ parameters:
 			count: 14
 			path: test/classes/TableTest.php
 
-		-
-			message: "#^Variable \\$dbi in PHPDoc tag @var does not exist\\.$#"
-			count: 2
-			path: test/classes/TableTest.php
-
 		-
 			message: "#^Property PhpMyAdmin\\\\Theme\\:\\:\\$mtimeInfo \\(int\\) does not accept int\\|false\\.$#"
 			count: 1