Remove circular dependency.