come cleanup of hv_controls.m