Modified pip search, garbage deleted

Change-Id: I7688fa408dadd7eb110465fcfa9cc7aa43f03f82
Merge "Modified pip search, garbage deleted"