Removed some uneeded variables
Merged