Remove some bad mappings