Refactor delete -- WIP need more tests