removed unneeded variables