clean up dMap
Merge pull request #896 from Singly/cleaner-dMap

clean up dMap
Merge branch 'master' into cleaner