Clean up and fix for TC-819