diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff9c8650..b9538186 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Clixon Changelog
 
+## 3.8.0 (Upcoming)
+
+### Major New features
+
+### API changes on existing features (you may need to change your code)
+
+### Minor changes
+* Obsoleted COMPAT_CLIV and COMPAT_XSL that were optional in 3.7
+
+### Corrected Bugs
+
+### Known issues
+* Namespace name relabeling is not supported.
+  * Eg: if "des" is defined as prefix for an imported module, then a relabeling using xmlfns is not supported, such as:
+```
+  <crypto xmlns:x="urn:example:des">x:des3</crypto>
+```
+
 ## 3.7.0 (22 July 2018)
 
 ### Major New features
diff --git a/apps/backend/backend_client.c b/apps/backend/backend_client.c
index 7ffdbf2b..224b371d 100644
--- a/apps/backend/backend_client.c
+++ b/apps/backend/backend_client.c
@@ -987,13 +987,7 @@ nacm_access(clicon_handle h,
     if (username == NULL)
 	goto step10;
     /* User's group */
-    if (xpath_vec(xacm,
-#ifdef COMPAT_XSL
-		  "groups/group[user-name=%s]",
-#else
-		  "groups/group[user-name='%s']",
-#endif
-		  &gvec, &glen, username) < 0)
+    if (xpath_vec(xacm, "groups/group[user-name='%s']", &gvec, &glen, username) < 0)
 	goto done;
     /* 5. If no groups are found, continue with step 10. */
     if (glen == 0)
@@ -1010,13 +1004,7 @@ nacm_access(clicon_handle h,
 	for (j=0; j<glen; j++){
 	    char *gname;
 	    gname = xml_find_body(gvec[j], "name");
-	    if (xpath_first(xrlist,
-#ifdef COMPAT_XSL
-			    ".[group=%s]",
-#else
-			    ".[group='%s']",
-#endif
-			    gname)!=NULL)
+	    if (xpath_first(xrlist, ".[group='%s']", gname)!=NULL)
 		break; /* found */
 	}
 	if (j==glen) /* not found */
diff --git a/apps/cli/cli_common.c b/apps/cli/cli_common.c
index 03ba734c..7e6f1307 100644
--- a/apps/cli/cli_common.c
+++ b/apps/cli/cli_common.c
@@ -1038,79 +1038,6 @@ cli_notify(clicon_handle h,
     return retval;
 }
 
-/* Backward compatible Set if you want to enable "v" cli callback functions, 
- * such as cli_setv() 
- * This was obsoleted in 3.7. 
- * @see include/clixon_custom.h
- */
-#ifdef COMPAT_CLIV
-int cli_setv(clicon_handle h, cvec *vars, cvec *argv)
-{
-    return cli_set(h, vars, argv);
-}
-int cli_mergev(clicon_handle h, cvec *vars, cvec *argv)
-{
-    return cli_merge(h, vars, argv);
-}
-int cli_delv(clicon_handle h, cvec *vars, cvec *argv)
-{
-    return cli_del(h, vars, argv);
-}
-int cli_debug_cliv(clicon_handle h, cvec *vars, cvec *argv)
-{
-    return cli_debug_cli(h, vars, argv);
-}
-int cli_debug_backendv(clicon_handle h, cvec *vars, cvec *argv)
-{
-    return cli_debug_backend(h, vars, argv);
-}
-int cli_set_modev(clicon_handle h, cvec *vars, cvec *argv)
-{
-    return cli_set_mode(h, vars, argv);
-}
-int cli_start_shellv(clicon_handle h, cvec *vars, cvec *argv)
-{
-    return cli_start_shell(h, vars, argv);
-}
-int cli_quitv(clicon_handle h, cvec *vars, cvec *argv)
-{
-    return cli_quit(h, vars, argv);
-}
-int cli_commitv(clicon_handle h, cvec *vars, cvec *argv)
-{
-    return cli_commit(h, vars, argv);
-}
-int cli_validatev(clicon_handle h, cvec *vars, cvec *argv)
-{
-    return cli_validate(h, vars, argv);
-
-}
-int compare_dbsv(clicon_handle h, cvec *vars, cvec *argv)
-{
-    return compare_dbs(h, vars, argv);
-}
-int load_config_filev(clicon_handle h, cvec *vars, cvec *argv)
-{
-    return load_config_file(h, vars, argv);
-}
-int save_config_filev(clicon_handle h, cvec *vars, cvec *argv)
-{
-    return save_config_file(h, vars, argv);
-}
-int delete_allv(clicon_handle h, cvec *vars, cvec *argv)
-{
-    return delete_all(h, vars, argv);
-}
-int discard_changesv(clicon_handle h, cvec *vars, cvec *argv)
-{
-    return discard_changes(h, vars, argv);
-}
-int cli_notifyv(clicon_handle h, cvec *vars, cvec *argv)
-{
-    return cli_notify(h, vars, argv);
-}
-#endif /* COMPAT_CLIV */
-
 /*! Lock database
  * 
  * @param[in] h      Clicon handle
@@ -1249,23 +1176,6 @@ cli_copy_config(clicon_handle h,
     for (i=0; i<strlen(xpath); i++){
 	if (xpath[i] == '%')
 	    j++;
-#ifdef COMPAT_XSL
-	/* This is a horrible kludge due to:
-	 * (1) old xpath implementation wrongly did: a[b=x] instead of a[b='x']
-	 * (2) cli_copy_config has as 2nd argument such an xpath provided by user.
-	 */
-	if (j==2){
-	    int k;
-	    if ((xpath[i-1] == '\'' || xpath[i-1] == '\"') &&
-		(xpath[i+2] == '\'' || xpath[i+2] == '\"')){
-		for (k=i-1;k<i+2;k++)
-		    xpath[k] =  xpath[k+1];
-		for (k=i+1;k<strlen(xpath)+1;k++)
-		    xpath[k] = xpath[k+2];
-		i-=1;
-	    }
-	}
-#endif	
     }
     if (j != 2){
 	clicon_err(OE_PLUGIN, 0, "xpath '%s' does not have two '%%'", xpath);	
diff --git a/apps/cli/cli_show.c b/apps/cli/cli_show.c
index 12d8c800..2e56f329 100644
--- a/apps/cli/cli_show.c
+++ b/apps/cli/cli_show.c
@@ -686,13 +686,4 @@ cli_show_auto(clicon_handle h,
     return retval;
 }
 
-#ifdef COMPAT_CLIV
-int show_yangv(clicon_handle h, cvec *vars, cvec *argv)
-{
-    return show_yang(h, vars, argv);
-}
-int show_confv_xpath(clicon_handle h, cvec *vars, cvec *argv)
-{
-    return show_conf_xpath(h, vars, argv);
-}
-#endif /* COMPAT_CLIV */
+
diff --git a/apps/cli/clixon_cli_api.h b/apps/cli/clixon_cli_api.h
index c31645ba..3507e31f 100644
--- a/apps/cli/clixon_cli_api.h
+++ b/apps/cli/clixon_cli_api.h
@@ -144,25 +144,4 @@ int cli_show_config(clicon_handle h, cvec *cvv, cvec *argv);
 
 int cli_show_auto(clicon_handle h, cvec *cvv, cvec *argv);
 
-#ifdef COMPAT_CLIV
-int cli_setv(clicon_handle h, cvec *vars, cvec *argv);
-int cli_mergev(clicon_handle h, cvec *vars, cvec *argv);
-int cli_delv(clicon_handle h, cvec *vars, cvec *argv);
-int cli_debug_cliv(clicon_handle h, cvec *vars, cvec *argv);
-int cli_debug_backendv(clicon_handle h, cvec *vars, cvec *argv);
-int cli_set_modev(clicon_handle h, cvec *vars, cvec *argv);
-int cli_start_shellv(clicon_handle h, cvec *vars, cvec *argv);
-int cli_quitv(clicon_handle h, cvec *vars, cvec *argv);
-int cli_commitv(clicon_handle h, cvec *vars, cvec *argv);
-int cli_validatev(clicon_handle h, cvec *vars, cvec *argv);
-int compare_dbsv(clicon_handle h, cvec *vars, cvec *argv);
-int load_config_filev(clicon_handle h, cvec *vars, cvec *argv);
-int save_config_filev(clicon_handle h, cvec *vars, cvec *argv);
-int delete_allv(clicon_handle h, cvec *vars, cvec *argv);
-int discard_changesv(clicon_handle h, cvec *vars, cvec *argv);
-int cli_notifyv(clicon_handle h, cvec *cvv, cvec *argv);
-int show_yangv(clicon_handle h, cvec *vars, cvec *argv);
-int show_confv_xpath(clicon_handle h, cvec *cvv, cvec *argv);
-#endif /* COMPAT_CLIV */
-
 #endif /* _CLIXON_CLI_API_H_ */
diff --git a/configure b/configure
index a6e6a366..3eaead6b 100755
--- a/configure
+++ b/configure
@@ -2155,9 +2155,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 : ${INSTALLFLAGS="-s"}
 
 CLIXON_VERSION_MAJOR="3"
-CLIXON_VERSION_MINOR="7"
+CLIXON_VERSION_MINOR="8"
 CLIXON_VERSION_PATCH="0"
-CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\""
+CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}.PRE\""
 
 # Fix to specific CLIgen version (eg 3.5) or head (3)
 CLIGEN_VERSION="3"
diff --git a/configure.ac b/configure.ac
index 964141c1..03943911 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,9 +43,9 @@ AC_INIT(lib/clixon/clixon.h.in)
 : ${INSTALLFLAGS="-s"}
 
 CLIXON_VERSION_MAJOR="3"
-CLIXON_VERSION_MINOR="7"
+CLIXON_VERSION_MINOR="8"
 CLIXON_VERSION_PATCH="0"
-CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\""
+CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}.PRE\""
 
 # Fix to specific CLIgen version (eg 3.5) or head (3) 
 CLIGEN_VERSION="3" 
