Remove unnecessary mappings