diff --git a/tests/phpstan/configs/l8-baseline.neon b/tests/phpstan/configs/l8-baseline.neon
index 0c79f23e1..f6022b303 100644
--- a/tests/phpstan/configs/l8-baseline.neon
+++ b/tests/phpstan/configs/l8-baseline.neon
@@ -105,11 +105,6 @@ parameters:
 			count: 1
 			path: ../../../src/network/NetworkSessionManager.php
 
-		-
-			message: "#^Parameter \\#3 \\$chunk of class pocketmine\\\\network\\\\mcpe\\\\ChunkRequestTask constructor expects pocketmine\\\\world\\\\format\\\\Chunk, pocketmine\\\\world\\\\format\\\\Chunk\\|null given\\.$#"
-			count: 1
-			path: ../../../src/network/mcpe/ChunkCache.php
-
 		-
 			message: "#^Parameter \\#1 \\$entity of method pocketmine\\\\network\\\\mcpe\\\\NetworkSession\\:\\:onEntityEffectAdded\\(\\) expects pocketmine\\\\entity\\\\Living, pocketmine\\\\player\\\\Player\\|null given\\.$#"
 			count: 1
@@ -200,16 +195,6 @@ parameters:
 			count: 1
 			path: ../../../src/network/mcpe/NetworkSession.php
 
-		-
-			message: "#^Cannot call method getString\\(\\) on pocketmine\\\\nbt\\\\tag\\\\CompoundTag\\|null\\.$#"
-			count: 1
-			path: ../../../src/network/mcpe/convert/RuntimeBlockMapping.php
-
-		-
-			message: "#^Parameter \\#1 \\$that of method pocketmine\\\\nbt\\\\tag\\\\CompoundTag\\:\\:equals\\(\\) expects pocketmine\\\\nbt\\\\tag\\\\Tag, pocketmine\\\\nbt\\\\tag\\\\CompoundTag\\|null given\\.$#"
-			count: 1
-			path: ../../../src/network/mcpe/convert/RuntimeBlockMapping.php
-
 		-
 			message: "#^Cannot call method getTag\\(\\) on pocketmine\\\\nbt\\\\tag\\\\CompoundTag\\|null\\.$#"
 			count: 1
@@ -225,16 +210,6 @@ parameters:
 			count: 1
 			path: ../../../src/network/mcpe/convert/TypeConverter.php
 
-		-
-			message: "#^Parameter \\#1 \\$\\$encryptionKey of closure expects string, string\\|null given\\.$#"
-			count: 1
-			path: ../../../src/network/mcpe/encryption/PrepareEncryptionTask.php
-
-		-
-			message: "#^Parameter \\#2 \\$\\$handshakeJwt of closure expects string, string\\|null given\\.$#"
-			count: 1
-			path: ../../../src/network/mcpe/encryption/PrepareEncryptionTask.php
-
 		-
 			message: "#^Property pocketmine\\\\network\\\\mcpe\\\\protocol\\\\LevelSoundEventPacket\\:\\:\\$position \\(pocketmine\\\\math\\\\Vector3\\) does not accept pocketmine\\\\math\\\\Vector3\\|null\\.$#"
 			count: 1
@@ -565,21 +540,6 @@ parameters:
 			count: 1
 			path: ../../../src/world/format/io/region/RegionWorldProvider.php
 
-		-
-			message: "#^Cannot call method saveToThreadStore\\(\\) on pocketmine\\\\scheduler\\\\AsyncWorker\\|null\\.$#"
-			count: 2
-			path: ../../../src/world/generator/GeneratorRegisterTask.php
-
-		-
-			message: "#^Cannot call method removeFromThreadStore\\(\\) on pocketmine\\\\scheduler\\\\AsyncWorker\\|null\\.$#"
-			count: 2
-			path: ../../../src/world/generator/GeneratorUnregisterTask.php
-
-		-
-			message: "#^Cannot call method getFromThreadStore\\(\\) on pocketmine\\\\scheduler\\\\AsyncWorker\\|null\\.$#"
-			count: 2
-			path: ../../../src/world/generator/PopulationTask.php
-
 		-
 			message: "#^Cannot call method setDirtyFlag\\(\\) on pocketmine\\\\world\\\\format\\\\Chunk\\|null\\.$#"
 			count: 4