diff --git a/example/example_cli.c b/example/example_cli.c
index f5c11b29..99c38368 100644
--- a/example/example_cli.c
+++ b/example/example_cli.c
@@ -68,11 +68,7 @@ mycallback(clicon_handle h, cvec *cvv, cvec *argv)
 
     /* Show eth0 interfaces config using XPATH */
     if (clicon_rpc_get_config(h, "running",
-#ifdef COMPAT_XSL
-			      "/interfaces/interface[name=eth0]",
-#else
 			      "/interfaces/interface[name='eth0']",
-#endif
 			      &xret) < 0)
 	goto done;
 
diff --git a/include/clixon_custom.h b/include/clixon_custom.h
index 9a9fa38c..8bad0f92 100644
--- a/include/clixon_custom.h
+++ b/include/clixon_custom.h
@@ -43,11 +43,6 @@
 int strverscmp (__const char *__s1, __const char *__s2);
 #endif
 
-/* Set if you want to enable "v" cli callback functions, such as cli_setv() 
- * This was obsoleted in 3.7
- */
-#undef COMPAT_CLIV
-
 /* Set if you want to assert that all rpc messages have set username
  */
 #undef RPC_USERNAME_ASSERT
@@ -56,13 +51,3 @@ int strverscmp (__const char *__s1, __const char *__s2);
 */
 #define XMLNS_YANG_ONLY 1
 
-/* Set if you want to enable old xpath functions in clixon_xsl.* instead of the
- * the new xpath functions in clixon_xpath.*
- * Note that when changing from old xpath code to new, calls on the form 
- * `x[a=str]` where `str` is a  string (not a number or XML symbol), 
- * must be changed to: `x[a='str'] or x[a="str"]`
- * Enabling COMPAT_XSL may make sense if you have written a lot of user code that 
- * relieson the error above. Or if a bug appears in the newimplementation.
- * @see test/lib.sh
- */
-#undef COMPAT_XSL
diff --git a/lib/clixon/clixon.h.in b/lib/clixon/clixon.h.in
index dfa82bc4..f3901788 100644
--- a/lib/clixon/clixon.h.in
+++ b/lib/clixon/clixon.h.in
@@ -81,7 +81,6 @@
 #include <clixon/clixon_options.h>
 #include <clixon/clixon_xml_map.h>
 #include <clixon/clixon_xml_db.h>
-#include <clixon/clixon_xsl.h>
 #include <clixon/clixon_xpath_ctx.h>
 #include <clixon/clixon_xpath.h>
 #include <clixon/clixon_json.h>
diff --git a/lib/clixon/clixon_xsl.h b/lib/clixon/clixon_xsl.h
deleted file mode 100644
index 5d572528..00000000
--- a/lib/clixon/clixon_xsl.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *
-  ***** BEGIN LICENSE BLOCK *****
- 
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
-
-  This file is part of CLIXON.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of
-  the GNU General Public License Version 3 or later (the "GPL"),
-  in which case the provisions of the GPL are applicable instead
-  of those above. If you wish to allow use of your version of this file only
-  under the terms of the GPL, and not to allow others to
-  use your version of this file under the terms of Apache License version 2, 
-  indicate your decision by deleting the provisions above and replace them with
-  the  notice and other provisions required by the GPL. If you do not delete
-  the provisions above, a recipient may use your version of this file under
-  the terms of any one of the Apache License version 2 or the GPL.
-
-  ***** END LICENSE BLOCK *****
-
- * XML XPATH and XSLT functions.
- */
-#ifndef _CLIXON_XSL_H
-#define _CLIXON_XSL_H
-
-/*
- * Prototypes
- */
-int xpath_vec_xsl(cxobj *cxtop, char *xpath, cxobj ***vec, size_t  *veclen);
-int xpath_vec_flag_xsl(cxobj *cxtop, char *xpath, uint16_t flags, 
-		       cxobj ***vec, size_t *veclen);
-cxobj *xpath_first_xsl(cxobj *cxtop, char *xpath);
-#ifdef COMPAT_XSL
-cxobj *xpath_each(cxobj *xn_top, char *xpath, cxobj *prev);
-#endif
-
-#endif /* _CLIXON_XSL_H */
diff --git a/lib/src/Makefile.in b/lib/src/Makefile.in
index a37680c9..23126689 100644
--- a/lib/src/Makefile.in
+++ b/lib/src/Makefile.in
@@ -72,7 +72,7 @@ SRC     = clixon_sig.c clixon_log.c clixon_err.c clixon_event.c \
 	  clixon_json.c clixon_yang.c clixon_yang_type.c \
 	  clixon_hash.c clixon_options.c clixon_plugin.c \
 	  clixon_proto.c clixon_proto_client.c \
-	  clixon_xsl.c clixon_xpath.c clixon_xpath_ctx.c clixon_sha1.c \
+	  clixon_xpath.c clixon_xpath_ctx.c clixon_sha1.c \
 	  clixon_xml_db.c clixon_netconf_lib.c
 
 YACCOBJS := lex.clixon_xml_parse.o clixon_xml_parse.tab.o \
diff --git a/lib/src/clixon_options.c b/lib/src/clixon_options.c
index cfd0d76c..7b97439f 100644
--- a/lib/src/clixon_options.c
+++ b/lib/src/clixon_options.c
@@ -67,7 +67,6 @@
 #include "clixon_options.h"
 #include "clixon_xml.h"
 #include "clixon_plugin.h"
-#include "clixon_xsl.h"
 #include "clixon_xpath_ctx.h"
 #include "clixon_xpath.h"
 #include "clixon_xml_map.h"
diff --git a/lib/src/clixon_proto.c b/lib/src/clixon_proto.c
index 2a71992e..6b41c6a5 100644
--- a/lib/src/clixon_proto.c
+++ b/lib/src/clixon_proto.c
@@ -71,7 +71,6 @@
 #include "clixon_yang.h"
 #include "clixon_sig.h"
 #include "clixon_xml.h"
-#include "clixon_xsl.h"
 #include "clixon_proto.h"
 
 static int _atomicio_sig = 0;
