#2 clean up in merge-maps