remove some unneeded variables