diff --git a/lib/src/clixon_proto_client.c b/lib/src/clixon_proto_client.c
index 35c4b28c..63c4e4cf 100644
--- a/lib/src/clixon_proto_client.c
+++ b/lib/src/clixon_proto_client.c
@@ -64,7 +64,6 @@
 #include "clixon_options.h"
 #include "clixon_xml.h"
 #include "clixon_plugin.h"
-#include "clixon_xsl.h"
 #include "clixon_string.h"
 #include "clixon_xpath_ctx.h"
 #include "clixon_xpath.h"
diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c
index 301dfa0d..4576fc82 100644
--- a/lib/src/clixon_xml_map.c
+++ b/lib/src/clixon_xml_map.c
@@ -85,7 +85,6 @@
 #include "clixon_plugin.h"
 #include "clixon_xpath_ctx.h"
 #include "clixon_xpath.h"
-#include "clixon_xsl.h"
 #include "clixon_log.h"
 #include "clixon_err.h"
 #include "clixon_xml_sort.h"
@@ -1088,13 +1087,7 @@ api_path_fmt2xpath(char  *api_path_fmt,
 		    clicon_err(OE_UNIX, errno, "cv2str_dup");
 		    goto done;
 		}
-		cprintf(cb,
-#ifdef COMPAT_XSL
-			"[%s=%s]",
-#else
-			"[%s='%s']",
-#endif
-			cv_name_get(cv), str);
+		cprintf(cb, "[%s='%s']", cv_name_get(cv), str);
 		free(str);
 	    }
 	}
