Get rid of PIP_TARGET completely