[TASK] TCA CGL cleanup