diff --git a/test_auto_prefix_propagate/B.sh b/test_auto_prefix_propagate/B.sh
index 4784a31..4bc5f0c 100755
--- a/test_auto_prefix_propagate/B.sh
+++ b/test_auto_prefix_propagate/B.sh
@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 
-defaultIdentity=
-hubIdentity='/auto-prefix-propagate/hub'
 nfdConf='hub.nfd.conf'
-systemNfdConf='/usr/local/etc/ndn/nfd.conf'
+systemNfdConf='/usr/local/etc/ndn/nfd.conf.sample'
 testLog='hub.test.log'
 nfdLog='hub.nfd.log'
 
@@ -38,33 +36,12 @@
     LOG "Killing NFD process!"
     kill_process nfd
     kill_process ndn-autoconfig-server
-
-    LOG "Deleting the hub identity"
-    delete_identity "$hubIdentity"
-
-    LOG "Reset the default identity"
-    if [[ -n "$defaultIdentity" ]]; then
-        if [[ $(ndnsec-list | grep -c "$defaultIdentity$") -gt 0 ]]; then
-            ndnsec-set-default $defaultIdentity
-        fi
-    else
-        r=$(ndnsec-list)
-        if [[ -n "$r" ]]; then
-            r=`echo "$r" | tr "\n" "-"`
-            r=${r%%-*} && r=${r#*/} && r="/$r"
-            ndnsec-set-default $r
-        fi
-    fi
 }
 
 prepare_for_test() {
     echo "Start test log on remote hub" >$testLog
     echo "Start nfd log on remote hub" >$nfdLog
 
-    LOG "Create hub identity as the default identity"
-    defaultIdentity=$(ndnsec-get-default)
-    ndnsec-key-gen $hubIdentity | ndnsec-cert-install - >>$testLog 2>&1
-
     LOG "create nfd conf file with localhop_security section specified for test"
     [[ ! -f $systemNfdConf ]] && LOG "can not find nfd config file" && exit 1