Cleaning up use of qualifier annotations