Cyclic dependency fully removed.