diff --git a/producer/api/include/producer/producer.h b/producer/api/include/producer/producer.h
index d5049d86fec02a75a558e9c6b6b012eb178014c7..1d8dbb48e203edf870c177b82425d5091772d37a 100644
--- a/producer/api/include/producer/producer.h
+++ b/producer/api/include/producer/producer.h
@@ -20,9 +20,7 @@ enum class ProducerError {
 
 enum class ProducerStatus {
     kDisconnected,
-    kConnecting,
     kConnected,
-    kSending,
 };
 
 class Producer {
diff --git a/producer/api/src/producer_impl.cpp b/producer/api/src/producer_impl.cpp
index 7de7d25fe55081fdc887bb6dcdebb21c5b185acf..81ceed2c35dd30b3659c26bfe3fcc6f1623678b6 100644
--- a/producer/api/src/producer_impl.cpp
+++ b/producer/api/src/producer_impl.cpp
@@ -47,13 +47,10 @@ hidra2::ProducerError hidra2::ProducerImpl::initialize_socket_to_receiver_(const
 }
 
 hidra2::ProducerError hidra2::ProducerImpl::ConnectToReceiver(const std::string& receiver_address) {
-    if(client_fd_ != -1 && status_ != ProducerStatus::kDisconnected
-            && status_ != ProducerStatus::kConnecting) {
+    if(client_fd_ != -1 && status_ != ProducerStatus::kDisconnected) {
         return ProducerError::kAlreadyConnected;
     }
 
-    status_ = ProducerStatus::kConnecting;
-
     ProducerError error;
     error = initialize_socket_to_receiver_(receiver_address);
     if(error != ProducerError::kNoError) {
@@ -73,8 +70,6 @@ hidra2::ProducerError hidra2::ProducerImpl::Send(uint64_t file_id, const void* d
         return ProducerError::kFileTooLarge;
     }
 
-    status_ = ProducerStatus::kSending;
-
     SendDataRequest sendDataRequest;
     sendDataRequest.op_code = kNetOpcodeSendData;
     sendDataRequest.request_id = request_id++;
diff --git a/receiver/unittests/test_receiver.cpp b/receiver/unittests/test_receiver.cpp
index cab554541dd2b6cd84d8b5dafd97dbe1d5dcccc2..715eadf0b8c54c75ee86461262e7b328a5e5be7a 100644
--- a/receiver/unittests/test_receiver.cpp
+++ b/receiver/unittests/test_receiver.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <unittests/MockIO.h>
 #include "../src/receiver.h"
-#include "../../common/cpp/unittests/MockIO.h"
 
 using ::testing::Return;
 using ::testing::_;