Get rid of (some) TCF references
7 files changed