maps: cleanup