Clean up parser