pubsub clean up and other comments