diff --git a/src/server/distrend.c b/src/server/distrend.c
--- a/src/server/distrend.c
+++ b/src/server/distrend.c
@@ -181,41 +181,16 @@ int main(int argc, char *argv[])
 
   distrend_listen_handler_add(general_info.config->listens, DISTREN_REQUEST_VERSION, &distrend_handle_version);
 
-  int slaveKey = 0; // Remotio should set me on a per-slave basis
   /* Main Loop */
   general_info.config->die = 0;
   while(!general_info.config->die)
     {
-      int clientrequest = 0; /*< temporary example variable, will be replaced when we can handle messages */
-
       multiio_poll(multiio, 15000);
 
       tabletennis_serve(general_info.config->listens->tabletennis);
 
       /* Run the watchdog, @TODO: like every 10 mins or something */
       frame_watchdog(general_info.conn);
-
-      struct frameset frame;
-      struct distrenjob *job;
-      distrenjob_new(&job);
-
-      memset(&frame, '\0', sizeof(frame));
-
-      /** If client requests work */
-      if(clientrequest == DISTREN_REQUEST_GETWORK)
-	{
-	  int returnnum = find_jobframe(general_info.conn, slaveKey, &job->jobnum, &frame.num); // Finds a frame to render @FIXME: Slavenum :D
-	  if(returnnum); /* No work on server */
-	  else
-	    remotio_send_to_client(frame.num, job->jobnum); // Pseudo-sends data to client
-	}
-      /* If the client states that they finished the frame */
-      else if(clientrequest == DISTREN_REQUEST_DONEFRAME)
-	{
-	  clientstatus = CLIENTSTATUS_IDLE; // Sets the client back to idle
-	  finish_frame(general_info.conn, 0, job->jobnum, frame.num); // @TODO: Make sure this actually works.
-	}
-      distrenjob_free(&job);
     }
 
   distrend_listen_free(general_info.config->listens);