Revert "[merge] post merge cleanup + fixed a cpl wrong NPCs spawns"

This reverts commit 3323f2a8f80b95399cd4c15101f41654d35cfcd4.