@@ -1511,13 +1504,7 @@ api_path2xpath_cvv(yang_spec *yspec,
 	    cprintf(xpath, "/%s", name);
 	    v = val;
 	    while ((cvi = cvec_each(cvk, cvi)) != NULL){
-		cprintf(xpath,
-#ifdef COMPAT_XSL
-			"[%s=%s]",
-#else
-			"[%s='%s']",
-#endif
-			cv_string_get(cvi), v);
+		cprintf(xpath, "[%s='%s']", cv_string_get(cvi), v);
 		v += strlen(v)+1;
 	    }
 	    if (val)
diff --git a/lib/src/clixon_xpath.c b/lib/src/clixon_xpath.c
index 173b30e5..e4c9513a 100644
--- a/lib/src/clixon_xpath.c
+++ b/lib/src/clixon_xpath.c
@@ -62,7 +62,6 @@
 #include "clixon_handle.h"
 #include "clixon_yang.h"
 #include "clixon_xml.h"
-#include "clixon_xsl.h"
 #include "clixon_xpath_parse.h"
 #include "clixon_xpath_ctx.h"
 #include "clixon_xpath.h"
@@ -1142,16 +1141,11 @@ xpath_first(cxobj    *xcur,
 	goto done;
     }
     va_end(ap);
-#ifdef COMPAT_XSL
-    if ((cx = xpath_first_xsl(xcur, xpath)) == NULL)
-	goto done;
-#else
     if (xpath_vec_ctx(xcur, xpath, &xr) < 0)
 	goto done;
 
     if (xr && xr->xc_type == XT_NODESET && xr->xc_size)
 	cx = xr->xc_nodeset[0];
-#endif
  done:
     if (xr)
 	ctx_free(xr);
@@ -1211,10 +1205,6 @@ xpath_vec(cxobj    *xcur,
     va_end(ap);
     *vec=NULL;
     *veclen = 0;
-#ifdef COMPAT_XSL
-    if (xpath_vec_xsl(xcur, xpath, vec, veclen) < 0)
-	goto done;
-#else
     if (xpath_vec_ctx(xcur, xpath, &xr) < 0)
 	goto done;
     if (xr && xr->xc_type == XT_NODESET){
@@ -1222,7 +1212,6 @@ xpath_vec(cxobj    *xcur,
 	xr->xc_nodeset = NULL;
 	*veclen = xr->xc_size;
     }
-#endif
     retval = 0;
  done:
     if (xr)
@@ -1268,10 +1257,8 @@ xpath_vec_flag(cxobj    *xcur,
     size_t     len;
     char      *xpath = NULL;
     xp_ctx    *xr = NULL;
-#ifndef COMPAT_XSL
     int        i;
     cxobj     *x;
-#endif
     
     va_start(ap, veclen);    
     len = vsnprintf(NULL, 0, format, ap);
@@ -1291,10 +1278,6 @@ xpath_vec_flag(cxobj    *xcur,
     va_end(ap);
     *vec=NULL;
     *veclen = 0;
-#ifdef COMPAT_XSL
-    if (xpath_vec_flag_xsl(xcur, xpath, flags, vec, veclen) < 0)
-	goto done;
-#else
     if (xpath_vec_ctx(xcur, xpath, &xr) < 0)
 	goto done;
     if (xr && xr->xc_type == XT_NODESET){
@@ -1305,8 +1288,6 @@ xpath_vec_flag(cxobj    *xcur,
 		    goto done;		
 	}
     }
-#endif
-
     retval = 0;
  done:
     if (xr)
diff --git a/lib/src/clixon_xsl.c b/lib/src/clixon_xsl.c
deleted file mode 100644
index 86ab22e8..00000000
--- a/lib/src/clixon_xsl.c
+++ /dev/null
@@ -1,1041 +0,0 @@
-/*
- *
-  ***** BEGIN LICENSE BLOCK *****
- 
-  Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
-
-  This file is part of CLIXON.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of
-  the GNU General Public License Version 3 or later (the "GPL"),
-  in which case the provisions of the GPL are applicable instead
-  of those above. If you wish to allow use of your version of this file only
-  under the terms of the GPL, and not to allow others to
-  use your version of this file under the terms of Apache License version 2, indicate
-  your decision by deleting the provisions above and replace them with the 
-  notice and other provisions required by the GPL. If you do not delete
-  the provisions above, a recipient may use your version of this file under
-  the terms of any one of the Apache License version 2 or the GPL.
-
-  ***** END LICENSE BLOCK *****
-
- * Limited XML XPATH and XSLT functions.
- * NOTE: there is a main function at the end of this file where you can test out
- * different xpath expressions.
- * Look at the end of the file for a test unit program
-
-The code is implemented according to XPATH 1.0: 
-   https://www.w3.org/TR/xpath-10/
-
-The primary syntactic construct in XPath is the expression. An expression matches 
-the production Expr (see https://www.w3.org/TR/xpath-10/#NT-Expr)
- */
-#ifdef HAVE_CONFIG_H
-#include "clixon_config.h" /* generated by config & autoconf */
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <limits.h>
-#include <fnmatch.h>
-#include <stdint.h>
-#include <assert.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <math.h>
-
-/* cligen */
-#include <cligen/cligen.h>
-
-/* clicon */
-#include "clixon_err.h"
-#include "clixon_log.h"
-#include "clixon_string.h"
-#include "clixon_queue.h"
-#include "clixon_hash.h"
-#include "clixon_handle.h"
-#include "clixon_yang.h"
-#include "clixon_xml.h"
-#include "clixon_xpath_ctx.h"
-#include "clixon_xpath.h"
-#include "clixon_xsl.h"
-
-
-/* Constants */
-#define XPATH_VEC_START 128
-
-/*
- * Types 
- */
-
-struct searchvec{
-    cxobj    **sv_v0;   /* here is result */
-    int        sv_v0len;
-    cxobj    **sv_v1;   /* this is tmp storage */
-    int        sv_v1len;
-    int        sv_max;
-};
-typedef struct searchvec searchvec;
-
-/* Local types 
- */
-
-struct xpath_predicate{
-    struct xpath_predicate *xp_next;
-    char                   *xp_expr;
-};
-
-/* XPATH Axis according to https://www.w3.org/TR/xpath-10/#NT-Step
- * Axis ::= AxisSpecifier NodeTest Predicate*	
- * Eg "child:: 
- */
-struct xpath_element{
-    struct xpath_element   *xe_next;
-    enum axis_type          xe_type;
-    char                   *xe_prefix;    /* eg for namespaces */
-    char                   *xe_str;       /* eg for child */
-    struct xpath_predicate *xe_predicate; /* eg within [] */
-};
-
-/* Mapping between axis type string <--> int  */
-static const map_str2int axismap[] = {
-    {"self",             A_SELF}, 
-    {"child",            A_CHILD}, 
-    {"parent",           A_PARENT},
-    {"root",             A_ROOT},
-    {"ancestor",         A_ANCESTOR}, 
-    {"descendant-or-self", A_DESCENDANT_OR_SELF}, 
-    {NULL,               -1}
-};
-
-static int xpath_split(char *xpathstr, char **pathexpr);
-
-/*! Print xpath structure for debug */
-static int 
-xpath_print(FILE                 *f,
-	    struct xpath_element *xplist)
-{
-    struct xpath_element   *xe;
-    struct xpath_predicate *xp;
-
-    for (xe=xplist; xe; xe=xe->xe_next){
-	fprintf(f, "\t:%s %s ", clicon_int2str(axismap, xe->xe_type),
-		xe->xe_str?xe->xe_str:"");
-        for (xp=xe->xe_predicate; xp; xp=xp->xp_next)
-	    fprintf(f, "[%s]", xp->xp_expr);
-    }
-    return 0;
-}
-
-/*! Extract PredicateExpr (Expr) from a Predicate within [] 
- * @see xpath_expr  For evaluation of predicate 
- */
-static int
-xpath_parse_predicate(struct xpath_element *xe,
-		      char                 *pred)
-{
-    int                     retval = -1;
-    struct xpath_predicate *xp;
-    char                   *s;
-    int                     i;
-    int                     len;
-
-    len = strlen(pred);
-    for (i=len-1; i>=0; i--){ /* -1 since we search for ][ */
-	s = &pred[i];
-	if (i==0 || 
-	    (*(s)==']' && *(s+1)=='[')){
-	    if (i) {
-		*(s)= '\0';
-		s += 2;
-	    }
-	    if ((xp = malloc(sizeof(*xp))) == NULL){
-		clicon_err(OE_UNIX, errno, "malloc");
-		goto done;
-	    }	
-	    memset(xp, 0, sizeof(*xp));    
-	    if ((xp->xp_expr = strdup(s)) == NULL){	    
-		clicon_err(OE_XML, errno, "strdup");
-		goto done;
-	    }
-	    xp->xp_next = xe->xe_predicate;
-	    xe->xe_predicate = xp;
-	}
-    }
-    retval = 0;
- done:
-    return retval;
-}
-
-/*! XPATH parse, create new child element
- * @param[in]  atype  Axis type, see https://www.w3.org/TR/xpath-10/#axes
- * @param[in]  str
- * @param[out] xpnext
- */
-static int
-xpath_element_new(enum axis_type          atype, 
-		  char                   *str,
-		  struct xpath_element ***xpnext)
-{
-    int                     retval = -1;
-    struct xpath_element   *xe;
-    char                   *str1 = NULL;
-    char                   *pred;
-    char                   *local;
-
-    if ((xe = malloc(sizeof(*xe))) == NULL){
-	clicon_err(OE_UNIX, errno, "malloc");
-	goto done;
-    }
-    memset(xe, 0, sizeof(*xe));
-    xe->xe_type = atype;
-    if (str){
-	if ((str1 = strdup(str)) == NULL){
-	    clicon_err(OE_XML, errno, "strdup");
-	    goto done;
-	}
-	if (xpath_split(str1, &pred) < 0) /* Can be more predicates */
-	    goto done;
-	if (strlen(str1)){
-	    /* Split into prefix and localname */
-	    if ((local = index(str1, ':')) != NULL){
-		*local = '\0';
-		local++;
-		if ((xe->xe_prefix = strdup(str1)) == NULL){
-		    clicon_err(OE_XML, errno, "strdup");
-		    goto done;
-		}
-	    }
-	    else
-		local = str1;
-	    if ((xe->xe_str = strdup(local)) == NULL){
-		clicon_err(OE_XML, errno, "strdup");
-		goto done;
-	    }
-	}
-	else{
-	    if ((xe->xe_str = strdup("*")) == NULL){
-		clicon_err(OE_XML, errno, "strdup");
-		goto done;
-	    }
-	}
-	if (pred && strlen(pred)){
-	    if (xpath_parse_predicate(xe, pred) < 0)
-		goto done;
-	}
-    }
-    (**xpnext) = xe;
-    *xpnext = &xe->xe_next;
-    retval = 0;
- done:
-    if (str1)
-	free(str1);
-    return retval;
-}
-
-static int
-xpath_element_free(struct xpath_element *xe)
-{
-    struct xpath_predicate *xp;
-
-    if (xe->xe_str)
-	free(xe->xe_str);
-    if (xe->xe_prefix)
-	free(xe->xe_prefix);
-    while ((xp = xe->xe_predicate) != NULL){
-	xe->xe_predicate = xp->xp_next;
-	if (xp->xp_expr)
-	    free(xp->xp_expr);
-	free(xp);
-    }
-    free(xe);
-    return 0;
-}
-
-static int
-xpath_free(struct xpath_element *xplist)
-{
-    struct xpath_element *xe, *xe_next;
-
-    for (xe=xplist; xe; xe=xe_next){
-	xe_next = xe->xe_next;
-	xpath_element_free(xe);
-    }
-    return 0;
-}
-
-/*! Parse xpath to xpath_element structure
-
- * 
- * [1] LocationPath	    ::= RelativeLocationPath	
- *			        | AbsoluteLocationPath	
- * [2] AbsoluteLocationPath ::= '/' RelativeLocationPath?	
- *			        | AbbreviatedAbsoluteLocationPath	
- * [3] RelativeLocationPath ::= Step	
-			        | RelativeLocationPath '/' Step	
-			        | AbbreviatedRelativeLocationPath	
- * @see https://www.w3.org/TR/xpath-10/#NT-LocationPath
- */
-static int
-xpath_parse(char                  *xpath, 
-	    struct xpath_element **xplist0)
-{
-    int                    retval = -1;
-    int                    nvec = 0;
-    char                  *s;
-    char                  *s0;
-    int                    i;
-    struct xpath_element  *xplist = NULL;
-    struct xpath_element **xpnext = &xplist;
-    int                    esc = 0;
-
-    if ((s0 = strdup(xpath)) == NULL){
-	clicon_err(OE_XML, errno, "strdup");
-	goto done;
-    }
-    s = s0;
-    if (strlen(s))
-	nvec = 1;
-    /* Chop up LocationPath in Steps delimited by '/' (unless [] predicate) 
-     * Eg, "/a/b[/c]/d" -> "a" "b[/c]" "d"
-     */
-    esc = 0;
-    while (*s != '\0'){
-	switch (*s){
-	case '/':
-	    if (esc)
-		break;
-	    nvec++;
-	    *s = '\0';
-	    break;
-	case '[':
-	    esc++;
-	    break;
-	case ']':
-	    esc--;
-	    break;
-	default:
-	    break;
-	}
-	s++;
-    }
-    /* Iterate through steps (s), see https://www.w3.org/TR/xpath-10/#NT-Step */
-    s = s0;
-    for (i=0; i<nvec; i++){
-	if ((i==0 && strcmp(s,"")==0)) /* Initial / or // */
-	    xpath_element_new(A_ROOT, NULL, &xpnext);
-	else if (i!=nvec-1 && strcmp(s,"")==0)
-	    xpath_element_new(A_DESCENDANT_OR_SELF, NULL, &xpnext);
-	else if (strncmp(s,"descendant-or-self::", strlen("descendant-or-self::"))==0){ 
-	    xpath_element_new(A_DESCENDANT_OR_SELF, s+strlen("descendant-or-self::"), &xpnext);
-	}
-	else if (strncmp(s,"..", strlen(".."))==0) /* abbreviatedstep */
-	    xpath_element_new(A_PARENT, s+strlen(".."), &xpnext);
-	else if (strncmp(s,".", strlen("."))==0)
-	    xpath_element_new(A_SELF, s+strlen("."), &xpnext);
-	else if (strncmp(s,"self::", strlen("self::"))==0)
-	    xpath_element_new(A_SELF, s+strlen("self::"), &xpnext);
-
-	else if (strncmp(s,"parent::", strlen("parent::"))==0)
-	    xpath_element_new(A_PARENT, s+strlen("parent::"), &xpnext);
-	else if (strncmp(s,"ancestor::", strlen("ancestor::"))==0)
-	    xpath_element_new(A_ANCESTOR, s+strlen("ancestor::"), &xpnext);
-	else if (strncmp(s,"child::", strlen("child::"))==0)
-	    xpath_element_new(A_CHILD, s+strlen("child::"), &xpnext);
-	else 
-	    xpath_element_new(A_CHILD, s, &xpnext);
-	s += strlen(s) + 1;
-    }
-    retval = 0;
- done:
-    if (s0)
-	free(s0);
-    if (retval == 0)
-	*xplist0 = xplist;
-    return retval;
-}
-
-/*! Find a node 'deep' in an XML tree
- *
- * The xv_* arguments are filled in  nodes found earlier.
- * args:
- *  @param[in]     xn_parent Base XML object
- *  @param[in]     pattern   Shell wildcard pattern to match with node name
- *  @param[in]     node_type CX_ELMNT, CX_ATTR or CX_BODY
- *  @param[in,out] vec0      Internal buffers with results
- *  @param[in,out] vec0len   Internal buffers with length of vec0
- * returns:
- *  0 on OK, -1 on error
- */
-static int
-xpath_recursive_find(cxobj   *xn, 
-		     char    *pattern, 
-		     int      node_type,
-		     uint16_t flags,
-		     cxobj ***vec0,
-		     size_t  *vec0len)
-{
-    int     retval = -1;
-    cxobj  *xsub; 
-    cxobj **vec = *vec0;
-    size_t  veclen = *vec0len;
-    char   *name;
-
-    xsub = NULL;
-    while ((xsub = xml_child_each(xn, xsub, node_type)) != NULL) {
-	name = xml_name(xsub);
-	if (fnmatch(pattern, name, 0) == 0){
-	    clicon_debug(2, "%s %x %x", __FUNCTION__, flags, xml_flag(xsub, flags));
-	    if (flags==0x0 || xml_flag(xsub, flags))
-		if (cxvec_append(xsub, &vec, &veclen) < 0)
-		    goto done;
-	    //	    continue; /* Dont go deeper */
-	}
-	if (xpath_recursive_find(xsub, pattern, node_type, flags, &vec, &veclen) < 0)
-	    goto done;
-    }
-    retval = 0;
-    *vec0 = vec;
-    *vec0len = veclen;
-  done:
-    return retval;
-}
-
-/* forward */
-static int
-xpath_exec(cxobj *xcur, char *xpath, cxobj **vec0, size_t vec0len,
-	   uint16_t flags, cxobj ***vec2, size_t *vec2len);
-
-/*! XPath predicate expression check
- * @param[in]  xcur  xml-tree where to search
- * @param[in]  predicate_expression     xpath expression as a string
- * @param[in]  flags   Extra xml flag checks that must match (apart from predicate)
- * @param[in,out] vec0    Vector or xml nodes that are checked. Not matched are filtered
- * @param[in,out] vec0len Length of vector or matches
- * On input, vec0 contains a list of xml nodes to match. 
- * On output, vec0 contains only the subset that matched the expression.
- * The predicate expression is a subset of the standard, namely:
- *  - @<attr>=<value>
- *  - <number>
- *  - <name>=<value> # RelationalExpr '=' RelationalExpr
- *  - <name>=current()<xpath> XXX
- * @see https://www.w3.org/TR/xpath/#predicates
- */
-static int
-xpath_expr(cxobj    *xcur, 
-	   char     *predicate_expression, 	   
-	   uint16_t  flags,
-	   cxobj  ***vec0,
-	   size_t   *vec0len)
-{
-    char      *e_a;
-    char      *e_v;
-    int        i;
-    int        j;
-    int        retval = -1;
-    cxobj     *x;
-    cxobj     *xv;
-    cxobj    **vec = NULL;
-    size_t     veclen = 0;
-    int        oplen;
-    char      *tag;
-    char      *val;
-    char      *e0;
-    char      *e;
-    char      *name;
-
-    if ((e0 = strdup(predicate_expression)) == NULL){
-	clicon_err(OE_UNIX, errno, "strdup");
-	goto done;
-    }
-    e = e0;
-    if (*e == '@'){ /* @ attribute */
-	e++;
-	e_v=e;
-	e_a = strsep(&e_v, "=");
-	if (e_a == NULL){
-	    clicon_err(OE_XML, errno, "malformed expression: [@%s]", e);
-	    goto done;
-	}
-	for (i=0; i<*vec0len; i++){
-	    xv = (*vec0)[i];
-	    if ((x = xml_find(xv, e_a)) != NULL &&
-		(xml_type(x) == CX_ATTR)){
-		if (!e_v || strcmp(xml_value(x), e_v) == 0){
-		    clicon_debug(2, "%s %x %x", __FUNCTION__, flags, xml_flag(xv, flags));
-		    if (flags==0x0 || xml_flag(xv, flags)){
-			if (cxvec_append(xv, &vec, &veclen) < 0)
-			    goto done;
-			break; /* xv added */
-		    }
-		}
-	    }
-	}
-    }
-    else{ /* either <n> or <tag><op><value>, where <op>='=' for now */
-	oplen = strcspn(e, "=");
-	if (strlen(e+oplen)==0){ /* no operator */
-	    if (sscanf(e, "%d", &i) == 1){ /* number */
-		if (i < *vec0len){
-		    xv = (*vec0)[i]; /* XXX: cant compress: gcc breaks */
-	    clicon_debug(2, "%s %x %x", __FUNCTION__, flags, xml_flag(xv, flags));
-		    if (flags==0x0 || xml_flag(xv, flags))
-			if (cxvec_append(xv, &vec, &veclen) < 0)
-			    goto done;
-		}
-	    }
-	    else{
-		clicon_err(OE_XML, errno, "malformed expression: [%s]", e);
-		goto done;
-	    }
-	}
-	else{ /* name = expr */
-	    if ((tag = strsep(&e, "=")) == NULL){
-		clicon_err(OE_XML, errno, "malformed expression: [%s]", e);
-		goto done;
-	    }
-	    /* Strip trailing spaces */
-	    while (tag[strlen(tag)-1] == ' ')
-		tag[strlen(tag)-1] = '\0';
-	    /* Strip heading spaces */
-	    while (e[0]==' ')
-		e++;
-	    if (strncmp(e, "current()", strlen("current()")) == 0){
-		/* name = current()xpath */
-		cxobj    **svec0 = NULL;
-		size_t     svec0len = 0;
-		cxobj    **svec1 = NULL;
-		size_t     svec1len = 0;
-		char      *ebody;
-
-		e += strlen("current("); /* e is path expression */
-		*e = '.';
-		if ((svec0 = calloc(1, sizeof(cxobj *))) == NULL){
-		    clicon_err(OE_UNIX, errno, "calloc");
-		    goto done;
-		}
-		svec0[0] = xcur;
-		svec0len++;
-		/* Recursive invocation */
-		if (xpath_exec(xcur, e, svec0, svec0len,
-			       flags, &svec1, &svec1len) < 0)
-		    goto done;
-		for (j=0; j<svec1len; j++){
-		    ebody = xml_body(svec1[j]);
-		    for (i=0; i<*vec0len; i++){
-			xv = (*vec0)[i];
-			x = NULL;
-			while ((x = xml_child_each(xv, x, CX_ELMNT)) != NULL) {
-			    name = xml_name(x);
-			    if (name==NULL || strcmp(tag, name) != 0)
-				continue;
-			    if ((val = xml_body(x)) != NULL &&
-				strcmp(val, ebody) == 0){	
-				clicon_debug(2, "%s %x %x", __FUNCTION__, flags, xml_flag(xv, flags));
-				if (flags==0x0 || xml_flag(xv, flags))
-				    if (cxvec_append(xv, &vec, &veclen) < 0)
-					goto done;
-			    }
-			}
-		    }
-		}
-	    }
-	    else { /* name = value */
-		for (i=0; i<*vec0len; i++){
-		    xv = (*vec0)[i];
-		    /* Check if more may match,... */
-		    x = NULL;
-		    while ((x = xml_child_each(xv, x, CX_ELMNT)) != NULL) {
-			name = xml_name(x);
-			if (name==NULL || strcmp(tag, name) != 0)
-			    continue;
-			if ((val = xml_body(x)) != NULL &&
-			    strcmp(val, e) == 0){
-			    clicon_debug(2, "%s %x %x", __FUNCTION__, flags, xml_flag(xv, flags));
-			    if (flags==0x0 || xml_flag(xv, flags))
-				if (cxvec_append(xv, &vec, &veclen) < 0)
-				    goto done;
-			}
-		    }
-		}
-	    }
-	}
-    }
-    /* copy the array from 1 to 0 */
-    free(*vec0);
-    *vec0 = vec;
-    *vec0len = veclen;
-    retval = 0;
-  done:
-    if (e0)
-	free(e0);
-    return retval;
-}
-
-/*! Given vec0, add matches to vec1
- * @param[in]   xcur  xml-tree where to search
- * @param[in]   xe      XPATH in structured (parsed) form
- * @param[in]   descendants0
- * @param[in]   vec0    vector of XML trees
- * @param[in]   vec0len length of XML trees
- * @param[in]   flags   if != 0, only match xml nodes matching flags
- * @param[out]  vec2    Result XML node vector
- * @param[out]  vec2len Length of result vector.
- */
-static int
-xpath_find(cxobj                *xcur, 
-	   struct xpath_element *xe,
-	   int                   descendants0,
-	   cxobj               **vec0,
-	   size_t                vec0len,
-	   uint16_t              flags,
-	   cxobj              ***vec2,
-	   size_t               *vec2len
-	   )
-{
-    int            retval = -1;
-    int            i;
-    int            j;
-    cxobj         *x = NULL;
-    cxobj         *xv;
-    int            descendants = 0;
-    cxobj        **vec1 = NULL;
-    cxobj         *xparent;
-    size_t         vec1len = 0;
-    struct xpath_predicate *xp;
-    char          *name;
-
-    if (xe == NULL){
-	for (i=0; i<vec0len; i++){
-	    xv = vec0[i];
-	    if (flags==0x0 || xml_flag(xv, flags))
-		cxvec_append(xv, vec2, vec2len);
-	}
-	free(vec0);
-	return 0;
-    }
-#if 0
-    fprintf(stderr, "%s: %s: \"%s\"\n", __FUNCTION__, 
-	    clicon_int2str(axismap, xe->xe_type), xe->xe_str?xe->xe_str:"");
-#endif
-    switch (xe->xe_type){
-    case A_SELF:
-	break;
-    case A_PARENT:
-	j = 0;
-	for (i=0; i<vec0len; i++){
-	    xv = vec0[i];
-	    if ((xparent = xml_parent(xv)) != NULL)
-		vec0[j++] = xparent;
-	}
-	vec0len = j;
-	break;
-    case A_ROOT: /* set list to NULL */
-	x = vec0[0];
-	assert(x != NULL);
-	while (xml_parent(x) != NULL)
-	    x = xml_parent(x);
-	free(vec0);
-	if ((vec0 = calloc(1, sizeof(cxobj *))) == NULL){
-	    clicon_err(OE_UNIX, errno, "calloc");
-	    goto done;
-	}
-	vec0[0] = x;
-	vec0len = 1;
-	break;
-    case A_CHILD:
-	if (descendants0){
-	    for (i=0; i<vec0len; i++){
-		xv = vec0[i];
-		if (xpath_recursive_find(xv, xe->xe_str, CX_ELMNT, flags, &vec1, &vec1len) < 0)
-		    goto done;
-	    }
-	}
-	else{
-	    for (i=0; i<vec0len; i++){
-		xv = vec0[i];
-		x = NULL;
-		while ((x = xml_child_each(xv, x, -1)) != NULL) {
-		    name = xml_name(x);
-		    if (name && fnmatch(xe->xe_str, name, 0) == 0) {
-				clicon_debug(2, "%s %x %x", __FUNCTION__, flags, xml_flag(x, flags));
-				if (flags==0x0 || xml_flag(x, flags))
-				    if (cxvec_append(x, &vec1, &vec1len) < 0)
-					goto done;
-			    }
-		}	    
-	    }
-	}
-	free(vec0);
-	vec0 = vec1;
-	vec0len = vec1len;
-	break;
-    case A_DESCENDANT_OR_SELF: 	
-	/* Instead of collecting all descendants (which we could)
-	   just set a flag and treat that in the next operation */
-	descendants++;
-	break;
-    default:
-	break;
-    }
-    /* remove duplicates 
-     *   This is cycle-heavy and I dont know when it is needed? 
-     */
-    if (0)
-	for (i=0; i<vec0len; i++){
-	    for (j=i+1; j<vec0len; j++){
-		if (vec0[i] == vec0[j]){
-		    memmove(vec0[j], vec0[j+1], (vec0len-j)*sizeof(cxobj*));
-		    vec0len--;
-		}
-	    }
-	}
-    for (xp = xe->xe_predicate; xp; xp = xp->xp_next){
-	if (xpath_expr(xcur, xp->xp_expr, flags, &vec0, &vec0len) < 0)
-	    goto done;
-    }
-
-    if (xpath_find(xcur, xe->xe_next, descendants, 
-		   vec0, vec0len, flags,
-		   vec2, vec2len) < 0)
-	goto done;
-    retval = 0;
- done:
-    return retval;
-}
-
-/*! Transform eg "a/b[kalle]" -> "a/b" e="kalle" 
- * @param[in,out] xpathstr  Eg "a/b[kalle]" -> "a/b"
- * @param[out]    pathexpr  Eg "kalle"
- * Which also means:
- *  "a/b[foo][bar]" -> pathexpr: "foo][bar" 
- * @note destructively modify xpathstr, no new strings allocated
- */
-static int
-xpath_split(char  *xpathstr, 
-	    char **pathexpr)
-{
-    int   retval = -1;
-    int   last;
-    char *pe = NULL;
-
-    if (strlen(xpathstr)){
-	last = strlen(xpathstr) - 1; /* XXX: this could be -1.. */
-	if (xpathstr[last] == ']'){
-	    xpathstr[last] = '\0';
-	    if (strlen(xpathstr)){
-		if ((pe = index(xpathstr,'[')) != NULL){
-		    *pe = '\0';
-		    pe++;
-		}
-	    }
-	    if (pe==NULL){
-		clicon_err(OE_XML, errno, "mismatched []: %s", xpathstr);
-		goto done;
-	    }
-	}
-    }
-    retval = 0;
-  done:
-    *pathexpr = pe;
-    return retval;
-}
-
-/*! Process single xpath expression on xml tree
- * @param[in]  xcur  xml-tree where to search
- * @param[in]  xpath   string with XPATH syntax
- * @param[in]  vec0    vector of XML trees
- * @param[in]  vec0len length of XML trees
- * @param[in]  flags   if != 0, only match xml nodes matching flags
- * @param[out] vec2    Result XML node vector
- * @param[out] vec2len Length of result vector.
- * @see https://www.w3.org/TR/xpath-10/#NT-LocationPath
- */
-static int
-xpath_exec(cxobj        *xcur, 
-	   char         *xpath, 
-	   cxobj       **vec0, 
-	   size_t        vec0len,
-	   uint16_t      flags,
-	   cxobj      ***vec2, 
-	   size_t       *vec2len)
-{
-    struct xpath_element *xplist;
-    cxobj               **vec1;
-    size_t                vec1len;
-
-    if (cxvec_dup(vec0, vec0len, &vec1, &vec1len) < 0)
-	goto done;
-    if (xpath_parse(xpath, &xplist) < 0)
-	goto done;
-    if (debug > 1)
-	xpath_print(stderr, xplist);
-    if (xpath_find(xcur, xplist, 0, vec1, vec1len, flags, vec2, vec2len) < 0)
-	goto done;
-    if (xpath_free(xplist) < 0)
-	goto done;
-  done:
-    return 0;
-} /* xpath_exec */
-
-
-/*! Intermediate xpath function to handle 'conditional' cases. 
- * @param[in]  xcur  xml-tree where to search
- * @param[in]  xpath   string with XPATH syntax
- * @param[in]  flags   if != 0, only match xml nodes matching flags
- * @param[out] vec1    vector of XML trees
- * @param[out] vec1len length of XML trees
- * For example: xpath = //a | //b. 
- * xpath_first+ splits xpath up in several subcalls
- * (eg xpath=//a and xpath=//b) and collects the results.
- * Note: if a match is found in both, two (or more) same results will be 
- * returned.
- * Note, this could be 'folded' into xpath1 but I judged it too complex.
- * @see https://www.w3.org/TR/xpath-10/#NT-Expr
- * An 'Expr' is composed of compositions of and, or, =, +, -, down to:
- * PathExpr ::= LocationPath	
- *              | FilterExpr	
- *              | FilterExpr '/' RelativeLocationPath	
- *              | FilterExpr '//' RelativeLocationPath	
- */
-static int
-xpath_choice(cxobj   *xcur, 
-	     char    *xpath0, 
-	     uint16_t flags,
-	     cxobj ***vec1, 
-	     size_t  *vec1len)
-{
-    int               retval = -1;
-    char             *s0 = NULL;
-    char             *s1;
-    char             *s2;
-    char             *xpath;
-    cxobj           **vec0 = NULL;
-    size_t            vec0len = 0;
-	
-    if ((s0 = strdup(xpath0)) == NULL){
-	clicon_err(OE_XML, errno, "strdup");
-	goto done;
-    }
-    s2 = s1 = s0;
-    if ((vec0 = calloc(1, sizeof(cxobj *))) == NULL){
-	clicon_err(OE_UNIX, errno, "calloc");
-	goto done;
-    }
-    vec0[0] = xcur;
-    vec0len++;
-    while (s1 != NULL){
-	s2 = strstr(s1, " | ");
-	if (s2 != NULL){
-	    *s2 = '\0'; /* terminate xpath */
-	    s2 += 3;
-	}
-	xpath = s1;
-	s1 = s2;
-	if (xpath_exec(xcur, xpath, vec0, vec0len, flags, vec1, vec1len) < 0)
-	    goto done;
-    }
-    retval = 0;
- done:
-    if (s0)
-	free(s0);
-    if (vec0)
-	free(vec0);
-    return retval;
-}
-
-/*! Xpath nodeset function where only the first matching entry is returned
- * args:
- * @param[in]  xcur  xml-tree where to search
- * @param[in]  xpath   string with XPATH syntax
- * @retval     xml-tree of first match
- * @retval     NULL    Error or not found
- *
- * @code
- *   cxobj *x;
- *   if ((x = xpath_first(xtop, "//symbol/foo")) != NULL) {
- *         ...
- *   }
- * @endcode
- * @note  the returned pointer points into the original tree so should not be freed fter use.
- * @note return value does not see difference between error and not found
- * @see xpath_first. This is obsolete and only enabled with COMPAT_XSL
- */
-cxobj *
-xpath_first_xsl(cxobj *xcur, 
-		char  *xpath)
-{
-    cxobj **vec1 = NULL;
-    size_t  vec1len = 0;
-    cxobj  *xn = NULL;
-
-    if (xpath_choice(xcur, xpath, 0, &vec1, &vec1len) < 0)
-	goto done;
-    if (vec1len)
-	xn = vec1[0];
-    else
-	xn = NULL;
-  done:
-    if (vec1)
-	free(vec1);
-    return xn;
-}
-
-#ifdef COMPAT_XSL
-/*! A restricted xpath iterator that loops over all matching entries. Dont use.
- *
- * See xpath1() on details for subset.
- * @param[in]  xcur  xml-tree where to search
- * @param[in]  xpath   string with XPATH syntax
- * @param[in]  xprev   iterator/result should be initiated to NULL
- * @retval     xml-tree of n:th match, or NULL on error. 
- *
- * @code
- *   cxobj *x = NULL;
- *   while ((x = xpath_each(xcur, "//symbol/foo", x)) != NULL) {
- *     ...
- *   }
- * @endcode
- *
- * @note The returned pointer points into the original tree so should not be freed
- * after use.
- * @note obsolete. Dont use
- */
-cxobj *
-xpath_each(cxobj *xcur, 
-	   char  *xpath, 
-	   cxobj *xprev)
-{
-    static cxobj    **vec1 = NULL; /* XXX */
-    static size_t     vec1len = 0;
-    cxobj            *xn = NULL;
-    int i;
-    
-    if (xprev == NULL){
-	if (vec1) {
-	    free(vec1);
-	    vec1 = NULL;
-	}
-	vec1len = 0;
-	if (xpath_choice(xcur, xpath, 0, &vec1, &vec1len) < 0)
-	    goto done;
-    }
-    if (vec1len){
-	if (xprev==NULL)
-	    xn = vec1[0];
-	else{
-	    for (i=0; i<vec1len; i++)
-		if (vec1[i] == xprev)
-		    break;
-	    if (i>=vec1len-1)
-		xn = NULL; 
-	    else
-		xn = vec1[i+1];
-	}
-    }
-    else
-	xn = NULL;
-  done:
-    return xn;
-}
-#endif
-
-/*! A restricted xpath that returns a vector of matches
- *
- * See xpath1() on details for subset
- * @param[in]  xcur  xml-tree where to search
- * @param[in]  xpath   string with XPATH syntax
- * @param[out] vec     vector of xml-trees. Vector must be free():d after use
- * @param[out] veclen  returns length of vector in return value
- * @retval     0       OK
- * @retval     -1      error.
- *
- * @code
- *   cxobj **xvec = NULL;
- *   size_t  xlen;
- *   if (xpath_vec(xcur, "//symbol/foo", &xvec, &xlen) < 0) 
- *      goto err;
- *   for (i=0; i<xlen; i++){
- *      xn = xvec[i];
- *         ...
- *   }
- *   free(xvec);
- * @endcode
- * @note Although the returned vector must be freed after use, 
- *       the returned xml trees should not.
- * @see also xpath_first, xpath_each.
- * @see xpath_vec. This is obsolete and only enabled with COMPAT_XSL
- */
-int
-xpath_vec_xsl(cxobj    *xcur, 
-	      char     *xpath, 
-	      cxobj  ***vec, 
-	      size_t   *veclen)
-{
-    int     retval = -1;
-
-    *vec = NULL;
-    *veclen = 0;
-    if (xpath_choice(xcur, xpath, 0x0, vec, veclen) < 0)
-	goto done;
-    retval = 0;
- done:
-    return retval;
-}
-
-/* A restricted xpath that returns a vector of matches (only nodes marked with flags)
- * @param[in]  xcur  xml-tree where to search
- * @param[in]  xpath   string with XPATH syntax
- * @param[in]  flags   Set of flags that return nodes must match (0 if all)
- * @param[out] vec     vector of xml-trees. Vector must be free():d after use
- * @param[out] veclen  returns length of vector in return value
- * @retval     0       OK
- * @retval     -1      error.
- * @code
- *   cxobj **vec;
- *   size_t  veclen;
- *   if (xpath_vec_flag(xcur, "//symbol/foo", XML_FLAG_ADD, &vec, &veclen) < 0) 
- *      goto err;
- *   for (i=0; i<veclen; i++){
- *      xn = vec[i];
- *         ...
- *   }
- *   free(vec);
- * @endcode
- * @Note that although the returned vector must be freed after use, the returned xml
- * trees need not be.
- * @see xpath_vec_flag. This is obsolete and only enabled with COMPAT_XSL
- */
-int
-xpath_vec_flag_xsl(cxobj   *xcur, 
-		   char    *xpath, 
-		   uint16_t flags,
-		   cxobj ***vec, 
-		   size_t  *veclen)
-{
-    int retval = -1;
-
-    *vec=NULL;
-    *veclen = 0;
-    if (xpath_choice(xcur, xpath, flags, vec, veclen) < 0)
-	goto done;
-    retval = 0;
- done:
-    return retval;
-}
-
diff --git a/test/lib.sh b/test/lib.sh
index 35ab1c7a..1b58a404 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -5,10 +5,6 @@
 testnr=0
 testname=
 
-# Set to 1 to enable old XSL implementation. Set to nothing, or comment if new.
-# @see include/clixon_custom.h
-#COMPAT_XSL=1
-
 # For memcheck
 #clixon_cli="valgrind --leak-check=full --show-leak-kinds=all clixon_cli"
 clixon_cli=clixon_cli
diff --git a/test/test_netconf.sh b/test/test_netconf.sh
index a520c09a..135a865e 100755
--- a/test/test_netconf.sh
+++ b/test/test_netconf.sh
@@ -94,15 +94,10 @@ new "Add subtree eth/0/0 using none and create which should add eth/0/0"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces><interface operation="create"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 # Too many quotes, (single inside double inside single) need to fool bash
-if [ -z "$COMPAT_XSL" ]; then
 cat <<EOF > $tmp # new
 <rpc><get-config><source><candidate/></source><filter type="xpath" select="/interfaces/interface[name='eth/0/0']"/></get-config></rpc>]]>]]>
 EOF
-else # old
-cat <<EOF > $tmp
-<rpc><get-config><source><candidate/></source><filter type="xpath" select="/interfaces/interface[name=eth/0/0]"/></get-config></rpc>]]>]]>
-EOF
-fi   
+
 new "Check eth/0/0 added using xpath"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "$(cat $tmp)" "^<rpc-reply><data><interfaces><interface><name>eth/0/0</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$"
 
