Cleaning up merged parser