cleaned up map situation