removing cyclic dependency.