Some clean up of the mapview fragment