Clean up parser interface