massive code cleanup. even more stuff moved out of ClientMessageBusImpl.