HAL-383: cleanup API