Removed majority of deprecated systems (except world), slightly changed world format