Remove Old PIB

Change-Id: Ib10864e660114a5715b0aa8c481298c716b8919d
Email: Fix PIB

cheers

Change-Id: Ic8ff0862b15bd627999861899fe993a66093cf8d