PIM-1437 : Make some clean up on group datagrid managers