Removed tr hacks