some cleanup and support for multiple supervisors on HPCS