removed some uneeded variables