Cleaned up the TC setups