Remove PubSubMessageBuilder