Remove unused vars

Change-Id: Ie78b7d79933e3159765a4d69a4f1ed643085e866
Merge "Remove unused vars"