Vivo: Even more cleanup