Re-order calls and clean up multisession messages