Removed some unused methods in TM, remove deprecated TO client method (#4681)

Remove some deprecated client methods and replace usage
16 files changed