Add vSphere support

Remove the commented code