Get rid of PND_BUILD