Clean up T2FlowParser