Fix bug 2062: Add logic to delete models gracefully