Remove more trailing whitespace