@@ -122,29 +117,17 @@ new "netconf edit config"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><candidate/></target><config><interfaces><interface><name>eth/0/0</name></interface><interface><name>eth1</name><enabled>true</enabled><ipv4><address><ip>9.2.3.4</ip><prefix-length>24</prefix-length></address></ipv4></interface></interfaces></config></edit-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 # Too many quotes
-if [ -z "$COMPAT_XSL" ]; then
 cat <<EOF > $tmp # new
 <rpc><get-config><source><candidate/></source><filter type="xpath" select="/interfaces/interface[name='eth1']/enabled"/></get-config></rpc>]]>]]>
 EOF
-else
-cat <<EOF > $tmp # old
-<rpc><get-config><source><candidate/></source><filter type="xpath" select="/interfaces/interface[name=eth1]/enabled"/></get-config></rpc>]]>]]>
-EOF
-fi
 
 new "netconf get config xpath"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "$(cat $tmp)" "^<rpc-reply><data><interfaces><interface><name>eth1</name><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$"
 
 # Too many quotes
-if [ -z "$COMPAT_XSL" ]; then
 cat <<EOF > $tmp # new
 <rpc><get-config><source><candidate/></source><filter type="xpath" select="/interfaces/interface[name='eth1']/enabled/../.."/></get-config></rpc>]]>]]>
 EOF
