PIM-1718 : clean useless flexible entity DI and configuration