infra provider tweaks
Merge pull request #767 from dajohnso/provider_tweaks

infra provider tweaks
Clean up Vm code
Clean up VM