Remove unused vars

Change-Id: I7790d581d29e1cd6c66b111251602701b062c56b
Merge "Remove unused vars"