Eliminate infinite PE/yields