Cleaned up the tc's