diff --git a/configure b/configure
index 44813e8a..aaf3caff 100755
--- a/configure
+++ b/configure
@@ -632,7 +632,6 @@ CPP
 OBJEXT
 EXEEXT
 ac_ct_CC
-with_keyvalue
 with_restconf
 RANLIB
 AR
@@ -707,8 +706,6 @@ ac_user_opts='
 enable_option_checking
 with_cligen
 with_restconf
-with_keyvalue
-with_qdbm
 with_configfile
 '
       ac_precious_vars='build_alias
@@ -1346,8 +1343,6 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-cligen=dir       Use CLIGEN here
   --without-restconf      disable support for restconf
-  --with-keyvalue         enable support for key-value xmldb datastore
-  --with-qdbm=dir         Use QDBM here, if keyvalue
   --with-configfile=FILE  set default path to config file
 
 Some influential environment variables:
@@ -2349,7 +2344,6 @@ test -n "$target_alias" &&
 
 
  # If yes, compile apps/restconf
- # If yes, compile datastore/keyvalue
 #
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3946,107 +3940,6 @@ fi
 
 fi
 
-# This is for keyvalue datastore (and qdbm)
-
-# Check whether --with-keyvalue was given.
-if test "${with_keyvalue+set}" = set; then :
-  withval=$with_keyvalue;
-else
-  with_keyvalue=no
-fi
-
-if test "x${with_keyvalue}" == xyes; then
-   # This is for qdbm
-
-# Check whether --with-qdbm was given.
-if test "${with_qdbm+set}" = set; then :
-  withval=$with_qdbm;
-fi
-
-   if test "${with_qdbm}"; then
-      echo "Using QDBM here: ${with_qdbm}"
-      CPPFLAGS="-I${with_qdbm}/include ${CPPFLAGS}"
-      LDFLAGS="-L${with_qdbm}/lib ${LDFLAGS}"
-   fi
-   # Problem: depot.h may be in qdbm/depot.h.
-   for ac_header in depot.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "depot.h" "ac_cv_header_depot_h" "$ac_includes_default"
-if test "x$ac_cv_header_depot_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DEPOT_H 1
-_ACEOF
-
-else
-  for ac_header in qdbm/depot.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "qdbm/depot.h" "ac_cv_header_qdbm_depot_h" "$ac_includes_default"
-if test "x$ac_cv_header_qdbm_depot_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_QDBM_DEPOT_H 1
-_ACEOF
-
-else
-  as_fn_error $? "libqdbm-dev required" "$LINENO" 5
-fi
-
-done
-
-fi
-
-done
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dpopen in -lqdbm" >&5
-$as_echo_n "checking for dpopen in -lqdbm... " >&6; }
-if ${ac_cv_lib_qdbm_dpopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lqdbm  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dpopen ();
-int
-main ()
-{
-return dpopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_qdbm_dpopen=yes
-else
-  ac_cv_lib_qdbm_dpopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_qdbm_dpopen" >&5
-$as_echo "$ac_cv_lib_qdbm_dpopen" >&6; }
-if test "x$ac_cv_lib_qdbm_dpopen" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBQDBM 1
-_ACEOF
-
-  LIBS="-lqdbm $LIBS"
-
-else
-  as_fn_error $? "libqdbm-dev required" "$LINENO" 5
-fi
-
-   ac_config_files="$ac_config_files datastore/keyvalue/Makefile"
-
-fi
-
 # Set default config file location
 
 # Check whether --with-configfile was given.
@@ -4311,7 +4204,6 @@ _ACEOF
 
 
 
-# See also datastore/keyvalue/Makefile in with_keyvalue clause above
 ac_config_files="$ac_config_files Makefile lib/Makefile lib/src/Makefile lib/clixon/Makefile apps/Makefile apps/cli/Makefile apps/backend/Makefile apps/netconf/Makefile apps/restconf/Makefile include/Makefile etc/Makefile etc/clixonrc example/Makefile example/docker/Makefile extras/rpm/Makefile docker/Makefile docker/cli/Makefile docker/cli/Dockerfile docker/backend/Makefile docker/backend/Dockerfile docker/netconf/Makefile docker/netconf/Dockerfile datastore/Makefile datastore/text/Makefile yang/Makefile doc/Makefile"
 
 cat >confcache <<\_ACEOF
@@ -5005,7 +4897,6 @@ do
   case $ac_config_target in
     "include/clixon_config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/clixon_config.h" ;;
     "lib/clixon/clixon.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/clixon/clixon.h" ;;
-    "datastore/keyvalue/Makefile") CONFIG_FILES="$CONFIG_FILES datastore/keyvalue/Makefile" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
     "lib/src/Makefile") CONFIG_FILES="$CONFIG_FILES lib/src/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index b0bbed2f..22614971 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,7 +85,6 @@ AC_SUBST(EXE_SUFFIX)
 AC_SUBST(AR)
 AC_SUBST(RANLIB)
 AC_SUBST(with_restconf) # If yes, compile apps/restconf
-AC_SUBST(with_keyvalue) # If yes, compile datastore/keyvalue
 #
 AC_PROG_CC()
 AC_PROG_CPP
