Cleaning parser infrastructure