got rid of environment variables