Minor cleanup.

Removed unused code.
Fix minor typos.