Clean up trailing whitespace and dead code.