pubsub cleanup