Fix some typos.
Drop unnecessary code.