Removing disconnect for multi-threaded access.

Also cleaned up Vsphere a bit