Further cleanup of the models.