Removing environment variable dependancy.