Remove more dummy annotations