rm unused variables

Change-Id: I94097f8ed0e5be79f8102e5a0f14f420965162bf