Refactored model deletions