Removed more old code
Typos fixed