Remove circular dependencies.