Remove some circular dependencies