Remove hardcoded reference to ENV