Slightly improved cleanup of pubsub subscriptions