Convert map to normap. Change - mapping to _. Remove unused mappings.