Remove unneeded variables