Removing some previously commented-out unused vars per feedback