Update models.py

Cleanup after remote merge