Reverted the TM removal