more file cleanups
some cleanup of models.py.
some cleanup of models.py.