Updates to Delete functionality