Commit
Fixing the where clauses on the delete function
Fixing the where clauses on the delete function 2