Refactor out unused/unneeded variables