Setup clone to work with the new exception handling logic
Fix delete bug