Move to tag-less translations