remove unused variables

Change-Id: I570c7ebd29b38e0f58b459112121a6a03290c824