Remove the dependency-cycle between beans