Removed unused environment vars