diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/event/CustomEventLogListener.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/event/CustomEventLogListener.java
index c52d4efdd769..4ae5bbca0f0a 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/event/CustomEventLogListener.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/event/CustomEventLogListener.java
@@ -6,7 +6,6 @@
 import static org.testng.AssertJUnit.assertTrue;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.Iterator;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/event/RemoteListenerWithDslFilterTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/event/RemoteListenerWithDslFilterTest.java
index a4428015d179..65b8f5c1c28f 100644
--- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/event/RemoteListenerWithDslFilterTest.java
+++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/event/RemoteListenerWithDslFilterTest.java
@@ -60,8 +60,7 @@ protected void createCacheManagers() throws Throwable {
       // Register the filter/converter factory. This should normally be discovered by the server via class path instead
       // of being added manually here, but this is ok in a test.
       JPACacheEventFilterConverterFactory factory = new JPACacheEventFilterConverterFactory();
-      server(0).addCacheEventFilterFactory(JPACacheEventFilterConverterFactory.FACTORY_NAME, factory);
-      server(0).addCacheEventConverterFactory(JPACacheEventFilterConverterFactory.FACTORY_NAME, factory);
+      server(0).addCacheEventFilterConverterFactory(JPACacheEventFilterConverterFactory.FACTORY_NAME, factory);
 
       remoteCache = client(0).getCache();
 
diff --git a/remote-query/remote-query-server/src/main/java/org/infinispan/query/remote/filter/JPACacheEventFilterConverterFactory.java b/remote-query/remote-query-server/src/main/java/org/infinispan/query/remote/filter/JPACacheEventFilterConverterFactory.java
index 5f0013ec554e..f03fe942cf2c 100644
--- a/remote-query/remote-query-server/src/main/java/org/infinispan/query/remote/filter/JPACacheEventFilterConverterFactory.java
+++ b/remote-query/remote-query-server/src/main/java/org/infinispan/query/remote/filter/JPACacheEventFilterConverterFactory.java
@@ -1,10 +1,8 @@
 package org.infinispan.query.remote.filter;
 
 import org.infinispan.commons.CacheException;
-import org.infinispan.notifications.cachelistener.filter.CacheEventConverter;
-import org.infinispan.notifications.cachelistener.filter.CacheEventConverterFactory;
-import org.infinispan.notifications.cachelistener.filter.CacheEventFilter;
-import org.infinispan.notifications.cachelistener.filter.CacheEventFilterFactory;
+import org.infinispan.notifications.cachelistener.filter.CacheEventFilterConverter;
+import org.infinispan.notifications.cachelistener.filter.CacheEventFilterConverterFactory;
 import org.infinispan.notifications.cachelistener.filter.NamedFactory;
 import org.infinispan.objectfilter.impl.ProtobufMatcher;
 import org.infinispan.protostream.ProtobufUtil;
@@ -12,6 +10,7 @@
 import org.infinispan.protostream.config.Configuration;
 import org.infinispan.query.dsl.embedded.impl.JPAFilterAndConverter;
 import org.infinispan.query.remote.client.BaseProtoStreamMarshaller;
+import org.kohsuke.MetaInfServices;
 
 import java.io.IOException;
 
@@ -20,7 +19,8 @@
  * @since 7.2
  */
 @NamedFactory(name = JPACacheEventFilterConverterFactory.FACTORY_NAME)
-public class JPACacheEventFilterConverterFactory implements CacheEventFilterFactory, CacheEventConverterFactory {
+@MetaInfServices
+public class JPACacheEventFilterConverterFactory implements CacheEventFilterConverterFactory {
 
    public static final String FACTORY_NAME = "query-dsl-filter-converter-factory";
 
@@ -35,16 +35,7 @@ protected SerializationContext getSerializationContext() {
    };
 
    @Override
-   public CacheEventFilter<byte[], byte[]> getFilter(Object[] params) {
-      return getCacheEventFilterConverter(params);
-   }
-
-   @Override
-   public CacheEventConverter<byte[], byte[], byte[]> getConverter(Object[] params) {
-      return getCacheEventFilterConverter(params);
-   }
-
-   private JPAProtobufCacheEventFilterConverter getCacheEventFilterConverter(Object[] params) {
+   public CacheEventFilterConverter<byte[], byte[], byte[]> getFilterConverter(Object[] params) {
       String jpql;
       try {
          jpql = (String) paramMarshaller.objectFromByteBuffer((byte[]) params[0]);
diff --git a/remote-query/remote-query-server/src/main/resources/META-INF/services/org.infinispan.notifications.cachelistener.filter.CacheEntryConverterFactory b/remote-query/remote-query-server/src/main/resources/META-INF/services/org.infinispan.notifications.cachelistener.filter.CacheEntryConverterFactory
deleted file mode 100644
index 381f058153ea..000000000000
--- a/remote-query/remote-query-server/src/main/resources/META-INF/services/org.infinispan.notifications.cachelistener.filter.CacheEntryConverterFactory
+++ /dev/null
@@ -1 +0,0 @@
-org.infinispan.query.remote.filter.JPACacheEventFilterConverterFactory
diff --git a/remote-query/remote-query-server/src/main/resources/META-INF/services/org.infinispan.notifications.cachelistener.filter.CacheEntryFilterFactory b/remote-query/remote-query-server/src/main/resources/META-INF/services/org.infinispan.notifications.cachelistener.filter.CacheEntryFilterFactory
deleted file mode 100644
index 381f058153ea..000000000000
--- a/remote-query/remote-query-server/src/main/resources/META-INF/services/org.infinispan.notifications.cachelistener.filter.CacheEntryFilterFactory
+++ /dev/null
@@ -1 +0,0 @@
-org.infinispan.query.remote.filter.JPACacheEventFilterConverterFactory