diff --git a/api/src/main/java/org/opencord/dhcpl2relay/DhcpL2RelayEvent.java b/api/src/main/java/org/opencord/dhcpl2relay/DhcpL2RelayEvent.java
index 596fb6c..a143681 100644
--- a/api/src/main/java/org/opencord/dhcpl2relay/DhcpL2RelayEvent.java
+++ b/api/src/main/java/org/opencord/dhcpl2relay/DhcpL2RelayEvent.java
@@ -33,8 +33,6 @@
 
     private final Map.Entry<String, AtomicLong> countersEntry;
 
-    private final String dhcpCountersTopic;
-
     private final String subscriberId;
 
     /**
@@ -64,16 +62,13 @@
      * @param allocationInfo DHCP allocation info
      * @param connectPoint connect point the client is on
      * @param countersEntry an entry that represents the counters (used for STATS events)
-     * @param dhcpCountersTopic Kafka topic where the dhcp counters are published
      * @param subscriberId the subscriber identifier information
      */
     public DhcpL2RelayEvent(Type type, DhcpAllocationInfo allocationInfo, ConnectPoint connectPoint,
-                            Map.Entry<String, AtomicLong> countersEntry,
-                            String dhcpCountersTopic, String subscriberId) {
+                            Map.Entry<String, AtomicLong> countersEntry, String subscriberId) {
         super(type, allocationInfo);
         this.connectPoint = connectPoint;
         this.countersEntry = countersEntry;
-        this.dhcpCountersTopic = dhcpCountersTopic;
         this.subscriberId = subscriberId;
     }
 
@@ -88,7 +83,6 @@
         super(type, allocationInfo);
         this.connectPoint = connectPoint;
         this.countersEntry = null;
-        this.dhcpCountersTopic = null;
         this.subscriberId = null;
     }
 
@@ -111,15 +105,6 @@
     }
 
     /**
-     * Gets the Kafka topic where the dhcp counters are published.
-     *
-     * @return the dhcp kafka topic
-     */
-    public String getDhcpCountersTopic() {
-        return dhcpCountersTopic;
-    }
-
-    /**
      * Gets the subscriber identifier information.
      *
      * @return the Id from subscriber
