removing checks for environment variables