diff --git a/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java b/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java
index 9675620..0e408bb 100644
--- a/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java
+++ b/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java
@@ -315,7 +315,7 @@
         IpPrefix subnet = config.getPortIPv6Subnet(
                 connectPoint.deviceId(),
                 connectPoint.port()
-        ).getIp6Prefix();
+        );
         return subnet != null && subnet.contains(pkt.sender());
     }
 
diff --git a/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java b/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
index 1316285..4f912f3 100644
--- a/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
+++ b/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
@@ -999,9 +999,6 @@
      * @param portToRegister connect point to register
      */
     public void registerConnectPoint(ConnectPoint portToRegister) {
-        /*
-         * First we register the ARP handler.
-         */
         this.neighbourResolutionService.registerNeighbourHandler(
                 portToRegister,
                 neighbourHandler,
diff --git a/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java b/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
index 55562e0..6ceeb4b 100644
--- a/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
+++ b/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
@@ -158,9 +158,7 @@
                     });
                 }
             });
-            /*
-             * We register the connect point with the NRS.
-             */
+            // We register the connect point with the NRS.
             srManager.registerConnectPoint(subject);
         });
     }