diff --git a/include/clixon_custom.h b/include/clixon_custom.h
index d5d46c16..69ffe850 100644
--- a/include/clixon_custom.h
+++ b/include/clixon_custom.h
@@ -41,10 +41,6 @@
  */
 #undef RPC_USERNAME_ASSERT
 
-/* Use new xml_insert code on sorted xml lists
- */
-#define USE_XML_INSERT
-
 /* Make namespace check on RESTCONF PUT and POST -d data
  */
 #define RESTCONF_NS_DATA_CHECK
diff --git a/lib/src/clixon_datastore_write.c b/lib/src/clixon_datastore_write.c
index d36a1239..fff7558d 100644
--- a/lib/src/clixon_datastore_write.c
+++ b/lib/src/clixon_datastore_write.c
@@ -154,17 +154,10 @@ text_modify(clicon_handle       h,
 			goto fail;
 		    permit = 1;
 		}
-		//		int iamkey=0;
-
-#ifdef USE_XML_INSERT
 		/* Add new xml node but without parent - insert when node fully
 		   copied (see changed conditional below) */
 		if ((x0 = xml_new(x1name, NULL, (yang_stmt*)y0)) == NULL)
 		    goto done;
-#else
-		if ((x0 = xml_new(x1name, x0p, (yang_stmt*)y0)) == NULL)
-		    goto done;		
-#endif
 		changed++;
 
 		/* Copy xmlns attributes  */
@@ -210,12 +203,10 @@ text_modify(clicon_handle       h,
 		    }
 		}
 	    }
-#ifdef USE_XML_INSERT
 	    if (changed){
 		if (xml_insert(x0p, x0) < 0)
 		    goto done;
 	    }
-#endif
 	    break;
 	case OP_DELETE:
 	    if (x0==NULL){
@@ -295,17 +286,12 @@ text_modify(clicon_handle       h,
 			goto fail;
 		    permit = 1;
 		}
-#ifdef USE_XML_INSERT
 		/* Add new xml node but without parent - insert when node fully
 		 * copied (see changed conditional below) 
 		 * Note x0 may dangle cases if exit before changed conditional
 		 */
 		if ((x0 = xml_new(x1name, NULL, (yang_stmt*)y0)) == NULL)
 		    goto done;
-#else
-		if ((x0 = xml_new(x1name, x0p, (yang_stmt*)y0)) == NULL)
-		    goto done;
-#endif
 		changed++;
 		/* Copy xmlns attributes  */
 		x1a = NULL;
@@ -367,12 +353,10 @@ text_modify(clicon_handle       h,
 		if (ret == 0)
 		    goto fail;
 	    }
-#ifdef USE_XML_INSERT
 	    if (changed){
 		if (xml_insert(x0p, x0) < 0)
 		    goto done;
 	    }
-#endif
 	    break;
 	case OP_DELETE:
 	    if (x0==NULL){
@@ -396,17 +380,11 @@ text_modify(clicon_handle       h,
 	    break;
 	} /* CONTAINER switch op */
     } /* else Y_CONTAINER  */
-#ifndef USE_XML_INSERT
-    if (changed)
-	xml_sort(x0p, h);
-#endif
     retval = 1;
  done:
-#ifdef USE_XML_INSERT
     /* Remove dangling added objects */
     if (changed && x0 && xml_parent(x0)==NULL)
 	xml_purge(x0);
-#endif
     if (x0vec)
 	free(x0vec);
     return retval;
diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c
index 6ef46b70..973c8698 100644
--- a/lib/src/clixon_xml_map.c
+++ b/lib/src/clixon_xml_map.c
@@ -2085,13 +2085,8 @@ xml_default(cxobj *xt,
 	    if (!cv_flag(y->ys_cv, V_UNSET)){  /* Default value exists */
 		if (!xml_find(xt, y->ys_argument)){
 
-#ifdef USE_XML_INSERT
 		    if ((xc = xml_new(y->ys_argument, NULL, y)) == NULL)
 			goto done;
-#else
-		    if ((xc = xml_new(y->ys_argument, xt, y)) == NULL)
-			goto done;
-#endif
 		    xml_flag_set(xc, XML_FLAG_DEFAULT);
 		    if ((xb = xml_new("body", xc, NULL)) == NULL)
 			goto done;
@@ -2104,18 +2099,12 @@ xml_default(cxobj *xt,
 			goto done;
 		    free(str);
 		    added++;
-#ifdef USE_XML_INSERT
 		    if (xml_insert(xt, xc) < 0)
 			goto done;
-#endif
 		}
 	    }
 	}
     }
-#ifndef USE_XML_INSERT
-    if (added)
-	xml_sort(xt, NULL);
-#endif
     retval = 0;
  done:
     return retval;