fixing RV tracking and removing unnecessary messages call