Remove some unneeded variables