remove whispersystems (2/3)

Change-Id: I3dca64ffb2affc4ec8e4e11255c98273e3f53957