Remove some TC hard-coded flagging values [14266929]