cleaned up pubsub