Remove unused fields in Friend and Group types