Fix bug 2060: Add logic to delete models gracefully