Cleaning up MapViewer