rm unused variable

rm some unused variables.
fix typo