Remove circular dependencies