clean up retirement vms, tweak provider setup