Removed unneeded UUID entries and updated for new World structure