Remove dependency on text.