Remove trailing white space
Remove superfluous dummy annotations
Merge pull request #1 from tbeu/remove-more-dummy-annotations

Remove trailing white space and dummy annotations