cleanup around map store improvements