Protect against word splitting by using double quotes
Remove obsolete env var