Removing unnecessary debug code, working on parser