v1.0.7.249 - remove dead code and properly add spawns & blocks when
defining them