remove dependancy on keystore client

Change-Id: Ie479037e2a8656b2c00a1cbbae9646e8bbc3167c