Remove more dummy annotations

Triggered by @dietmarw 's [ttws](../../../dietmarw/trimtrailingwhitespaces) script.