Small changes + remove in Model.
Merge