Index: /trunk/ippdb/src/ippdb.c
===================================================================
--- /trunk/ippdb/src/ippdb.c	(revision 8020)
+++ /trunk/ippdb/src/ippdb.c	(revision 8021)
@@ -4670,5 +4670,5 @@
 static void pzPendingImfileRowFree(pzPendingImfileRow *object);
 
-pzPendingImfileRow *pzPendingImfileRowAlloc(const char *exp_id, psS32 bytes, const char *md5sum, const char *class, const char *class_id, const char *uri)
+pzPendingImfileRow *pzPendingImfileRowAlloc(const char *exp_id, psS32 bytes, const char *md5sum, const char *class_id, const char *uri)
 {
     pzPendingImfileRow *object;
@@ -4680,5 +4680,4 @@
     object->bytes = bytes;
     object->md5sum = psStringCopy(md5sum);
-    object->class = psStringCopy(class);
     object->class_id = psStringCopy(class_id);
     object->uri = psStringCopy(uri);
@@ -4691,5 +4690,4 @@
     psFree(object->exp_id);
     psFree(object->md5sum);
-    psFree(object->class);
     psFree(object->class_id);
     psFree(object->uri);
@@ -4722,9 +4720,4 @@
         return false;
     }
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "64")) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item class");
-        psFree(md);
-        return false;
-    }
     if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "64")) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item class_id");
@@ -4750,5 +4743,5 @@
 }
 
-bool pzPendingImfileInsert(psDB * dbh, const char *exp_id, psS32 bytes, const char *md5sum, const char *class, const char *class_id, const char *uri)
+bool pzPendingImfileInsert(psDB * dbh, const char *exp_id, psS32 bytes, const char *md5sum, const char *class_id, const char *uri)
 {
     psMetadata      *md;
@@ -4771,9 +4764,4 @@
         return false;
     }
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, class)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item class");
-        psFree(md);
-        return false;
-    }
     if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, class_id)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item class_id");
@@ -4793,5 +4781,5 @@
 }
 
-bool pzPendingImfilePop(psDB *dbh, char **exp_id, psS32 *bytes, char **md5sum, char **class, char **class_id, char **uri)
+bool pzPendingImfilePop(psDB *dbh, char **exp_id, psS32 *bytes, char **md5sum, char **class_id, char **uri)
 {
     psArray         *rowSet;
@@ -4855,10 +4843,4 @@
         return false;
     }
-    *class = psMetadataLookupPtr(&status, row, "class");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");
-        psFree(row);
-        return false;
-    }
     *class_id = psMetadataLookupPtr(&status, row, "class_id");
     if (!status) {
@@ -4881,5 +4863,5 @@
 bool pzPendingImfileInsertObject(psDB *dbh, pzPendingImfileRow *object)
 {
-    return pzPendingImfileInsert(dbh, object->exp_id, object->bytes, object->md5sum, object->class, object->class_id, object->uri);
+    return pzPendingImfileInsert(dbh, object->exp_id, object->bytes, object->md5sum, object->class_id, object->uri);
 }
 
@@ -4889,14 +4871,13 @@
     psS32           bytes;
     char            md5sum[256];
-    char            class[256];
     char            class_id[256];
     char            uri[256];
 
-    if (!pzPendingImfilePop(dbh, (char **)&exp_id, &bytes, (char **)&md5sum, (char **)&class, (char **)&class_id, (char **)&uri)) {
+    if (!pzPendingImfilePop(dbh, (char **)&exp_id, &bytes, (char **)&md5sum, (char **)&class_id, (char **)&uri)) {
         psError(PS_ERR_UNKNOWN, false, "failed to pop a database row");
         return NULL;
     }
 
-    return pzPendingImfileRowAlloc(exp_id, bytes, md5sum, class, class_id, uri);
+    return pzPendingImfileRowAlloc(exp_id, bytes, md5sum, class_id, uri);
 }
 
@@ -5012,9 +4993,4 @@
         return NULL;
     }
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, object->class)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item class");
-        psFree(md);
-        return NULL;
-    }
     if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, object->class_id)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item class_id");
@@ -5037,5 +5013,4 @@
     psS32           bytes;
     char            *md5sum;
