Removed the map from the world class