removed cyclic dependency