PIM-1841 : remove deprecated flexible property