removed ENV stuff