Remove the old spawning system