Simplify clone names and fix clone delete. Fixes #520