removed cross module dependencies