Remove environment var
Reorganize conditional
Add secure env var again