diff --git a/src/server/distrend.c b/src/server/distrend.c
--- a/src/server/distrend.c
+++ b/src/server/distrend.c
@@ -247,8 +247,8 @@ int restoreJobState(struct distrenjob *j
 */
 int prepare_distrenjob(struct general_info *geninfo, int type, char *name, char *submitter, char *email, int priority, int start_frame, int end_frame, int width, int height)
 {
+  int counter;
   int counter2;
-  int counter;
   int tmp;
   char *path_with_num;
   char *serialfile;
@@ -672,17 +672,7 @@ int distrend_do_config(int argc, char *a
 
   int tmp;
 
-  /*
-   * test distrenjob_unserialize()
-   */
-  tmp = distrenjob_unserialize(&distrenjob, "distrenjob.xml.example");
-  if(tmp)
-    fprintf(stderr, "distrenjob_unserialize() returned %d. Try to cd to distren/doc if you want to test out the distrenjob_unserialize() function. (This will only fix this error if the error is due to an inability of the xml library to access distrenjob.xml.example)\n\n", tmp);
-  else
-    fprintf(stderr, "using email ``%s'' for user ``%s'' -- reading in XML files and pulling data from them using libxml2+XPath works!!!\n", distrenjob->email, distrenjob->submitter);
-
-  fprintf(stderr, "%s:%d running config\n", __FILE__, __LINE__);
-
+  fprintf(stderr, "%s:%d: running config\n", __FILE__, __LINE__);
   *config = malloc(sizeof(struct distrend_config));
   myopts[1].simple_value = &(*config)->datadir;
 
@@ -1134,7 +1124,7 @@ int main(int argc, char *argv[])
 
   /* Argument-parser */
   int counter;
-  int test; // Interactive test mode if 1
+  int test; /*< Interactive mode if 1 */
 
   struct general_info general_info;
 
@@ -1191,9 +1181,9 @@ int main(int argc, char *argv[])
       return 1;
     }
 
-  // pre-loaded jobs for testing
+  /** pre-loaded jobs for testing */
   prepare_distrenjob(&general_info, 1, "awesome", "LordOfWar", "onlylordofwar@gmail.com", 8, 1, 100, 640, 480);
-  prepare_distrenjob(&general_info, 1, "hamburger", "Ohnobinki", "ohnobinki@ohnopublishing.net", 3, 1, 50, 1280, 720);
+  prepare_distrenjob(&general_info, 1, "hamburger", "ohnobinki", "ohnobinki@ohnopublishing.net", 3, 1, 50, 1280, 720);
 
   while(test == 1)
   {