Refactored out other-project dependencies left from refactoring