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

Remove trailing white space and dummy annotations