More cleanup on models.