Some modifications for new parser. Removed some old util files