PIM-1616 : comment useless config
PIM-1616 : quick fix the flexible entity user issue