cleanup after removing HubsV1 code
cleanup of hooks