Tidy up for pubsub/link stuff