Remove circular dependency error