Removed unneeded variables