Rm unused variables

Change-Id: I7e09b0504ab8c3d157091c28819b9dcf8698c40b