diff --git a/p4app/controller.py b/p4app/controller.py
index 00b9f7e..ed2c75a 100644
--- a/p4app/controller.py
+++ b/p4app/controller.py
@@ -199,21 +199,23 @@ class L2Controller(object):
         for v4route in self.v4_routes[self.mode]:
             self.controller.table_add("v4_networks", "set_egress_port", [str(v4route['net'])], [str(v4route['port'])])
 
+
         self.controller.table_clear("v6_addresses")
-        for v6addr in self.v6_addresses[self.mode]:
-            log.debug("Adding v6 address: {}".format(v6addr))
+        # Disable icmp handling in the controller
+        # for v6addr in self.v6_addresses[self.mode]:
+        #     log.debug("Adding v6 address: {}".format(v6addr))
 
-            icmp6_addr = self.gen_ndp_multicast_addr(v6addr)
+        #     icmp6_addr = self.gen_ndp_multicast_addr(v6addr)
 
-            another_addr = v6addr +1
-            another_addr_ns = self.gen_ndp_multicast_addr(another_addr)
+        #     another_addr = v6addr +1
+        #     another_addr_ns = self.gen_ndp_multicast_addr(another_addr)
 
-            self.controller.table_add("v6_addresses", "controller_reply", [str(v6addr)], [str(self.task['ICMP6_GENERAL'])])
-            self.controller.table_add("v6_addresses", "controller_reply", [str(icmp6_addr)], [str(self.task['ICMP6_NS'])])
+        #     self.controller.table_add("v6_addresses", "controller_reply", [str(v6addr)], [str(self.task['ICMP6_GENERAL'])])
+        #     self.controller.table_add("v6_addresses", "controller_reply", [str(icmp6_addr)], [str(self.task['ICMP6_NS'])])
 
-            # Experimental: controller does NDP, switch does ICMP6 echo reply
-            self.controller.table_add("v6_addresses", "controller_reply", [str(another_addr_ns)], [str(self.task['ICMP6_NS'])])
-            self.controller.table_add("v6_addresses", "icmp6_echo_reply", [str(another_addr)])
+        #     # Experimental: controller does NDP, switch does ICMP6 echo reply
+        #     self.controller.table_add("v6_addresses", "controller_reply", [str(another_addr_ns)], [str(self.task['ICMP6_NS'])])
+        #     self.controller.table_add("v6_addresses", "icmp6_echo_reply", [str(another_addr)])
 
         for nat64map in self.nat64_map[self.mode]:
             self.static_nat64_mapping(**nat64map)