clean up retirement vms, tweak provider setup
Merge pull request #1130 from dajohnso/clean_retire_prov

clean up retirement vms, tweak provider setup