Fix some redundant import statements and a trailing whitespace.

This is a nitpicky PR.