unnecessary mappings removed