diff --git a/slsReceiverSoftware/include/UDPInterface.h b/slsReceiverSoftware/include/UDPInterface.h
index 4769cab55..5065f3ab4 100644
--- a/slsReceiverSoftware/include/UDPInterface.h
+++ b/slsReceiverSoftware/include/UDPInterface.h
@@ -502,13 +502,6 @@ class UDPInterface {
 	virtual int setActivate(int enable = -1) = 0;
 
 
-	/**
-	 * Activate / Deactivate Receiver
-	 * If deactivated, receiver will write dummy packets 0xFF
-	 * (as it will receive nothing from detector)
-	 */
-	virtual int setActivate(int enable = -1) = 0;
-
 	//***callback functions***
 	/**
 	 * Call back for start acquisition
diff --git a/slsReceiverSoftware/src/UDPStandardImplementation.cpp b/slsReceiverSoftware/src/UDPStandardImplementation.cpp
index a185326a9..5823220be 100644
--- a/slsReceiverSoftware/src/UDPStandardImplementation.cpp
+++ b/slsReceiverSoftware/src/UDPStandardImplementation.cpp
@@ -1531,7 +1531,7 @@ int UDPStandardImplementation::createNewFile(int ithread){
 	int index = 0;
 	if(totalWritingPacketCount[ithread]){
 		index = frameIndex[ithread];
-		cout << "\nThread " << ithread << "\tFile:" << completeFileName <<endl;
+		cout << "\nThread " << ithread << "\tFile:" << completeFileName[ithread] <<endl;
 	}
 
 	//create file name
@@ -2626,18 +2626,21 @@ void UDPStandardImplementation::stopWriting(int ithread, char* wbuffer){
 		fseek(sfilefd[ithread],0,0);
 		fwrite((void*)fileHeader[ithread], 1, FILE_HEADER_SIZE, sfilefd[ithread]);
 	}
-	cout << "\nThread " << ithread << "\tFile:" << completeFileName <<endl;
-			//<< "Packet Loss:" <<
-			//setw(4)<<fixed << setprecision(4) <<
-			//dec <<	(int)((( (currentFrameNumber-1-previousFrameNumber) - ((packetsInFile-numTotMissingPacketsInFile)/packetsPerFrame))/
-			//		 (double)(currentFrameNumber-1-previousFrameNumber))*100.000)
-			//<< "%\t"
-	cout 	<<		"\tPackets Lost:" << dec << ( ((int)(currentFrameNumber[ithread]-frameNumberInPreviousFile[ithread])*packetsPerFrame) -
-						totalPacketsInFile[ithread])
-			<<		"\tCurrentFrameNumber:" << currentFrameNumber[ithread]
-			<< 		"\tPreviousFrameNumber:" << frameNumberInPreviousFile[ithread]
-			//<< 	"\tIndex:" << dec << index
-			<< endl;
+
+	if(totalWritingPacketCount[ithread]){
+		cout << "\nThread " << ithread << "\tFile:" << completeFileName[ithread] <<endl;
+				//<< "Packet Loss:" <<
+				//setw(4)<<fixed << setprecision(4) <<
+				//dec <<	(int)((( (currentFrameNumber-1-previousFrameNumber) - ((packetsInFile-numTotMissingPacketsInFile)/packetsPerFrame))/
+				//		 (double)(currentFrameNumber-1-previousFrameNumber))*100.000)
+				//<< "%\t"
+		cout 	<<		"\tPackets Lost:" << dec << ( ((int)(currentFrameNumber[ithread]-frameNumberInPreviousFile[ithread])*packetsPerFrame) -
+							totalPacketsInFile[ithread])
+				 <<		"\tCurrentFrameNumber:" << currentFrameNumber[ithread]
+				 << 	"\tPreviousFrameNumber:" << frameNumberInPreviousFile[ithread]
+				//<< 	"\tIndex:" << dec << index
+				<< endl;
+	}
 	closeFile(ithread);
 	pthread_mutex_lock(&statusMutex);
 	writerThreadsMask^=(1<<ithread);
diff --git a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
index 8cdc6f282..1a477e7cd 100644
--- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
+++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
@@ -2861,75 +2861,6 @@ int slsReceiverTCPIPInterface::set_fifo_depth() {
 
 
 
-int slsReceiverTCPIPInterface::set_activate() {
-	ret=OK;
-	int retval=-1;
-	int enable;
-	strcpy(mess,"Could not activate/deactivate\n");
-
-
-	// receive arguments
-	if(socket->ReceiveDataOnly(&enable,sizeof(enable)) < 0 ){
-		strcpy(mess,"Error reading from socket\n");
-		cprintf(RED,"%s",mess);
-		ret = FAIL;
-	}
-
-	// execute action if the arguments correctly arrived
-#ifdef SLS_RECEIVER_UDP_FUNCTIONS
-	if (ret==OK) {
-		if (lockStatus==1 && socket->differentClients==1){
-			sprintf(mess,"Receiver locked by %s\n", socket->lastClientIP);
-			ret=FAIL;
-		}
-
-		if(ret!=FAIL){
-			if (receiverBase == NULL){
-				strcpy(mess,SET_RECEIVER_ERR_MESSAGE);
-				cprintf(RED,"%s",mess);
-				ret=FAIL;
-			}else if(receiverBase->getStatus()==RUNNING){
-				strcpy(mess,"Cannot activate/deactivate while status is running\n");
-				cprintf(RED,"%s",mess);
-				ret=FAIL;
-			}else{
-				if(enable != -1)
-					receiverBase->setActivate(enable);
-				retval = receiverBase->getActivate();
-				if(enable >= 0 && retval != enable){
-					sprintf(mess,"Tried to set activate to %d, but returned %d\n",enable,retval);
-					ret = FAIL;
-					cprintf(RED,"%s",mess);
-				}
-			}
-		}
-	}
-#endif
-#ifdef VERYVERBOSE
-	if(ret!=FAIL)
-		cout << "Activate: " << retval << endl;
-	else
-		cout << mess << endl;
-#endif
-
-
-	if(ret==OK && socket->differentClients){
-		FILE_LOG(logDEBUG) << "Force update";
-		ret=FORCE_UPDATE;
-	}
-
-	// send answer
-	socket->SendDataOnly(&ret,sizeof(ret));
-	if(ret==FAIL){
-		cprintf(RED,"%s\n",mess);
-		socket->SendDataOnly(mess,sizeof(mess));
-	}
-	socket->SendDataOnly(&retval,sizeof(retval));
-
-	//return ok/fail
-	return ret;
-}
-
 
 int slsReceiverTCPIPInterface::set_activate() {
 	ret=OK;