PIM-1845 : remove deprecated bundle declaration
PIM-1841 : remove deprecated grid sorters