remove trailing whitespace + remove some useless comments