Worked on parser and removed old (still in history of course!)