Add remaining wifi vars
Remove duplicate