Cleanup #16553: TCA tree has redundant code passages