Cleaning out unnecessary annotations and other D**** garbage.

Done using https://github.com/dietmarw/trimtrailingwhitespaces
MSL 3.1 is ancient and unmaintained.

In addition this will probably trigger an unnecessary warning message.
Merge pull request #4 from dietmarw/CodeCleanUp

Code clean up