Trying with env vars
Clean up