diff --git a/monicar-event-hub/src/main/java/org/eventhub/config/KafkaProducerConfig.java b/monicar-event-hub/src/main/java/org/eventhub/config/KafkaProducerConfig.java
index 1ad1d08..ae9adb8 100644
--- a/monicar-event-hub/src/main/java/org/eventhub/config/KafkaProducerConfig.java
+++ b/monicar-event-hub/src/main/java/org/eventhub/config/KafkaProducerConfig.java
@@ -1,10 +1,10 @@
 package org.eventhub.config;
 
 import java.util.HashMap;
+
 import java.util.Map;
 
 import org.apache.kafka.clients.producer.ProducerConfig;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -15,7 +15,6 @@
 import org.springframework.kafka.core.ProducerFactory;
 import org.springframework.kafka.support.serializer.JsonSerializer;
 
-
 @Configuration
 public class KafkaProducerConfig {
 
@@ -46,9 +45,4 @@ public ProducerFactory<String, Object> producerFactory(KafkaProperties kafkaProp
 	public KafkaTemplate<String, Object> kafkaTemplate(KafkaProperties kafkaProperties) {
 		return new KafkaTemplate<>(producerFactory(kafkaProperties));
 	}
-
-	@Bean
-	public PartitionFinder finder(@Qualifier("producerFactory") ProducerFactory<String, Object> producerFactory) {
-		return new PartitionFinder(producerFactory);
-	}
-}
+}
\ No newline at end of file
diff --git a/monicar-event-hub/src/main/java/org/eventhub/config/PartitionFinder.java b/monicar-event-hub/src/main/java/org/eventhub/config/PartitionFinder.java
deleted file mode 100644
index 3e3149c..0000000
--- a/monicar-event-hub/src/main/java/org/eventhub/config/PartitionFinder.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.eventhub.config;
-
-import org.apache.kafka.clients.producer.Producer;
-import org.springframework.kafka.core.ProducerFactory;
-import org.springframework.stereotype.Component;
-
-import lombok.RequiredArgsConstructor;
-
-@Component
-@RequiredArgsConstructor
-public class PartitionFinder {
-
-	private final ProducerFactory<String, Object> producerFactory;
-
-	public String[] partitions(String topic) {
-		try (Producer<String, Object> producer = producerFactory.createProducer()) {
-			return producer.partitionsFor(topic).stream()
-				.map(pi -> "" + pi.partition())
-				.toArray(String[]::new);
-		}
-	}
-
-}
diff --git a/monicar-event-hub/src/main/java/org/eventhub/infrastructure/messaging/KafkaCycleInfoEventPublisher.java b/monicar-event-hub/src/main/java/org/eventhub/infrastructure/messaging/KafkaCycleInfoEventPublisher.java
index 1b58bd9..1a50d25 100644
--- a/monicar-event-hub/src/main/java/org/eventhub/infrastructure/messaging/KafkaCycleInfoEventPublisher.java
+++ b/monicar-event-hub/src/main/java/org/eventhub/infrastructure/messaging/KafkaCycleInfoEventPublisher.java
@@ -21,8 +21,6 @@ public class KafkaCycleInfoEventPublisher implements CycleInfoEventPublisher {
 
 	@Override
 	@Async
-	@KafkaListener(topicPartitions = @TopicPartition(topic = "cycleInfo-json-topic",
-		partitions = "#{@finder.partitions('cycleInfo-json-topic')}"))
 	public void publishEvent(CycleInfoList cycleInfoList) {
 		CycleInfoListCommand message = CycleInfoListCommand.from(cycleInfoList);