Remove extra cruft from parser