Removed unneeded vars