diff --git a/app/src/main/java/org/onosproject/segmentrouting/xconnect/impl/XconnectManager.java b/app/src/main/java/org/onosproject/segmentrouting/xconnect/impl/XconnectManager.java
index f997d53..3577536 100644
--- a/app/src/main/java/org/onosproject/segmentrouting/xconnect/impl/XconnectManager.java
+++ b/app/src/main/java/org/onosproject/segmentrouting/xconnect/impl/XconnectManager.java
@@ -121,6 +121,7 @@
 
         KryoNamespace.Builder serializer = KryoNamespace.newBuilder()
                 .register(KryoNamespaces.API)
+                .register(XconnectManager.class)
                 .register(XconnectKey.class);
 
         xconnectStore = storageService.<XconnectKey, Set<PortNumber>>consistentMapBuilder()
@@ -598,10 +599,4 @@
         srService.getPairLocalPort(deviceId).ifPresent(newPorts::add);
         return newPorts;
     }
-
-    // TODO DEVICE listener
-    // up : init
-    // down: removeDevice
-
-
 }