Remove outdated include.
Remove trailing whitespace.