remove the classes from tmcombine
remove outdated comments