The vijava is auto-generated from vSphere WSDL. So I don't see any benefit from removing it and re generating it. We can merge it by now and start to migrate it step by step to the jcloud style. Hence we are not using all the API we can do it partially.