Updated vm-setup
Removed submodules