Index: trunk/pswarp/src/pswarpArguments.c
===================================================================
--- trunk/pswarp/src/pswarpArguments.c	(revision 25047)
+++ trunk/pswarp/src/pswarpArguments.c	(revision 25518)
@@ -74,9 +74,4 @@
     pswarpSetThreads ();
 
-    // PSF determination?
-    if ((N = psArgumentGet(argc, argv, "-psf"))) {
-        psArgumentRemove(N, &argc, argv);
-        psMetadataAddBool(config->arguments, PS_LIST_TAIL, "PSF", 0, "Do PSF determination?", true);
-    }
     if ((N = psArgumentGet(argc, argv, "-dumpconfig"))) {
         psArgumentRemove(N, &argc, argv);
Index: trunk/pswarp/src/pswarpLoop.c
===================================================================
--- trunk/pswarp/src/pswarpLoop.c	(revision 25047)
+++ trunk/pswarp/src/pswarpLoop.c	(revision 25518)
@@ -16,5 +16,4 @@
 
 #define WCS_NONLIN_TOL 0.001            // Non-linear tolerance for header WCS
-#define PSPHOT_FIND_PSF 1               // Use psphot's findPSF function?
 #define TESTING 0                       // Testing output?
 
@@ -380,5 +379,5 @@
     // that's going to be tricky.  We have a list of sources, so we use those to redetermine the PSF model.
 
-    if (psMetadataLookupBool(&mdok, config->arguments, "PSF")) {
+    if (psMetadataLookupBool(&mdok, recipe, "PSF")) {
         fileActivation(config, photFiles, true);
         ioChecksBefore(config);