remove cyclic dependency