Consolidate Delete modals [2/2]