fixed this parser bug; removed old code