-else
-cat <<EOF > $tmp # old
-<rpc><get-config><source><candidate/></source><filter type="xpath" select="/interfaces/interface[name=eth1]/enabled/../.."/></get-config></rpc>]]>]]>
-EOF
-fi
 
 new "netconf get config xpath parent"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "$(cat $tmp)" "^<rpc-reply><data><interfaces><interface><name>eth/0/0</name><enabled>true</enabled></interface><interface><name>eth1</name><enabled>true</enabled><ipv4><enabled>true</enabled><forwarding>false</forwarding><address><ip>9.2.3.4</ip><prefix-length>24</prefix-length></address></ipv4></interface></interfaces></data></rpc-reply>]]>]]>$"
diff --git a/test/test_order.sh b/test/test_order.sh
index 848e839a..5d292c1f 100755
--- a/test/test_order.sh
+++ b/test/test_order.sh
@@ -121,8 +121,6 @@ fi
 new "verify running from start, should be: l,c,y0,y1,y2,y3; y1 and y3 sorted. Note this fails if XML_SORT set to false"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data><c><d>hej</d></c><l>hopp</l><y0>d</y0><y0>b</y0><y0>c</y0><y0>a</y0><y1>a</y1><y1>b</y1><y1>c</y1><y1>d</y1><y2><k>d</k><a>bar</a></y2><y2><k>a</k><a>bar</a></y2><y2><k>c</k><a>bar</a></y2><y2><k>b</k><a>bar</a></y2><y3><k>a</k><a>bar</a></y3><y3><k>b</k><a>bar</a></y3><y3><k>c</k><a>bar</a></y3><y3><k>d</k><a>bar</a></y3></data></rpc-reply>]]>]]>$"
 
