PIM-1466 : Clean create group feature