Remove 'References' from mappings and selectors