[TASK] Cleanup TCA