Fixed some typos, dead code