Remove superfluous dummy annotations and trailing white spaces