Vivo: Minor cleanup

These flags are seem to be unneeded for now.