make a few variables local, no need for member variables

Change-Id: I2559756acf655f73c782db023b7502f969346171
remove unused variables

Change-Id: I52be4e3a6539392bbe030e1a77fcbb61960eeab8