Removed map_viewer