Index: trunk/ippTools/src/chiptool.c
===================================================================
--- trunk/ippTools/src/chiptool.c	(revision 9494)
+++ trunk/ippTools/src/chiptool.c	(revision 9539)
@@ -113,5 +113,5 @@
                 if (strcmp(rawFrame->exposure->exp_tag,
                            pendingFrame->exposure->exp_tag) == 0) {
-                    psArrayRemove(rawFrames, rawFrame);
+                    psArrayRemoveData(rawFrames, rawFrame);
                     // dec the counter as the array just got shorter
                     // and we don't want to skip elemnts
@@ -132,5 +132,5 @@
                     if (strcmp(rawFrame->exposure->exp_tag,
                                doneFrame->exposure->exp_tag) == 0) {
-                        psArrayRemove(rawFrames, rawFrame);
+                        psArrayRemoveData(rawFrames, rawFrame);
                         // dec the counter as the array just got shorter
                         // and we don't want to skip elemnts
Index: trunk/ippTools/src/dettool.c
===================================================================
--- trunk/ippTools/src/dettool.c	(revision 9494)
+++ trunk/ippTools/src/dettool.c	(revision 9539)
@@ -387,5 +387,5 @@
             return false;
         }
-        psMetadataRemove(md, 0, "det_id");
+        psMetadataRemoveKey(md, "det_id");
         psString det_idStr = psDBIntToString((psU64)det_id);
         psMetadataAddStr(mds->data[i], PS_LIST_HEAD, "det_id", 0, NULL, det_idStr);
Index: trunk/ippTools/src/pzgetexp.c
===================================================================
--- trunk/ippTools/src/pzgetexp.c	(revision 9494)
+++ trunk/ippTools/src/pzgetexp.c	(revision 9539)
@@ -94,5 +94,5 @@
                 if (strcmp(newSummitExp->exp_id,
                            summitExp->exp_id) == 0) {
-                    psArrayRemove(newSummitExps, newSummitExp);
+                    psArrayRemoveData(newSummitExps, newSummitExp);
                     // dec the counter as the array just got shorter
                     // and we don't want to skip elemnts
Index: trunk/ippTools/src/pzgetimfiles.c
===================================================================
--- trunk/ippTools/src/pzgetimfiles.c	(revision 9494)
+++ trunk/ippTools/src/pzgetimfiles.c	(revision 9539)
@@ -83,5 +83,5 @@
                 if (strcmp(newImfile->exp_id,
                            pendingImfile->exp_id) == 0) {
-                    psArrayRemove(newImfiles, newImfile);
+                    psArrayRemoveData(newImfiles, newImfile);
                     // dec the counter as the array just got shorter
                     // and we don't want to skip elemnts
Index: trunk/ippTools/src/pztool.c
===================================================================
--- trunk/ippTools/src/pztool.c	(revision 9494)
+++ trunk/ippTools/src/pztool.c	(revision 9539)
@@ -97,5 +97,5 @@
                 newExpRow *newExp = new->data[j];
                 if (strcmp(summitExp->exp_id, newExp->exp_id) == 0) {
-                    psArrayRemove(summit, summitExp);
+                    psArrayRemoveData(summit, summitExp);
                     // dec the counter as the array just got shorter
                     //and we don't want to skip elemnts