Remove circular requires