Handle model deletions, fixes #1