remove some unneeded vars