removed model state stuff