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

    Done using https://github.com/dietmarw/trimtrailingwhitespaces