Removed cyclic references.