Can we remove these new env variables? Using env variables is deprecated...