[CLEANUP] Minor TCA cleanup