Eliminate use of tid