HELIX-37: Cleanup CallbackHandler