Remove tr dependency