Minor simplification of user and groups JSON