Cleanups for merging map method