TR fixes

Merge and delete