fixup! Remove tr dependency