diff --git a/src/server/distrend.c b/src/server/distrend.c
--- a/src/server/distrend.c
+++ b/src/server/distrend.c
@@ -101,13 +101,6 @@ int distrend_do()
 {
   return 0;
 }
-/**
-   Frees the action. @TODO: Fill stub
-*/
-void distrend_action_free()
-{
-
-}
 
 /** 
     Fill variables at startup from XML dumps or defaults
@@ -1280,13 +1273,11 @@ int main(int argc, char *argv[])
 
   distrend_listen(general_info.config, &clients);
   /* This is called the "main loop" */
-  while(cont)
+  while(!general_info.config->die)
     {
-      struct distrend_action *action;
       int clientsays = 0; /*< temporary example variable, will be replaced when we can handle messages */
 
-      distrend_accept(general_info.config, clients, &action);
-      cont = distrend_do(action);
+      distrend_accept(general_info.config, clients);
 
       /* Make the following code more event-driven */
       frame_watchdog(&general_info.head);
@@ -1312,9 +1303,7 @@ int main(int argc, char *argv[])
       	  clientstatus = CLIENTSTATUS_IDLE; // Sets the client back to idle
       	  finish_frame(&general_info, job, frame->num); // @TODO: Make sure this actually works.
       	}
-
-      distrend_action_free(action);
-    }
+    } /* while(!general_info.config->die) */
 
   distrend_unlisten(general_info.config->listens, clients);
   distrend_config_free(general_info.config);