removing some unneeded variables.