diff --git a/slsReceiverSoftware/src/MultiReceiverApp.cpp b/slsReceiverSoftware/src/MultiReceiverApp.cpp
index b6c0c24e5..fc742ce42 100755
--- a/slsReceiverSoftware/src/MultiReceiverApp.cpp
+++ b/slsReceiverSoftware/src/MultiReceiverApp.cpp
@@ -1,21 +1,4 @@
-/**
- \file mainReceiver.cpp
-
-This file is an example of how to implement the Receiver class
-You can compile it linking it to the slsReceiver library
-
-g++ mainReceiver.cpp -L lib -lSlsReceiver -L/usr/lib64/ -L lib2 -lzmq  -pthread -lrt -lm -lstdc++
-
-where,
-
-lib is the location of lSlsReceiver.so
-
-lib2 is the location of the libzmq.a.
-[ libzmq.a is required only when using data call backs and enabling data streaming from receiver to client.
-It is linked in manual/manual-api from slsReceiverSoftware/include ]
-
- */
-
+/* Creates the slsMultiReceiver for running multiple receivers form a single binary */
 #include "sls_detector_defs.h"
 #include "Receiver.h"
 #include "container_utils.h"
diff --git a/slsReceiverSoftware/src/ReceiverApp.cpp b/slsReceiverSoftware/src/ReceiverApp.cpp
index e30785470..81508059f 100755
--- a/slsReceiverSoftware/src/ReceiverApp.cpp
+++ b/slsReceiverSoftware/src/ReceiverApp.cpp
@@ -1,5 +1,4 @@
-/* A simple server in the internet domain using TCP
-   The port number is passed as an argument */
+/* slsReceiver */
 
 #include "logger.h"
 #include "Receiver.h"
@@ -23,47 +22,6 @@ void sigInterruptHandler(int p){
 	sem_post(&semaphore);
 }
 
-/** Define Colors to print data call back in different colors for different recievers */
-/*
-#define PRINT_IN_COLOR(c,f, ...) 	printf ("\033[%dm" f RESET, 30 + c+1, ##__VA_ARGS__)
-
-int StartAcq(std::string filepath, std::string filename, uint64_t fileindex, uint32_t datasize, void*p){
-  FILE_LOG(logINFO) << "#### StartAcq:  "
-		  "filepath: " << filepath << "filename: " << filename <<
-		  "fileindex: " << fileindex << "datasize: " << datasize << " ####";
-  FILE_LOG(logINFO) << "--StartAcq: returning 0";
-  return 0;
-}
-
-
-void AcquisitionFinished(uint64_t frames, void*p){
-	 FILE_LOG(logINFO) << "#### AcquisitionFinished: frames:" << frames << " ####";
-}
-
-
-void GetData(char* metadata, char* datapointer, uint32_t datasize, void* p){
-	slsDetectorDefs::sls_receiver_header* header = (slsDetectorDefs::sls_receiver_header*)metadata;
-	slsDetectorDefs::sls_detector_header detectorHeader = header->detHeader;
-
-	PRINT_IN_COLOR (detectorHeader.modId?detectorHeader.modId:detectorHeader.row,
-			"#### %d GetData: ####\n"
-			"frameNumber: %lu\t\texpLength: %u\t\tpacketNumber: %u\t\tbunchId: %lu"
-			"\t\ttimestamp: %lu\t\tmodId: %u\t\t"
-			"row: %u\t\tcolumn: %u\t\treserved: %u\t\tdebug: %u"
-			"\t\troundRNumber: %u\t\tdetType: %u\t\tversion: %u"
-			//"\t\tpacketsMask:%s"
-			"\t\tfirstbytedata: 0x%x\t\tdatsize: %u\n\n",
-			detectorHeader.row, (long unsigned int)detectorHeader.frameNumber,
-			detectorHeader.expLength, detectorHeader.packetNumber, (long unsigned int)detectorHeader.bunchId,
-			(long unsigned int)detectorHeader.timestamp, detectorHeader.modId,
-			detectorHeader.row, detectorHeader.column, detectorHeader.reserved,
-			detectorHeader.debug, detectorHeader.roundRNumber,
-			detectorHeader.detType, detectorHeader.version,
-			//header->packetsMask.to_string().c_str(),
-            ((uint8_t)(*((uint8_t*)(datapointer)))), datasize);
-}
-*/
-
 
 int main(int argc, char *argv[]) {
 
@@ -99,45 +57,6 @@ int main(int argc, char *argv[]) {
 		throw;
 	}
 
-	//register callbacks
-
-	/**
-	   callback arguments are
-	   filepath
-	   filename
-	   fileindex
-	   datasize
-
-	   return value is 
-	   0 raw data ready callback takes care of open,close,write file
-	   1 callback writes file, we have to open, close it
-	   2 we open, close, write file, callback does not do anything
-
-	   registerCallBackStartAcquisition(int (*func)(std::string, std::string, int, int, void*),void *arg);
-	 */
-	//receiver->registerCallBackStartAcquisition(startAcquisitionCallBack,NULL);
-
-
-	/**
-	  callback argument is
-	  total farmes caught
-	  registerCallBackAcquisitionFinished(void (*func)(int, void*),void *arg);
-	 */
-	//receiver->registerCallBackAcquisitionFinished(acquisitionFinishedCallBack,NULL);
-
-
-	/**
-	  args to raw data ready callback are
-	  sls_receiver_header frame metadata
-	  datapointer
-	  file descriptor
-	  guidatapointer (NULL, no data required)
-	  NEVER DELETE THE DATA POINTER
-	  REMEMBER THAT THE CALLBACK IS BLOCKING
-	  registerCallBackRawDataReady(void (*func)(char*, char*, uint32_t, void*),void *arg);
-	 */
-	//receiver->registerCallBackRawDataReady(rawDataReadyCallBack,NULL);
-
 	FILE_LOG(logINFO) << "[ Press \'Ctrl+c\' to exit ]";
 	sem_wait(&semaphore);
 	sem_destroy(&semaphore);