Revise delete scenario. Fixes #23 and #26