Fix non-primary key deletes