Simplify PubSub demo