Stop passing base soup argument around, not needed anymore