Fix some typos and remove cruft