Remove unnecessary mappings in favor of Unimpaired