removing some unused variables.