Remove dependency of model on core module.