Remove TS related debugging from 2007

Change-Id: Idaccd92b94baaa1c799d6e56368bda0750c894c0
Merge "Remove TS related debugging from 2007"