remove un-used variables, that were missed from the previous merge

Change-Id: I770880ee30e0285b1bfbc80972532238d30450c0