Remove unused variables

Change-Id: I212092d22420f80f5a9965edafd7c172a9999f96