PIM-1841 : remove deprecated datagrid and builder