-    char            *class;
     char            *class_id;
     char            *uri;
@@ -5056,9 +5031,4 @@
         return false;
     }
-    class = psMetadataLookupPtr(&status, md, "class");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");
-        return false;
-    }
     class_id = psMetadataLookupPtr(&status, md, "class_id");
     if (!status) {
@@ -5072,5 +5042,5 @@
     }
 
-    return pzPendingImfileRowAlloc(exp_id, bytes, md5sum, class, class_id, uri);
+    return pzPendingImfileRowAlloc(exp_id, bytes, md5sum, class_id, uri);
 }
 psArray *pzPendingImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
@@ -5560,5 +5530,5 @@
 static void newImfileRowFree(newImfileRow *object);
 
-newImfileRow *newImfileRowAlloc(const char *exp_id, const char *class, const char *class_id, const char *uri)
+newImfileRow *newImfileRowAlloc(const char *exp_id, const char *class_id, const char *uri)
 {
     newImfileRow    *object;
@@ -5568,5 +5538,4 @@
 
     object->exp_id = psStringCopy(exp_id);
-    object->class = psStringCopy(class);
     object->class_id = psStringCopy(class_id);
     object->uri = psStringCopy(uri);
@@ -5578,5 +5547,4 @@
 {
     psFree(object->exp_id);
-    psFree(object->class);
     psFree(object->class_id);
     psFree(object->uri);
@@ -5599,9 +5567,4 @@
         return false;
     }
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "64")) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item class");
-        psFree(md);
-        return false;
-    }
     if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "64")) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item class_id");
@@ -5627,5 +5590,5 @@
 }
 
-bool newImfileInsert(psDB * dbh, const char *exp_id, const char *class, const char *class_id, const char *uri)
+bool newImfileInsert(psDB * dbh, const char *exp_id, const char *class_id, const char *uri)
 {
     psMetadata      *md;
@@ -5638,9 +5601,4 @@
         return false;
     }
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, class)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item class");
-        psFree(md);
-        return false;
-    }
     if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, class_id)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item class_id");
@@ -5660,5 +5618,5 @@
 }
 
-bool newImfilePop(psDB *dbh, char **exp_id, char **class, char **class_id, char **uri)
+bool newImfilePop(psDB *dbh, char **exp_id, char **class_id, char **uri)
 {
     psArray         *rowSet;
@@ -5710,10 +5668,4 @@
         return false;
     }
-    *class = psMetadataLookupPtr(&status, row, "class");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");
-        psFree(row);
-        return false;
-    }
     *class_id = psMetadataLookupPtr(&status, row, "class_id");
     if (!status) {
@@ -5736,5 +5688,5 @@
 bool newImfileInsertObject(psDB *dbh, newImfileRow *object)
 {
-    return newImfileInsert(dbh, object->exp_id, object->class, object->class_id, object->uri);
+    return newImfileInsert(dbh, object->exp_id, object->class_id, object->uri);
 }
 
@@ -5742,14 +5694,13 @@
 {
     char            exp_id[256];
-    char            class[256];
     char            class_id[256];
     char            uri[256];
 
-    if (!newImfilePop(dbh, (char **)&exp_id, (char **)&class, (char **)&class_id, (char **)&uri)) {
+    if (!newImfilePop(dbh, (char **)&exp_id, (char **)&class_id, (char **)&uri)) {
         psError(PS_ERR_UNKNOWN, false, "failed to pop a database row");
         return NULL;
     }
 
-    return newImfileRowAlloc(exp_id, class, class_id, uri);
+    return newImfileRowAlloc(exp_id, class_id, uri);
 }
 
@@ -5855,9 +5806,4 @@
         return NULL;
     }
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, object->class)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item class");
-        psFree(md);
-        return NULL;
-    }
     if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, object->class_id)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item class_id");
@@ -5878,5 +5824,4 @@
     bool            status;
     char            *exp_id;
-    char            *class;
     char            *class_id;
     char            *uri;
@@ -5887,9 +5832,4 @@
         return false;
     }
