Removed 2 unneeded variables