GCP-7571 centralize handling of delete logic, updating UI after delete