Some cleanup in rover-cv communication code