deleted some unneeded vars