cleanups, including delete button