parser clean up