remove whispersystems (3/3)

Change-Id: Ic67f6439b92056d2a5fb5730958008d129847428