Removed the map class