T6 more cleanup