More removal of TUC code