Disabled more unnecessary uses of ENV stuff