Fix HAL-175: Cleanup security context API