PIM-3196: removing decorators to avoid to declare 3 services in the DI
wip