diff --git a/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/Constants.java b/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/Constants.java
index 71e453fa43..bc17c368d9 100644
--- a/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/Constants.java
+++ b/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/Constants.java
@@ -1,8 +1,8 @@
 package com.baeldung.spring.kafka.start.stop.consumer;
 
 public class Constants {
+
     public static final String MULTI_PARTITION_TOPIC = "multi_partition_topic";
-    public static final int MULTIPLE_PARTITIONS = 5;
-    public static final short REPLICATION_FACTOR = 1;
+
     public static final String LISTENER_ID = "listener-id-1";
 }
diff --git a/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/KafkaListenerControlService.java b/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/KafkaListenerControlService.java
index 259c461b4a..64f7158a49 100644
--- a/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/KafkaListenerControlService.java
+++ b/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/KafkaListenerControlService.java
@@ -11,7 +11,6 @@ public class KafkaListenerControlService {
     @Autowired
     private KafkaListenerEndpointRegistry registry;
 
-    // Method to start a listener
     public void startListener(String listenerId) {
         MessageListenerContainer listenerContainer = registry.getListenerContainer(listenerId);
         if (listenerContainer != null && !listenerContainer.isRunning()) {
@@ -19,7 +18,6 @@ public class KafkaListenerControlService {
         }
     }
 
-    // Method to stop a listener
     public void stopListener(String listenerId) {
         MessageListenerContainer listenerContainer = registry.getListenerContainer(listenerId);
         if (listenerContainer != null && listenerContainer.isRunning()) {
diff --git a/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/StartStopConsumerApplication.java b/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/StartStopConsumerApplication.java
index 9a2860bf1e..51893ea64a 100644
--- a/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/StartStopConsumerApplication.java
+++ b/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/StartStopConsumerApplication.java
@@ -1,4 +1,5 @@
 package com.baeldung.spring.kafka.start.stop.consumer;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
diff --git a/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/UserEvent.java b/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/UserEvent.java
index 1c7a7d35c8..fe95a8c4ad 100644
--- a/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/UserEvent.java
+++ b/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/UserEvent.java
@@ -1,10 +1,12 @@
 package com.baeldung.spring.kafka.start.stop.consumer;
 
 public class UserEvent {
-    private String userEventId;
-    private long eventNanoTime;
 
-    public UserEvent(){}
+    private String userEventId;
+
+
+    public UserEvent() {
+    }
 
     public UserEvent(String userEventId) {
         this.userEventId = userEventId;
@@ -18,11 +20,4 @@ public class UserEvent {
         this.userEventId = userEventId;
     }
 
-    public long getEventNanoTime() {
-        return eventNanoTime;
-    }
-
-    public void setEventNanoTime(long eventNanoTime) {
-        this.eventNanoTime = eventNanoTime;
-    }
 }
diff --git a/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/UserEventListener.java b/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/UserEventListener.java
index d35828211e..66fb861cdd 100644
--- a/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/UserEventListener.java
+++ b/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/UserEventListener.java
@@ -1,4 +1,5 @@
 package com.baeldung.spring.kafka.start.stop.consumer;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -7,6 +8,7 @@ import org.springframework.stereotype.Component;
 
 @Component
 public class UserEventListener {
+
     private static final Logger logger = LoggerFactory.getLogger(UserEventListener.class);
 
     @Autowired
@@ -15,7 +17,7 @@ public class UserEventListener {
     @KafkaListener(id = Constants.LISTENER_ID, topics = Constants.MULTI_PARTITION_TOPIC, groupId = "test-group",
             containerFactory = "kafkaListenerContainerFactory", autoStartup = "false")
     public void userEventListener(UserEvent userEvent) {
-        logger.info("Received UserEvent: " + userEvent.getUserEventId() + ", Time: " + userEvent.getEventNanoTime());
+        logger.info("Received UserEvent: " + userEvent.getUserEventId());
         userEventStore.addUserEvent(userEvent);
     }
 }
diff --git a/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/UserEventStore.java b/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/UserEventStore.java
index e0ccab20bb..071b39c7a3 100644
--- a/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/UserEventStore.java
+++ b/spring-kafka-3/src/main/java/com/baeldung/spring/kafka/start/stop/consumer/UserEventStore.java
@@ -7,17 +7,18 @@ import java.util.List;
 
 @Component
 public class UserEventStore {
+
     private final List<UserEvent> userEvents = new ArrayList<>();
 
-    public void addUserEvent(UserEvent userEvent){
+    public void addUserEvent(UserEvent userEvent) {
         userEvents.add(userEvent);
     }
 
-    public List<UserEvent> getUserEvents(){
+    public List<UserEvent> getUserEvents() {
         return userEvents;
     }
 
-    public void clearUserEvents(){
+    public void clearUserEvents() {
         this.userEvents.clear();
     }
 }
diff --git a/spring-kafka-3/src/test/java/com/baeldung/spring/kafka/startstopconsumer/StartStopConsumerLiveTest.java b/spring-kafka-3/src/test/java/com/baeldung/spring/kafka/startstopconsumer/StartStopConsumerLiveTest.java
index 298aee513c..6405f75f91 100644
--- a/spring-kafka-3/src/test/java/com/baeldung/spring/kafka/startstopconsumer/StartStopConsumerLiveTest.java
+++ b/spring-kafka-3/src/test/java/com/baeldung/spring/kafka/startstopconsumer/StartStopConsumerLiveTest.java
@@ -83,14 +83,12 @@ public class StartStopConsumerLiveTest {
 
         //Verification that listener has started.
         UserEvent startUserEventTest = new UserEvent(UUID.randomUUID().toString());
-        startUserEventTest.setEventNanoTime(System.nanoTime());
         producer.send(new ProducerRecord<>(Constants.MULTI_PARTITION_TOPIC, startUserEventTest));
         await().untilAsserted(() -> assertEquals(1, this.userEventStore.getUserEvents().size()));
         this.userEventStore.clearUserEvents();
 
         for (long count = 1; count <= 10; count++) {
             UserEvent userEvent = new UserEvent(UUID.randomUUID().toString());
-            userEvent.setEventNanoTime(System.nanoTime());
             Future<RecordMetadata> future = producer.send(new ProducerRecord<>(Constants.MULTI_PARTITION_TOPIC, userEvent));
             RecordMetadata metadata = future.get();
             if (count == 4) {