Index: trunk/psphot/src/psphot.c
===================================================================
--- trunk/psphot/src/psphot.c	(revision 4574)
+++ trunk/psphot/src/psphot.c	(revision 4641)
@@ -34,7 +34,4 @@
     psf = choose_psf_model (config, sources, sky);
 
-    // identify defects based on 1-pixel wide x and y direction 2nd moments
-    // find_defects (zap, sources, config, psf);
-
     // test PSF on all except SATURATE and DEFECT (artifacts)
     apply_psf_model (imdata, config, sources, psf, sky);
@@ -43,11 +40,6 @@
     fit_galaxies (imdata, config, sources, sky);
 
-    // subtract_galaxies (sources, config);
- 
-    DumpImage (imdata->image, argv[2]);
-    DumpModelPSF (sources, "psfsources.dat");
-    DumpModelFLT (sources, "fltsources.dat");
-    DumpModelNULL (sources, "nullsources.dat");
-    DumpMoments (sources, "moments.dat");
+    // write out data in appropriate format
+    output (imdata, config, sources);
 
     exit (0);