Refactored model reset after release