Fix parse error. Cleanup flow.