DO NOT USE THIS INSTANCE FOR LIVE DATA!!!!
Small cleanup in pbs. See parent task for discussion. The content of this proto file belong elsewhere.