start removing deps from ui to model