Index: trunk/Ohana/src/opihi/dvo/avextract.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/avextract.c	(revision 5242)
+++ trunk/Ohana/src/opihi/dvo/avextract.c	(revision 5320)
@@ -67,5 +67,6 @@
       continue;
     }
-    if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, FALSE)) {
+    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    if (!load_catalog (&catalog, FALSE)) {
       unlock_catalog (&catalog);
       continue;
Index: trunk/Ohana/src/opihi/dvo/calextract.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/calextract.c	(revision 5242)
+++ trunk/Ohana/src/opihi/dvo/calextract.c	(revision 5320)
@@ -73,5 +73,6 @@
       continue;
     }
-    if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, FALSE)) {
+    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    if (!load_catalog (&catalog, FALSE)) {
       unlock_catalog (&catalog);
       continue;
Index: trunk/Ohana/src/opihi/dvo/calmextract.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/calmextract.c	(revision 5242)
+++ trunk/Ohana/src/opihi/dvo/calmextract.c	(revision 5320)
@@ -86,5 +86,6 @@
       continue;
     }
-    if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, FALSE)) {
+    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    if (!load_catalog (&catalog, FALSE)) {
       unlock_catalog (&catalog);
       continue;
Index: trunk/Ohana/src/opihi/dvo/catalog.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/catalog.c	(revision 5242)
+++ trunk/Ohana/src/opihi/dvo/catalog.c	(revision 5320)
@@ -321,5 +321,6 @@
 	continue;
       }
-      if (!load_catalog (&catalog, LOAD_AVES, TRUE)) {
+      catalog.catflags = LOAD_AVES;
+      if (!load_catalog (&catalog, TRUE)) {
 	unlock_catalog (&catalog);
 	continue;
Index: trunk/Ohana/src/opihi/dvo/ccd.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/ccd.c	(revision 5242)
+++ trunk/Ohana/src/opihi/dvo/ccd.c	(revision 5320)
@@ -70,5 +70,6 @@
 	continue;
     }
-    if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, FALSE)) {
+    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    if (!load_catalog (&catalog, FALSE)) {
       unlock_catalog (&catalog);
       continue;
Index: trunk/Ohana/src/opihi/dvo/cmatch.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/cmatch.c	(revision 5242)
+++ trunk/Ohana/src/opihi/dvo/cmatch.c	(revision 5320)
@@ -40,5 +40,6 @@
     return (FALSE);
   }
-  if (!load_catalog (&catalog1, LOAD_AVES | LOAD_MEAS | LOAD_SECF, TRUE)) {
+  catalog1.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+  if (!load_catalog (&catalog1, TRUE)) {
     unlock_catalog (&catalog1);
     return (FALSE);
Index: trunk/Ohana/src/opihi/dvo/cmd.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/cmd.c	(revision 5242)
+++ trunk/Ohana/src/opihi/dvo/cmd.c	(revision 5320)
@@ -68,5 +68,6 @@
       continue;
     }
-    if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, FALSE)) {
+    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    if (!load_catalog (&catalog, FALSE)) {
       unlock_catalog (&catalog);
       continue;
Index: trunk/Ohana/src/opihi/dvo/ddmags.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/ddmags.c	(revision 5242)
+++ trunk/Ohana/src/opihi/dvo/ddmags.c	(revision 5320)
@@ -70,5 +70,6 @@
 	continue;
     }
-    if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, FALSE)) {
+    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    if (!load_catalog (&catalog, FALSE)) {
       unlock_catalog (&catalog);
       continue;
Index: trunk/Ohana/src/opihi/dvo/dmagaves.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/dmagaves.c	(revision 5242)
+++ trunk/Ohana/src/opihi/dvo/dmagaves.c	(revision 5320)
@@ -62,5 +62,6 @@
       continue;
     }
-    if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, FALSE)) {
+    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    if (!load_catalog (&catalog, FALSE)) {
       unlock_catalog (&catalog);
       continue;
Index: trunk/Ohana/src/opihi/dvo/dmagmeas.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/dmagmeas.c	(revision 5242)
+++ trunk/Ohana/src/opihi/dvo/dmagmeas.c	(revision 5320)
@@ -70,5 +70,6 @@
 	continue;
     }
-    if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, FALSE)) {
+    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    if (!load_catalog (&catalog, FALSE)) {
       unlock_catalog (&catalog);
       continue;
Index: trunk/Ohana/src/opihi/dvo/dmags.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/dmags.c	(revision 5242)
+++ trunk/Ohana/src/opihi/dvo/dmags.c	(revision 5320)
@@ -68,5 +68,6 @@
 	continue;
     }
-    if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, FALSE)) {
+    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    if (!load_catalog (&catalog, FALSE)) {
       unlock_catalog (&catalog);
       continue;
Index: trunk/Ohana/src/opihi/dvo/dmt.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/dmt.c	(revision 5242)
+++ trunk/Ohana/src/opihi/dvo/dmt.c	(revision 5320)
@@ -77,5 +77,6 @@
       continue;
     }
-    if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, TRUE)) {
+    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    if (!load_catalog (&catalog, TRUE)) {
       unlock_catalog (&catalog);
       continue;
Index: trunk/Ohana/src/opihi/dvo/extract.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/extract.c	(revision 5242)
+++ trunk/Ohana/src/opihi/dvo/extract.c	(revision 5320)
@@ -264,5 +264,6 @@
 	continue;
       }
-      if (!load_catalog (&catalog, loadmode, TRUE)) {
+      catalog.catflags = loadmode;
+      if (!load_catalog (&catalog, TRUE)) {
 	unlock_catalog (&catalog);
 	continue;
Index: trunk/Ohana/src/opihi/dvo/fitcolors.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/fitcolors.c	(revision 5242)
+++ trunk/Ohana/src/opihi/dvo/fitcolors.c	(revision 5320)
@@ -112,5 +112,6 @@
 	continue;
     }
-    if (!load_catalog (&catalog[k], LOAD_AVES | LOAD_MEAS | LOAD_SECF, TRUE)) {
+    catalog[k].catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    if (!load_catalog (&catalog[k], TRUE)) {
       catalog[k].Naverage = 0;
       unlock_catalog (&catalog[k]);
Index: trunk/Ohana/src/opihi/dvo/gstar.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/gstar.c	(revision 5242)
+++ trunk/Ohana/src/opihi/dvo/gstar.c	(revision 5320)
@@ -68,5 +68,6 @@
     return (FALSE);
   }
-  if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, TRUE)) {
+  catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+  if (!load_catalog (&catalog, TRUE)) {
     unlock_catalog (&catalog);
     return (FALSE);
Index: trunk/Ohana/src/opihi/dvo/imdata.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/imdata.c	(revision 5242)
+++ trunk/Ohana/src/opihi/dvo/imdata.c	(revision 5320)
@@ -122,5 +122,6 @@
       continue;
     }
-    if (!load_catalog (&catalog, LOAD_AVES, TRUE)) {
+    catalog.catflags = LOAD_AVES;
+    if (!load_catalog (&catalog, TRUE)) {
       unlock_catalog (&catalog);
       continue;
Index: trunk/Ohana/src/opihi/dvo/lcurve.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/lcurve.c	(revision 5242)
+++ trunk/Ohana/src/opihi/dvo/lcurve.c	(revision 5320)
@@ -88,5 +88,6 @@
     return (FALSE);
   }
-  if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS, TRUE)) {
+  catalog.catflags = LOAD_AVES | LOAD_MEAS;
+  if (!load_catalog (&catalog, TRUE)) {
     unlock_catalog (&catalog);
     return (FALSE);
Index: trunk/Ohana/src/opihi/dvo/lightcurve.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/lightcurve.c	(revision 5242)
+++ trunk/Ohana/src/opihi/dvo/lightcurve.c	(revision 5320)
@@ -65,5 +65,6 @@
     return (FALSE);
   }
-  if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, TRUE)) {
+  catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+  if (!load_catalog (&catalog, TRUE)) {
     unlock_catalog (&catalog);
     return (FALSE);
Index: trunk/Ohana/src/opihi/dvo/mextract.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/mextract.c	(revision 5242)
+++ trunk/Ohana/src/opihi/dvo/mextract.c	(revision 5320)
@@ -69,5 +69,6 @@
       continue;
     }
-    if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, FALSE)) {
+    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    if (!load_catalog (&catalog, FALSE)) {
       unlock_catalog (&catalog);
       continue;
Index: trunk/Ohana/src/opihi/dvo/pmeasure.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/pmeasure.c	(revision 5242)
+++ trunk/Ohana/src/opihi/dvo/pmeasure.c	(revision 5320)
@@ -103,5 +103,6 @@
       continue;
     }
-    if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS, TRUE)) {
+    catalog.catflags = LOAD_AVES | LOAD_MEAS;
+    if (!load_catalog (&catalog, TRUE)) {
       unlock_catalog (&catalog);
       continue;
Index: trunk/Ohana/src/opihi/dvo/subpix.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/subpix.c	(revision 5242)
+++ trunk/Ohana/src/opihi/dvo/subpix.c	(revision 5320)
@@ -50,5 +50,6 @@
     return (FALSE);
   }
-  if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS, TRUE)) {
+  catalog.catflags = LOAD_AVES | LOAD_MEAS;
+  if (!load_catalog (&catalog, TRUE)) {
     unlock_catalog (&catalog);
     return (FALSE);
Index: trunk/Ohana/src/opihi/include/data.h
===================================================================
--- trunk/Ohana/src/opihi/include/data.h	(revision 5242)
+++ trunk/Ohana/src/opihi/include/data.h	(revision 5320)
@@ -7,13 +7,4 @@
 # ifndef DATA_H
 # define DATA_H
-
-/* socket / pipe communication buffer */
-typedef struct {
-  char *buffer;
-  int   Nalloc;
-  int   Nreset;
-  int   Nblock;
-  int   Nbuffer;
-} IOBuffer;
 
 /*** typedef structs used by math functions ***/
@@ -26,11 +17,4 @@
 
 void InitData ();
-
-/* IOBuffersOps.c */
-int InitIOBuffer (IOBuffer *buffer, int Nalloc);
-int FlushIOBuffer (IOBuffer *buffer);
-int ReadtoIOBuffer (IOBuffer *buffer, int fd);
-int EmptyIOBuffer (IOBuffer *buffer, int Nmax, int fd);
-void FreeIOBuffer (IOBuffer *buffer);
 
 /* in queues.c */
Index: trunk/Ohana/src/opihi/lib.data/Makefile
===================================================================
--- trunk/Ohana/src/opihi/lib.data/Makefile	(revision 5242)
+++ trunk/Ohana/src/opihi/lib.data/Makefile	(revision 5320)
@@ -37,5 +37,4 @@
 $(SDIR)/open_image.$(ARCH).o            \
 $(SDIR)/queues.$(ARCH).o		\
-$(SDIR)/IOBufferOps.$(ARCH).o           \
 $(SDIR)/PlotVectors.$(ARCH).o