cleanup. update views and models.