Update to new world format and clean up