Merge "gfch100: more peer cleanup"