Removed references to model.data