remove some unnecessary qualifications