TC cleanup