EZP-22564: CS
EZP-22564: cleanup: use ES's own services