-    class = psMetadataLookupPtr(&status, md, "class");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");
-        return false;
-    }
     class_id = psMetadataLookupPtr(&status, md, "class_id");
     if (!status) {
@@ -5903,5 +5843,5 @@
     }
 
-    return newImfileRowAlloc(exp_id, class, class_id, uri);
+    return newImfileRowAlloc(exp_id, class_id, uri);
 }
 psArray *newImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
Index: /trunk/ippdb/src/ippdb.h
===================================================================
--- /trunk/ippdb/src/ippdb.h	(revision 8020)
+++ /trunk/ippdb/src/ippdb.h	(revision 8021)
@@ -1914,5 +1914,4 @@
     psS32           bytes;
     char            *md5sum;
-    char            *class;
     char            *class_id;
     char            *uri;
@@ -1928,5 +1927,4 @@
     psS32           bytes,
     const char      *md5sum,
-    const char      *class,
     const char      *class_id,
     const char      *uri
@@ -1963,5 +1961,4 @@
     psS32           bytes,
     const char      *md5sum,
-    const char      *class,
     const char      *class_id,
     const char      *uri
@@ -1978,5 +1975,4 @@
     psS32           *bytes,
     char            **md5sum,
-    char            **class,
     char            **class_id,
     char            **uri
@@ -2282,5 +2278,4 @@
 typedef struct {
     char            *exp_id;
-    char            *class;
     char            *class_id;
     char            *uri;
@@ -2294,5 +2289,4 @@
 newImfileRow *newImfileRowAlloc(
     const char      *exp_id,
-    const char      *class,
     const char      *class_id,
     const char      *uri
@@ -2327,5 +2321,4 @@
     psDB            *dbh,               ///< Database handle
     const char      *exp_id,
-    const char      *class,
     const char      *class_id,
     const char      *uri
@@ -2340,5 +2333,4 @@
     psDB            *dbh,               ///< Database handle
     char            **exp_id,
-    char            **class,
     char            **class_id,
     char            **uri
Index: /trunk/ippdb/tests/alloc.c
===================================================================
--- /trunk/ippdb/tests/alloc.c	(revision 8020)
+++ /trunk/ippdb/tests/alloc.c	(revision 8021)
@@ -384,5 +384,5 @@
         pzPendingImfileRow *object;
 
-        object = pzPendingImfileRowAlloc("a string", -32, "a string", "a string", "a string", "a string"    );
+        object = pzPendingImfileRowAlloc("a string", -32, "a string", "a string", "a string"    );
 
         if (!object) {
@@ -402,8 +402,4 @@
             exit(EXIT_FAILURE);
         }
-        if (strncmp(object->class, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
         if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) {
             psFree(object);
@@ -454,15 +450,11 @@
         newImfileRow    *object;
 
-        object = newImfileRowAlloc("a string", "a string", "a string", "a string"    );
-
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (strncmp(object->class, "a string", MAX_STRING_LENGTH)) {
+        object = newImfileRowAlloc("a string", "a string", "a string"    );
+
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) {
             psFree(object);
             exit(EXIT_FAILURE);
Index: /trunk/ippdb/tests/insert.c
===================================================================
--- /trunk/ippdb/tests/insert.c	(revision 8020)
+++ /trunk/ippdb/tests/insert.c	(revision 8021)
@@ -163,5 +163,5 @@
         }
 
-        if (!pzPendingImfileInsert(dbh, "a string", -32, "a string", "a string", "a string", "a string")) {
+        if (!pzPendingImfileInsert(dbh, "a string", -32, "a string", "a string", "a string")) {
             exit(EXIT_FAILURE);
         }
@@ -193,5 +193,5 @@
         }
 
-        if (!newImfileInsert(dbh, "a string", "a string", "a string", "a string")) {
+        if (!newImfileInsert(dbh, "a string", "a string", "a string")) {
             exit(EXIT_FAILURE);
         }
Index: /trunk/ippdb/tests/insertobject.c
===================================================================
--- /trunk/ippdb/tests/insertobject.c	(revision 8020)
+++ /trunk/ippdb/tests/insertobject.c	(revision 8021)
@@ -234,5 +234,5 @@
         }
 
-        object = pzPendingImfileRowAlloc("a string", -32, "a string", "a string", "a string", "a string");
+        object = pzPendingImfileRowAlloc("a string", -32, "a string", "a string", "a string");
         if (!object) {
             exit(EXIT_FAILURE);
@@ -278,5 +278,5 @@
         }
 
-        object = newImfileRowAlloc("a string", "a string", "a string", "a string");
+        object = newImfileRowAlloc("a string", "a string", "a string");
         if (!object) {
             exit(EXIT_FAILURE);
Index: /trunk/ippdb/tests/metadatafromobject.c
===================================================================
--- /trunk/ippdb/tests/metadatafromobject.c	(revision 8020)
+++ /trunk/ippdb/tests/metadatafromobject.c	(revision 8021)
@@ -467,5 +467,5 @@
         bool            status;
 
-        object = pzPendingImfileRowAlloc("a string", -32, "a string", "a string", "a string", "a string");
+        object = pzPendingImfileRowAlloc("a string", -32, "a string", "a string", "a string");
         if (!object) {
             exit(EXIT_FAILURE);
@@ -491,8 +491,4 @@
             exit(EXIT_FAILURE);
         }
-        if (strncmp(psMetadataLookupPtr(&status, md, "class"), "a string", MAX_STRING_LENGTH)) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
         if (strncmp(psMetadataLookupPtr(&status, md, "class_id"), "a string", MAX_STRING_LENGTH)) {
             psFree(md);
@@ -553,5 +549,5 @@
         bool            status;
 
-        object = newImfileRowAlloc("a string", "a string", "a string", "a string");
+        object = newImfileRowAlloc("a string", "a string", "a string");
         if (!object) {
             exit(EXIT_FAILURE);
@@ -566,8 +562,4 @@
 
         if (strncmp(psMetadataLookupPtr(&status, md, "exp_id"), "a string", MAX_STRING_LENGTH)) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-        if (strncmp(psMetadataLookupPtr(&status, md, "class"), "a string", MAX_STRING_LENGTH)) {
             psFree(md);
             exit(EXIT_FAILURE);
Index: /trunk/ippdb/tests/objectfrommetadata.c
===================================================================
--- /trunk/ippdb/tests/objectfrommetadata.c	(revision 8020)
+++ /trunk/ippdb/tests/objectfrommetadata.c	(revision 8021)
@@ -693,8 +693,4 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "a string")) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
         if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "a string")) {
             psFree(md);
@@ -726,8 +722,4 @@
             exit(EXIT_FAILURE);
         }
-        if (strncmp(object->class, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
         if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) {
             psFree(object);
@@ -809,8 +801,4 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "a string")) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
         if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "a string")) {
             psFree(md);
@@ -831,8 +819,4 @@
 
         if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (strncmp(object->class, "a string", MAX_STRING_LENGTH)) {
             psFree(object);
             exit(EXIT_FAILURE);
Index: /trunk/ippdb/tests/pop.c
===================================================================
--- /trunk/ippdb/tests/pop.c	(revision 8020)
+++ /trunk/ippdb/tests/pop.c	(revision 8021)
@@ -221,14 +221,13 @@
         psS32           bytes;
         char            md5sum[256];
-        char            class[256];
-        char            class_id[256];
-        char            uri[256];
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!pzPendingImfilePop(dbh, (char **)&exp_id, &bytes, (char **)&md5sum, (char **)&class, (char **)&class_id, (char **)&uri)) { 
+        char            class_id[256];
+        char            uri[256];
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!pzPendingImfilePop(dbh, (char **)&exp_id, &bytes, (char **)&md5sum, (char **)&class_id, (char **)&uri)) { 
             exit(EXIT_FAILURE);
         }
@@ -260,14 +259,13 @@
         psDB            *dbh;
         char            exp_id[256];
-        char            class[256];
-        char            class_id[256];
-        char            uri[256];
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!newImfilePop(dbh, (char **)&exp_id, (char **)&class, (char **)&class_id, (char **)&uri)) { 
+        char            class_id[256];
+        char            uri[256];
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!newImfilePop(dbh, (char **)&exp_id, (char **)&class_id, (char **)&uri)) { 
             exit(EXIT_FAILURE);
         }