cleaned up cart and models.