diff --git a/apps/cli/cli_main.c b/apps/cli/cli_main.c
index ab7fad6c..507b551a 100644
--- a/apps/cli/cli_main.c
+++ b/apps/cli/cli_main.c
@@ -587,11 +587,7 @@ main(int argc, char **argv)
     restarg = clicon_strjoin(argc, argv, " ");
 
     /* If several cligen object variables match same preference, select first */
-#if 0 /* New cligen version (not in 4.4) */
     cligen_preference_mode_set(cli_cligen(h), 1);
-#else
-    cligen_match_cgvar_same(1);
-#endif
 
     /* Call start function in all plugins before we go interactive 
      */
diff --git a/test/test_upgrade.sh b/test/test_upgrade.sh
index 7fc1ef44..d4ae7674 100755
--- a/test/test_upgrade.sh
+++ b/test/test_upgrade.sh
@@ -334,7 +334,7 @@ new "5. Load non-compat invalid startup. Enter failsafe, startup invalid."
 (cd $dir; cp non-compat-invalid.xml startup_db)
 runtest true startup '<data><a1 xmlns="urn:example:a">always work</a1></data>' '<data><a0 xmlns="urn:example:a">old version</a0><a1 xmlns="urn:example:a">always work</a1><b xmlns="urn:example:b">other text</b><c xmlns="urn:example:c">bla bla</c></data>' # sorted
 #runtest true startup '<data><a1 xmlns="urn:example:a">always work</a1></data>' '<data><a0 xmlns="urn:example:a">old version</a0><c xmlns="urn:example:c">bla bla</c><a1 xmlns="urn:example:a">always work</a1><b xmlns="urn:example:b">other text</b></data>' # unsorted
-exit
+
 new "6. Load non-compat invalid running. Enter failsafe, startup invalid."
 (cd $dir; rm -f tmp_db candidate_db running_db startup_db) # remove databases
 (cd $dir; cp non-compat-invalid.xml running_db)