Cleanup old TC cruft