Removed a few statics in the TM