Cleaning model.entity