removed cyclic dependencies