Cleanup parser