working on cleaning up deletes