Remove unused/unneeded variables