Removed some unneeded variables