Remove trailing white space and dummy annotations