Removed some cyclic dependencies.