remove model factory; update (most) frontends