Remove some more price macro usage