Remove deprecated purge_vdir; Rename variables