Remove deprecated purge_vdir; Rename variables
Merge pull request #789 from JCotton1123/init-var-cleanup

Remove deprecated purge_vdir; Rename variables