Remove some unnecessary qualification