Simplify message bus