diff --git a/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java b/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
index 8b2db26..5551ecf 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
@@ -28,18 +28,11 @@
 import org.onlab.util.KryoNamespace;
 import org.onlab.util.NewConcurrentHashMap;
 import org.onosproject.cluster.ClusterService;
-import org.onosproject.core.DefaultApplicationId;
 import org.onosproject.core.DefaultGroupId;
 import org.onosproject.core.GroupId;
 import org.onosproject.mastership.MastershipService;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.MastershipRole;
-import org.onosproject.net.PortNumber;
-import org.onosproject.net.flow.DefaultTrafficTreatment;
-import org.onosproject.net.flow.instructions.Instructions;
-import org.onosproject.net.flow.instructions.L0ModificationInstruction;
-import org.onosproject.net.flow.instructions.L2ModificationInstruction;
-import org.onosproject.net.flow.instructions.L3ModificationInstruction;
 import org.onosproject.net.group.DefaultGroup;
 import org.onosproject.net.group.DefaultGroupBucket;
 import org.onosproject.net.group.DefaultGroupDescription;
@@ -60,9 +53,7 @@
 import org.onosproject.store.AbstractStore;
 import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
 import org.onosproject.store.service.MultiValuedTimestamp;
-import org.onosproject.store.serializers.DeviceIdSerializer;
 import org.onosproject.store.serializers.KryoNamespaces;
-import org.onosproject.store.serializers.URISerializer;
 import org.onosproject.store.service.EventuallyConsistentMap;
 import org.onosproject.store.service.EventuallyConsistentMapBuilder;
 import org.onosproject.store.service.EventuallyConsistentMapEvent;
@@ -70,7 +61,6 @@
 import org.onosproject.store.service.StorageService;
 import org.slf4j.Logger;
 
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -141,6 +131,7 @@
     @Activate
     public void activate() {
         kryoBuilder = new KryoNamespace.Builder()
+            .register(KryoNamespaces.API)
             .register(DefaultGroup.class,
                       DefaultGroupBucket.class,
                       DefaultGroupDescription.class,
@@ -157,37 +148,7 @@
                       GroupStoreKeyMapKey.class,
                       GroupStoreIdMapKey.class,
                       GroupStoreMapKey.class
-                    )
-            .register(new URISerializer(), URI.class)
-            .register(new DeviceIdSerializer(), DeviceId.class)
-            .register(PortNumber.class)
-            .register(DefaultApplicationId.class)
-            .register(DefaultTrafficTreatment.class,
-                      Instructions.DropInstruction.class,
-                      Instructions.OutputInstruction.class,
-                      Instructions.GroupInstruction.class,
-                      Instructions.TableTypeTransition.class,
-                      L0ModificationInstruction.class,
-                      L0ModificationInstruction.L0SubType.class,
-                      L0ModificationInstruction.ModLambdaInstruction.class,
-                      L2ModificationInstruction.class,
-                      L2ModificationInstruction.L2SubType.class,
-                      L2ModificationInstruction.ModEtherInstruction.class,
-                      L2ModificationInstruction.PushHeaderInstructions.class,
-                      L2ModificationInstruction.ModVlanIdInstruction.class,
-                      L2ModificationInstruction.ModVlanPcpInstruction.class,
-                      L2ModificationInstruction.ModMplsLabelInstruction.class,
-                      L2ModificationInstruction.ModMplsTtlInstruction.class,
-                      L3ModificationInstruction.class,
-                      L3ModificationInstruction.L3SubType.class,
-                      L3ModificationInstruction.ModIPInstruction.class,
-                      L3ModificationInstruction.ModIPv6FlowLabelInstruction.class,
-                      L3ModificationInstruction.ModTtlInstruction.class,
-                      org.onlab.packet.MplsLabel.class
-                    )
-            .register(org.onosproject.cluster.NodeId.class)
-            .register(KryoNamespaces.BASIC)
-            .register(KryoNamespaces.MISC);
+            );
 
         messageHandlingExecutor = Executors.
                 newFixedThreadPool(MESSAGE_HANDLER_THREAD_POOL_SIZE,