remove more PV conditions (3954507)