Remove circular require