remove references to BaseModelProvider