Code organization work and support for deleting an item.