more TM stuff removed