Clean up RVPs.