delete implemented in Model
query updated to be similar to the others
Merge branch 'model-changes'