Index: /issm/trunk-jpl/src/c/bamg/BamgQuadtree.cpp
===================================================================
--- /issm/trunk-jpl/src/c/bamg/BamgQuadtree.cpp	(revision 24386)
+++ /issm/trunk-jpl/src/c/bamg/BamgQuadtree.cpp	(revision 24387)
@@ -2,7 +2,5 @@
 #include <string.h>
 #include <stdlib.h>
-
 #include "./bamgobjects.h"
-#include "../datastructures/datastructures.h"
 
 namespace bamg {
@@ -68,7 +66,4 @@
 		this->NbVertices    = 0;
 
-		/*Create container*/
-		this->boxcontainer=new DataSet();
-
 		/*Create Root, pointer toward the main box*/
 		this->root=NewBamgQuadtreeBox();
@@ -80,7 +75,4 @@
 		this->NbQuadtreeBox = 0;
 		this->NbVertices    = 0;
-
-		/*Create container*/
-		this->boxcontainer=new DataSet();
 
 		/*Create Root, pointer toward the main box*/
@@ -99,5 +91,10 @@
 	/*}}}*/
 	BamgQuadtree::~BamgQuadtree() {/*{{{*/
-		delete boxcontainer;
+
+		vector<BamgQuadtreeBox*>::reverse_iterator object;
+		for(object=boxcontainer.rbegin() ; object <boxcontainer.rend(); object++ ){
+			delete (*object);
+		}
+		boxcontainer.clear();
 		root=NULL;
 	}
@@ -514,5 +511,5 @@
 
 		/*Add root to the container*/
-		boxcontainer->AddObject(newbox);
+		boxcontainer.push_back(newbox);
 		this->NbQuadtreeBox++;
 
Index: /issm/trunk-jpl/src/c/bamg/BamgQuadtree.h
===================================================================
--- /issm/trunk-jpl/src/c/bamg/BamgQuadtree.h	(revision 24386)
+++ /issm/trunk-jpl/src/c/bamg/BamgQuadtree.h	(revision 24387)
@@ -3,6 +3,6 @@
 #define _BAMGQUADTREE_H
 
+#include <vector>
 #include "./include.h"
-#include "../datastructures/datastructures.h"
 class BamgVertex;
 
@@ -17,20 +17,13 @@
 			 * - up to 4 vertices
 			 * - 4 "sub" quadtree boxes*/
-			class BamgQuadtreeBox: public Object{ 
+			class BamgQuadtreeBox{ 
 				public:
 					int              nbitems;
 					BamgQuadtreeBox *box[4];
 					BamgVertex      *v[4];
-					/*Object functions*/
-					void    Echo()       {_error_("not implemented yet"); };
-					void    DeepEcho()   {_error_("not implemented yet"); };
-					int     Id()         {_error_("not implemented yet"); };
-					int     ObjectEnum() {_error_("not implemented yet"); };
-					Object *copy()       {_error_("not implemented yet"); };
-					void Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ _error_("not implemented yet!"); };
 			};
 
 			/*BamgQuadtree private Fields*/
-			DataSet* boxcontainer;
+			std::vector<BamgQuadtreeBox*> boxcontainer;
 
 		public:
Index: /issm/trunk-jpl/src/c/classes/Elements/Element.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/Element.cpp	(revision 24386)
+++ /issm/trunk-jpl/src/c/classes/Elements/Element.cpp	(revision 24387)
@@ -2962,18 +2962,4 @@
 
 	/*Update inputs*/
-	// TransientInput* NewTemperatureInput = new TransientInput(SmbMonthlytemperaturesEnum);
-	// TransientInput* NewPrecipitationInput = new TransientInput(SmbPrecipitationEnum);
-	// for (int imonth=0;imonth<12;imonth++) {
-	//   for(i=0;i<NUM_VERTICES;i++) tmp[i]=monthlytemperatures[i*12+imonth];
-	//   TriaInput* newmonthinput1 = new TriaInput(SmbMonthlytemperaturesEnum,&tmp[0],P1Enum);
-	//   NewTemperatureInput->AddTimeInput(newmonthinput1,time+imonth/12.*yts);
-	//
-	//   for(i=0;i<NUM_VERTICES;i++) tmp[i]=monthlyprec[i*12+imonth]/yts;
-	//   TriaInput* newmonthinput2 = new TriaInput(SmbPrecipitationEnum,&tmp[0],P1Enum);
-	//   NewPrecipitationInput->AddTimeInput(newmonthinput2,time+imonth/12.*yts);
-	// }
-	// NewTemperatureInput->Configure(this->parameters);
-	// NewPrecipitationInput->Configure(this->parameters);
-
 	switch(this->ObjectEnum()){
 		case TriaEnum:
@@ -3027,5 +3013,4 @@
 	xDelete<IssmDouble>(s0p);
 	xDelete<IssmDouble>(tmp);
-
 }
 /*}}}*/