Clean up binary api message handler registration issues