Index: branches/pap/ppSub/src/ppSubData.c
===================================================================
--- branches/pap/ppSub/src/ppSubData.c	(revision 23704)
+++ branches/pap/ppSub/src/ppSubData.c	(revision 23719)
@@ -9,13 +9,4 @@
 
 #include "ppSub.h"
-
-
-// Image files to activate/deactivate
-static const char *imageFiles[] = { "PPSUB.OUTPUT", "PPSUB.OUTPUT.MASK", "PPSUB.OUTPUT.VARIANCE",
-                                    "PPSUB.OUTPUT.KERNELS", "PPSUB.OUTPUT.JPEG1", "PPSUB.OUTPUT.JPEG2",
-                                    "PPSUB.INPUT.CONV", "PPSUB.INPUT.CONV.MASK", "PPSUB.INPUT.CONV.VARIANCE",
-                                    "PPSUB.REF.CONV", "PPSUB.REF.CONV.MASK", "PPSUB.REF.CONV.VARIANCE",
-                                    NULL };
-
 
 
@@ -32,4 +23,7 @@
         fclose(data->statsFile);
     }
+    psFree(data->stamps);
+    psFree(data->psf);
+    psFree(data->statsFile);
     psFree(data->stats);
     return;
@@ -44,9 +38,11 @@
     data->photometry = false;
     data->inverse = false;
+    data->stamps = NULL;
+    data->psf = NULL;
     data->statsFile = NULL;
     data->stats = psMetadataAlloc();
     psMetadataAddS32(data->stats, PS_LIST_TAIL, "QUALITY", 0, "Data quality", 0);
 
-    return options;
+    return data;
 }
 
@@ -62,12 +58,5 @@
     }
 
-    if (files & PPSUB_FILES_IMAGE) {
-        for (int i = 0; imageFiles[i]; i++) {
-            pmFPAfileActivate(config->files, imageFiles[i], false);
-        }
-    }
-    if (files & PPSUB_FILES_PHOT) {
-        psphotFilesActivate(config, false);
-    }
+    ppSubFilesActivate(config, files, false);
 
     psErrorClear();