removing some unused variables