Remove circularity, get ui router to work