Cosmetic: remove some unneeded variables