Fuck it. Clean up and move tc to main config file