Remove internal use of vircmd