fixed removal of irritating mappings