Merge "Remove obsolete environment variables."