Removed all references to env_dir.