diff --git a/utils/misc/src/main/java/org/onlab/packet/ONOSLLDP.java b/utils/misc/src/main/java/org/onlab/packet/ONOSLLDP.java
index 0245e66..f20de98 100644
--- a/utils/misc/src/main/java/org/onlab/packet/ONOSLLDP.java
+++ b/utils/misc/src/main/java/org/onlab/packet/ONOSLLDP.java
@@ -15,15 +15,13 @@
  */
 package org.onlab.packet;
 
-import java.util.HashMap;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
 import org.apache.commons.lang.ArrayUtils;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
 
 import static org.onlab.packet.LLDPOrganizationalTLV.OUI_LENGTH;
 import static org.onlab.packet.LLDPOrganizationalTLV.SUBTYPE_LENGTH;
@@ -37,10 +35,8 @@
     public static final String DEFAULT_DEVICE = "INVALID";
     public static final String DEFAULT_NAME = "ONOS Discovery";
 
-    public static final byte[] LLDP_NICIRA = {0x01, 0x23, 0x20, 0x00, 0x00,
-            0x01};
-    public static final byte[] LLDP_MULTICAST = {0x01, (byte) 0x80,
-            (byte) 0xc2, 0x00, 0x00, 0x0e};
+    // ON.Lab OUI (a42305) with multicast bit set
+    public static final byte[] LLDP_ONLAB = {(byte) 0xa5, 0x23, 0x05, 0x00, 0x00, 0x01};
     public static final byte[] BDDP_MULTICAST = {(byte) 0xff, (byte) 0xff,
             (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff};
 
@@ -52,8 +48,7 @@
     private static final short DEVICE_LENGTH = OUI_LENGTH + SUBTYPE_LENGTH;
     private static final short DOMAIN_LENGTH = OUI_LENGTH + SUBTYPE_LENGTH;
 
-    private final HashMap<Byte, LLDPOrganizationalTLV> opttlvs =
-            Maps.<Byte, LLDPOrganizationalTLV>newHashMap();
+    private final HashMap<Byte, LLDPOrganizationalTLV> opttlvs = Maps.newHashMap();
 
     // TLV constants: type, size and subtype
     // Organizationally specific TLV also have packet offset and contents of TLV
@@ -82,7 +77,7 @@
         setName(DEFAULT_NAME);
         setDevice(DEFAULT_DEVICE);
 
-        setOptionalTLVList(Lists.<LLDPTLV>newArrayList(opttlvs.values()));
+        setOptionalTLVList(Lists.newArrayList(opttlvs.values()));
         setTtl(new LLDPTLV().setType(TTL_TLV_TYPE)
                        .setLength((short) ttlValue.length)
                        .setValue(ttlValue));
@@ -227,7 +222,7 @@
     public static ONOSLLDP parseONOSLLDP(Ethernet eth) {
         if (eth.getEtherType() == Ethernet.TYPE_LLDP ||
                 eth.getEtherType() == Ethernet.TYPE_BSN) {
-           ONOSLLDP onosLldp = new ONOSLLDP((LLDP) eth.getPayload()); //(ONOSLLDP) eth.getPayload();
+           ONOSLLDP onosLldp = new ONOSLLDP((LLDP) eth.getPayload());
            if (ONOSLLDP.DEFAULT_NAME.equals(onosLldp.getNameString())) {
                return onosLldp;
            }