-if [ -z "$COMPAT_XSL" ]; then #new
-
 new "get each ordered-by user leaf-list"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y2[k='a']\"/></get-config></rpc>]]>]]>" "^<rpc-reply><data><y2><k>a</k><a>bar</a></y2></data></rpc-reply>]]>]]>$"
 
@@ -135,22 +133,6 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><runn
 new "get each ordered-by user leaf-list"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y3[k='b']\"/></get-config></rpc>]]>]]>" "^<rpc-reply><data><y3><k>b</k><a>bar</a></y3></data></rpc-reply>]]>]]>$"
 
-else # old
-
-new "get each ordered-by user leaf-list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y2[k=a]\"/></get-config></rpc>]]>]]>" "^<rpc-reply><data><y2><k>a</k><a>bar</a></y2></data></rpc-reply>]]>]]>$"
-
-new "get each ordered-by user leaf-list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y3[k=a]\"/></get-config></rpc>]]>]]>" "^<rpc-reply><data><y3><k>a</k><a>bar</a></y3></data></rpc-reply>]]>]]>$"
-
-new "get each ordered-by user leaf-list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y2[k=b]\"/></get-config></rpc>]]>]]>" "^<rpc-reply><data><y2><k>b</k><a>bar</a></y2></data></rpc-reply>]]>]]>$"
-
-new "get each ordered-by user leaf-list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y3[k=b]\"/></get-config></rpc>]]>]]>" "^<rpc-reply><data><y3><k>b</k><a>bar</a></y3></data></rpc-reply>]]>]]>$"
-    
-fi
-
 new "delete candidate"
 expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><delete-config><target><candidate/></target></delete-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
