Remove cyclic dependencies