Add a cleaner Model.remove