Ensured using public WiX 3.6, removed unneeded VS support stuff