Originally there was more logic that warranted doStaticHandover(). Since doPairing() is no longer used for a negotiated handover, things got simpler resulting in the one-line doStaticHandover(). I agree that this doesn't look nice so I will inline this function()