Remove TOSCA grouping from TFXA

Refs #9699