Revert - remove unneeded vars