Remove hardcoded ENV