Clean up the map widget - Phase 3