diff --git a/source/adios2/helper/adiosMpiHandshake.cpp b/source/adios2/helper/adiosMpiHandshake.cpp
index bd2a78e35a..8fa3301f05 100644
--- a/source/adios2/helper/adiosMpiHandshake.cpp
+++ b/source/adios2/helper/adiosMpiHandshake.cpp
@@ -36,7 +36,6 @@ int MpiHandshake::m_LocalMasterRank;
 std::map<std::string, std::map<int, std::set<int>>> MpiHandshake::m_WritersMap;
 std::map<std::string, std::map<int, std::set<int>>> MpiHandshake::m_ReadersMap;
 std::map<int, int> MpiHandshake::m_AppsSize;
-std::set<int> MpiHandshake::m_RanksToReceive;
 
 size_t MpiHandshake::PlaceInBuffer(size_t stream, int rank)
 {
@@ -48,8 +47,6 @@ void MpiHandshake::Test()
     int success = 0;
     MPI_Status status;
 
-    std::vector<int> ranksToErase;
-
     for (int rank = 0; rank < m_WorldSize; ++rank)
     {
         for (size_t stream = 0; stream < m_MaxStreamsPerApp; ++stream)
@@ -80,13 +77,8 @@ void MpiHandshake::Test()
                     auto &ranks = m_ReadersMap[filename][appMasterRank];
                     ranks.insert(rank);
                 }
-                ranksToErase.push_back(rank);
             }
         }
-        for (auto rankToErase : ranksToErase)
-        {
-            m_RanksToReceive.erase(rankToErase);
-        }
     }
 }
 
@@ -187,7 +179,6 @@ void MpiHandshake::Handshake(const std::string &filename, const char mode,
     {
         m_SendRequests[rank].resize(maxStreamsPerApp);
         m_RecvRequests[rank].resize(maxStreamsPerApp);
-        m_RanksToReceive.insert(rank);
     }
 
     m_ItemSize = maxFilenameLength + sizeof(char) + sizeof(int) * 2;
diff --git a/source/adios2/helper/adiosMpiHandshake.h b/source/adios2/helper/adiosMpiHandshake.h
index e5e89aad45..1a35db086e 100644
--- a/source/adios2/helper/adiosMpiHandshake.h
+++ b/source/adios2/helper/adiosMpiHandshake.h
@@ -116,7 +116,6 @@ class MpiHandshake
     static int m_LocalSize;
     static int m_LocalRank;
     static int m_LocalMasterRank;
-    static std::set<int> m_RanksToReceive;
 
     // <StreamName, <AppMasterRank, AppAllRankSet>>
     static std::map<std::string, std::map<int, std::set<int>>> m_WritersMap;