Index: /issm/trunk-jpl/src/c/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/c/Makefile.am	(revision 16543)
+++ /issm/trunk-jpl/src/c/Makefile.am	(revision 16544)
@@ -246,6 +246,4 @@
 					./modules/ModelProcessorx/EdgesPartitioning.cpp\
 					./modules/ModelProcessorx/FacesPartitioning.cpp\
-					./modules/ModelProcessorx/SortDataSets.cpp\
-					./modules/ModelProcessorx/UpdateCounters.cpp\
 					./modules/ModelProcessorx/CreateDataSets.cpp\
 					./modules/ModelProcessorx/CreateParameters.cpp\
Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp	(revision 16543)
+++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp	(revision 16544)
@@ -44,10 +44,9 @@
 	#endif
 
-	/*Sort datasets: */
-	SortDataSets(elements,nodes,vertices,loads,materials,constraints,parameters);
-
 	/* Update counters, because we have created more nodes, loads and
 	 * constraints, and ids for objects created in next call to CreateDataSets
 	 * will need to start at the end of the updated counters: */
-	UpdateCounters(iomodel,nodes,loads,constraints);
+	iomodel->nodecounter       = nodes->MaximumId();
+	iomodel->loadcounter       = loads->NumberOfLoads();
+	iomodel->constraintcounter = constraints->NumberOfConstraints();
 }
Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp	(revision 16543)
+++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp	(revision 16544)
@@ -77,4 +77,17 @@
 		CreateDataSets(elements,nodes,vertices,materials,constraints,loads,parameters,iomodel,toolkitfile,rootpath,solution_enum,analysis_type,nummodels,i);
 	}
+
+	/* Sort datasets:
+	 * All our datasets are already ordered by ids. Set presort flag so that
+	 * later on, when sorting is requested on these datasets, it will not be
+	 * redone: */
+	elements->Presort();
+	nodes->Presort();
+	vertices->Presort();
+	loads->Presort();
+	materials->Presort();
+
+	constraints->Presort();
+	parameters->Presort();
 	if(VerboseMProcessor()) _printf0_("   done with model processor \n");
 
Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h
===================================================================
--- /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h	(revision 16543)
+++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h	(revision 16544)
@@ -37,8 +37,3 @@
 void CreateSingleNodeToElementConnectivity(IoModel* iomodel);
 void CreateNumberNodeToElementConnectivity(IoModel* iomodel);
-
-/*Diverse: */
-void SortDataSets(Elements*elements,Nodes*nodes,Vertices*vertices, Loads*loads, Materials*materials, Constraints*constraints, Parameters*parameters);
-void UpdateCounters(IoModel* iomodel,Nodes*nodes,Loads*loads, Constraints*constraints);
-
 #endif
Index: sm/trunk-jpl/src/c/modules/ModelProcessorx/SortDataSets.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/ModelProcessorx/SortDataSets.cpp	(revision 16543)
+++ 	(revision )
@@ -1,27 +1,0 @@
-/*!\file: SortDataSets.cpp
- * \brief sort datasets created in CreateDataSets
- */ 
-
-#ifdef HAVE_CONFIG_H
-	#include <config.h>
-#else
-#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
-#endif
-
-#include "../../classes/classes.h"
-#include "../../shared/shared.h"
-#include "./ModelProcessorx.h"
-
-void SortDataSets(Elements*elements,Nodes*nodes,Vertices*vertices, Loads*loads, Materials*materials, Constraints*constraints, Parameters*parameters){
-
-	/*All our datasets are already ordered by ids. Set presort flag so that
-	 * later on, when sorting is requested on these datasets, it will not be
-	 * redone: */
-	elements->Presort();
-	nodes->Presort();
-	vertices->Presort();
-	loads->Presort();
-	materials->Presort();
-	constraints->Presort();
-	parameters->Presort();
-}
Index: sm/trunk-jpl/src/c/modules/ModelProcessorx/UpdateCounters.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/ModelProcessorx/UpdateCounters.cpp	(revision 16543)
+++ 	(revision )
@@ -1,21 +1,0 @@
-/*!\file: UpdateCounters.cpp
- * \brief update counters after adding objects to a dataset.
- */ 
-
-#ifdef HAVE_CONFIG_H
-	#include <config.h>
-#else
-#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
-#endif
-
-#include "../../classes/classes.h"
-#include "../../shared/shared.h"
-#include "./ModelProcessorx.h"
-
-void    UpdateCounters(IoModel* iomodel,Nodes* nodes,Loads* loads, Constraints* constraints){
-
-	iomodel->nodecounter       = nodes->MaximumId();
-	iomodel->loadcounter       = loads->NumberOfLoads();
-	iomodel->constraintcounter = constraints->NumberOfConstraints();
-
-}