Fix typos, remove unused imports.

subj