Cleaned up models.