remove unused variables

Updated.