Modified pip search, garbage deleted

Change-Id: Ifdf8b4ed0b2aba71fafd03431e66f1937fea66fa