Remove dependency on Data.Text