Get rid of cyrcular dependencies