remove some unused variables, comments