diff --git a/test/test_yang.sh b/test/test_yang.sh
index 7ebbbf12..3b59cfa7 100755
--- a/test/test_yang.sh
+++ b/test/test_yang.sh
@@ -136,13 +136,8 @@ expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><edit-config><target><can
 new "netconf get leaf-list"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source><filter type=\"xpath\" select=\"/x/f/e\"/></get-config></rpc>]]>]]>" "^<rpc-reply><data><x><f><e>hej</e><e>hopp</e></f></x></data></rpc-reply>]]>]]>$"
 
-if [ -z "$COMPAT_XSL" ]; then # new
 new "netconf get leaf-list path"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source><filter type=\"xpath\" select=\"/x/f[e='hej']\"/></get-config></rpc>]]>]]>" "^<rpc-reply><data><x><f><e>hej</e><e>hopp</e></f></x></data></rpc-reply>]]>]]>$"
-else # old
-new "netconf get leaf-list path"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source><filter type=\"xpath\" select=\"/x/f[e=hej]\"/></get-config></rpc>]]>]]>" "^<rpc-reply><data><x><f><e>hej</e><e>hopp</e></f></x></data></rpc-reply>]]>]]>$"
-fi
 
 new "netconf get (should be some)"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get><filter type=\"xpath\" select=\"/\"/></get></rpc>]]>]]>" "^<rpc-reply><data><x><y><a>1</a><b>2</b><c>5</c><val>one</val></y><d/></x></data></rpc-reply>]]>]]>$"