Removed redundant mappings