Last touches to the RVM removal.