Simplify (and speed up) UI for deleting