Index: trunk/pswarp/src/pswarp.c
===================================================================
--- trunk/pswarp/src/pswarp.c	(revision 23195)
+++ trunk/pswarp/src/pswarp.c	(revision 27096)
@@ -28,10 +28,5 @@
 
     psLibInit(NULL);
-
-    // model inits are needed in pmSourceIO
-    // models defined in psphot/src/models are not available in psastro
     pmModelClassInit();
-
-    // init various psphot pieces (errors, models, threads)
     psphotInit();
 
@@ -64,7 +59,7 @@
     }
 
-    psLogMsg("pswarp", 3, "complete pswarp run: %f sec\n", psTimerMark("pswarp"));
-    pswarpCleanup(config);
-    psLibFinalize();
-    exit(PS_EXIT_SUCCESS);
+    psLogMsg("pswarp", PS_LOG_INFO, "complete pswarp run: %f sec\n", psTimerMark("pswarp"));
+
+    psExit exitValue = pswarpCleanup(config);
+    exit(exitValue);
 }