Remove dependency on DS