Remove Spawn, fix oversight