Got rid of cross-dependencies