clean up map stuff