removed unneeded vars