Clean up the code, switch to only TC 8.x API