VIVO-518 and some other cleanup