major TT cleanup