removing some unneeded vars