Remove even more dummy annotations