EZP-20805 - Removed unused service class