Prep for switch to pubsub