@@ -142,25 +141,6 @@ if test "x${with_restconf}" == xyes; then
    AC_CHECK_LIB(fcgi, FCGX_Init,, AC_MSG_ERROR([libfcgi-dev missing])) 
 fi
 
-# This is for keyvalue datastore (and qdbm)
-AC_ARG_WITH([keyvalue],
-            [AS_HELP_STRING([--with-keyvalue],[enable support for key-value xmldb datastore])],
-	    [],
-            [with_keyvalue=no])
-if test "x${with_keyvalue}" == xyes; then
-   # This is for qdbm
-   AC_ARG_WITH(qdbm,  [  --with-qdbm=dir         Use QDBM here, if keyvalue ] )
-   if test "${with_qdbm}"; then
-      echo "Using QDBM here: ${with_qdbm}"
-      CPPFLAGS="-I${with_qdbm}/include ${CPPFLAGS}"
-      LDFLAGS="-L${with_qdbm}/lib ${LDFLAGS}"
-   fi
-   # Problem: depot.h may be in qdbm/depot.h. 
-   AC_CHECK_HEADERS(depot.h,,[AC_CHECK_HEADERS(qdbm/depot.h,,AC_MSG_ERROR(libqdbm-dev required))])
-   AC_CHECK_LIB(qdbm, dpopen,, AC_MSG_ERROR(libqdbm-dev required))
-   AC_CONFIG_FILES(datastore/keyvalue/Makefile)
-fi
-
 # Set default config file location
 AC_ARG_WITH([configfile],
 	    [AS_HELP_STRING([--with-configfile=FILE],[set default path to config file])],
@@ -193,7 +173,6 @@ AC_DEFINE_UNQUOTED(CLIXON_DEFAULT_CONFIG,"${DEFAULT_CONFIG}",[Location for apps
 
 AH_BOTTOM([#include <clixon_custom.h>])
 
-# See also datastore/keyvalue/Makefile in with_keyvalue clause above
 AC_OUTPUT(Makefile
 	  lib/Makefile
 	  lib/src/Makefile 
diff --git a/datastore/Makefile.in b/datastore/Makefile.in
index 6e5ce1fe..697bce7c 100644
--- a/datastore/Makefile.in
+++ b/datastore/Makefile.in
@@ -68,9 +68,6 @@ INCLUDES	= -I. -I$(top_srcdir)/lib/src -I$(top_srcdir)/lib -I$(top_srcdir)/inclu
 
 
 SUBDIRS = text
-ifeq ($(with_keyvalue),yes)
-SUBDIRS += keyvalue
-endif
 
 .PHONY: all clean depend install $(SUBDIRS)
 
diff --git a/include/clixon_config.h.in b/include/clixon_config.h.in
index d356c165..5b0cb825 100644
--- a/include/clixon_config.h.in
+++ b/include/clixon_config.h.in
@@ -27,9 +27,6 @@
 /* Define to 1 if you have the <crypt.h> header file. */
 #undef HAVE_CRYPT_H
 
-/* Define to 1 if you have the <depot.h> header file. */
-#undef HAVE_DEPOT_H
-
 /* Define to 1 if you have the `inet_aton' function. */
 #undef HAVE_INET_ATON
 
@@ -54,9 +51,6 @@
 /* Define to 1 if you have the `nsl' library (-lnsl). */
 #undef HAVE_LIBNSL
 
-/* Define to 1 if you have the `qdbm' library (-lqdbm). */
-#undef HAVE_LIBQDBM
-
 /* Define to 1 if you have the `socket' library (-lsocket). */
 #undef HAVE_LIBSOCKET
 
@@ -66,9 +60,6 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
-/* Define to 1 if you have the <qdbm/depot.h> header file. */
-#undef HAVE_QDBM_DEPOT_H
-
 /* Define to 1 if you have the `sigaction' function. */
 #undef HAVE_SIGACTION
 
diff --git a/include/clixon_config.h.in~ b/include/clixon_config.h.in~
new file mode 100644
index 00000000..d356c165
--- /dev/null
+++ b/include/clixon_config.h.in~
@@ -0,0 +1,142 @@
+/* include/clixon_config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Clixon data dir for system yang files etc */
+#undef CLIXON_DATADIR
+
+/* Location for apps to find default config file */
+#undef CLIXON_DEFAULT_CONFIG
+
+/* Clixon major release */
+#undef CLIXON_VERSION_MAJOR
+
+/* Clixon minor release */
+#undef CLIXON_VERSION_MINOR
+
+/* Clixon path version */
+#undef CLIXON_VERSION_PATCH
+
+/* Clixon version string */
+#undef CLIXON_VERSION_STRING
+
+/* Define to 1 if you have the `alphasort' function. */
+#undef HAVE_ALPHASORT
+
+/* Define to 1 if you have the <cligen/cligen.h> header file. */
+#undef HAVE_CLIGEN_CLIGEN_H
+
+/* Define to 1 if you have the <crypt.h> header file. */
+#undef HAVE_CRYPT_H
+
+/* Define to 1 if you have the <depot.h> header file. */
+#undef HAVE_DEPOT_H
+
+/* Define to 1 if you have the `inet_aton' function. */
+#undef HAVE_INET_ATON
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `cligen' library (-lcligen). */
+#undef HAVE_LIBCLIGEN
+
+/* Define to 1 if you have the `crypt' library (-lcrypt). */
+#undef HAVE_LIBCRYPT
+
+/* Define to 1 if you have the `dl' library (-ldl). */
+#undef HAVE_LIBDL
+
+/* Define to 1 if you have the `fcgi' library (-lfcgi). */
+#undef HAVE_LIBFCGI
+
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
+/* Define to 1 if you have the `nsl' library (-lnsl). */
+#undef HAVE_LIBNSL
+
+/* Define to 1 if you have the `qdbm' library (-lqdbm). */
+#undef HAVE_LIBQDBM
+
+/* Define to 1 if you have the `socket' library (-lsocket). */
+#undef HAVE_LIBSOCKET
+
+/* Define to 1 if you have the <linux/if_vlan.h> header file. */
+#undef HAVE_LINUX_IF_VLAN_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <qdbm/depot.h> header file. */
+#undef HAVE_QDBM_DEPOT_H
+
+/* Define to 1 if you have the `sigaction' function. */
+#undef HAVE_SIGACTION
+
+/* Define to 1 if you have the `sigvec' function. */
+#undef HAVE_SIGVEC
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strlcpy' function. */
+#undef HAVE_STRLCPY
+
+/* Define to 1 if you have the `strndup' function. */
+#undef HAVE_STRNDUP
+
+/* Define to 1 if you have the `strsep' function. */
+#undef HAVE_STRSEP
+
+/* Define to 1 if you have the `strverscmp' function. */
+#undef HAVE_STRVERSCMP
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <sys/ucred.h> header file. */
+#undef HAVE_SYS_UCRED_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the `versionsort' function. */
+#undef HAVE_VERSIONSORT
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+   `char[]'. */
+#undef YYTEXT_POINTER
+
+#include <clixon_custom.h>
diff --git a/include/clixon_config.h~ b/include/clixon_config.h~
new file mode 100644
index 00000000..5be37864
--- /dev/null
+++ b/include/clixon_config.h~
@@ -0,0 +1,134 @@
+/* include/clixon_config.h.  Generated from clixon_config.h.in by configure.  */
+/* include/clixon_config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Clixon major release */
+#define CLIXON_VERSION_MAJOR 3
+
+/* Clixon minor release */
+#define CLIXON_VERSION_MINOR 3
+
+/* Clixon path version */
+#define CLIXON_VERSION_PATCH 2
+
+/* Clixon version string */
+#define CLIXON_VERSION_STRING "3.3.2"
+
+/* Define to 1 if you have the `alphasort' function. */
+#define HAVE_ALPHASORT 1
+
+/* Define to 1 if you have the <cligen/cligen.h> header file. */
+#define HAVE_CLIGEN_CLIGEN_H 1
+
+/* Define to 1 if you have the <crypt.h> header file. */
+#define HAVE_CRYPT_H 1
+
+/* Define to 1 if you have the <depot.h> header file. */
+/* #undef HAVE_DEPOT_H */
+
+/* Define to 1 if you have the `inet_aton' function. */
+#define HAVE_INET_ATON 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `crypt' library (-lcrypt). */
+#define HAVE_LIBCRYPT 1
+
+/* Define to 1 if you have the `dl' library (-ldl). */
+#define HAVE_LIBDL 1
+
+/* Define to 1 if you have the `fcgi' library (-lfcgi). */
+#define HAVE_LIBFCGI 1
+
+/* Define to 1 if you have the `m' library (-lm). */
+#define HAVE_LIBM 1
+
+/* Define to 1 if you have the `nsl' library (-lnsl). */
+#define HAVE_LIBNSL 1
+
+/* Define to 1 if you have the `qdbm' library (-lqdbm). */
+#define HAVE_LIBQDBM 1
+
+/* Define to 1 if you have the `socket' library (-lsocket). */
+/* #undef HAVE_LIBSOCKET */
+
+/* Define to 1 if you have the <linux/if_vlan.h> header file. */
+#define HAVE_LINUX_IF_VLAN_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <qdbm/depot.h> header file. */
+#define HAVE_QDBM_DEPOT_H 1
+
+/* Define to 1 if you have the `sigaction' function. */
+#define HAVE_SIGACTION 1
+
+/* Define to 1 if you have the `sigvec' function. */
+#define HAVE_SIGVEC 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strlcpy' function. */
+/* #undef HAVE_STRLCPY */
+
+/* Define to 1 if you have the `strndup' function. */
+#define HAVE_STRNDUP 1
+
+/* Define to 1 if you have the `strsep' function. */
+#define HAVE_STRSEP 1
+
+/* Define to 1 if you have the `strverscmp' function. */
+#define HAVE_STRVERSCMP 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/ucred.h> header file. */
+/* #undef HAVE_SYS_UCRED_H */
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the `versionsort' function. */
+#define HAVE_VERSIONSORT 1
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+   `char[]'. */
+#define YYTEXT_POINTER 1
+
+#include <clixon_custom.h>