Remove leftover code after Spawner extraction