Refact the item deletion process to be more consistent across the app