Fix some typos and remove some more dead code.