removing dependency cycle