Update models.py

WiP - Trim the fat