More updates to delete functionality