Remove explicit settings and replace with env var