more cleanup removing HVRA references. Still some to go.