Removed two unneeded variables