Get rid of some old unused mappings