removing cb-model dependency