[TASK] Last Flow 2.0 change and cleanup