Bug fix: Remove old model after modification