Cleanup in r_vr.c