[TASK] Clean up TCA and restore extendability