call for remove_mapping added