Remove some trailing whitespace