Remove unsed client variables

This patch removes some unsed client variables for cleanup.

Change-Id: I7c86cd2e619b30a757bbcb42bd62bb75f0a1f67d
Merge "Remove unsed client variables"