Remove os.getenv bunk as it's not really that useful anyway.