Merge pull request #42 from SwannCroiset/map-cleaning

Cleaning useless default map keys