Index: branches/pap/ppMerge/src/ppMergeCamera.c
===================================================================
--- branches/pap/ppMerge/src/ppMergeCamera.c	(revision 27708)
+++ branches/pap/ppMerge/src/ppMergeCamera.c	(revision 28003)
@@ -19,5 +19,4 @@
                 const char *name,       ///< Name of output file
                 pmFPAfileType type,     ///< Type of file
-                const char *description, ///< Description of file
                 psMetadata *format,     ///< Camera format
                 pmFPAview *view         ///< View for PHU
@@ -84,5 +83,5 @@
     output->save = true;
 
-    if (!pmFPAAddSourceFromView(fpa, description, view, format)) {
+    if (!pmFPAAddSourceFromView(fpa, view, format)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to generate output FPA.");
         return false;
@@ -337,10 +336,10 @@
       case PPMERGE_TYPE_FRINGE:
         fileType = PM_FPA_FILE_FRINGE;
-	break;
+        break;
       default:
         psAbort("Unknown frame type: %x", type);
     }
 
-    if (!outputFile(config, outName, fileType, "Merged detrend", format, phuView)) {
+    if (!outputFile(config, outName, fileType, format, phuView)) {
         psFree(outName);
         psFree(phuView);
@@ -349,10 +348,10 @@
     psFree(outName);
 
-    if (!outputFile(config, "PPMERGE.OUTPUT.SIGMA", PM_FPA_FILE_IMAGE, "Merge sigma", format, phuView)) {
+    if (!outputFile(config, "PPMERGE.OUTPUT.SIGMA", PM_FPA_FILE_IMAGE, format, phuView)) {
         psFree(phuView);
         return false;
     }
 
-    if (!outputFile(config, "PPMERGE.OUTPUT.COUNT", PM_FPA_FILE_IMAGE, "Merged count", format, phuView)) {
+    if (!outputFile(config, "PPMERGE.OUTPUT.COUNT", PM_FPA_FILE_IMAGE, format, phuView)) {
         psFree(phuView);
         return false;