diff --git a/src/lava/magma/runtime/_c_message_infrastructure/csrc/channel/shmem/shmem_port.cc b/src/lava/magma/runtime/_c_message_infrastructure/csrc/channel/shmem/shmem_port.cc
index db9ba4e66..b5ac171d1 100644
--- a/src/lava/magma/runtime/_c_message_infrastructure/csrc/channel/shmem/shmem_port.cc
+++ b/src/lava/magma/runtime/_c_message_infrastructure/csrc/channel/shmem/shmem_port.cc
@@ -99,8 +99,7 @@ void ShmemRecvPort::QueueRecv() {
   while (!done_.load()) {
     bool ret = false;
     if (this->recv_queue_->AvailableCount() > 0) {
-      bool not_empty = recv_queue_->Probe();
-      ret = shm_->Load([this, &not_empty](void* data){
+      ret = shm_->Load([this](void* data){
         MetaDataPtr metadata_res = std::make_shared<MetaData>();
         MetaDataPtrFromPointer(metadata_res, data,
                                nbytes_ - sizeof(MetaData));
diff --git a/src/lava/magma/runtime/_c_message_infrastructure/csrc/core/abstract_port.h b/src/lava/magma/runtime/_c_message_infrastructure/csrc/core/abstract_port.h
index a6be8c8dc..b7f159dee 100644
--- a/src/lava/magma/runtime/_c_message_infrastructure/csrc/core/abstract_port.h
+++ b/src/lava/magma/runtime/_c_message_infrastructure/csrc/core/abstract_port.h
@@ -9,7 +9,6 @@
 #include <string>
 #include <list>
 #include <memory>
-#include <functional>
 
 namespace message_infrastructure {
 
diff --git a/src/lava/magma/runtime/_c_message_infrastructure/csrc/port_proxy.h b/src/lava/magma/runtime/_c_message_infrastructure/csrc/port_proxy.h
index 153503644..1d0e9d3e7 100644
--- a/src/lava/magma/runtime/_c_message_infrastructure/csrc/port_proxy.h
+++ b/src/lava/magma/runtime/_c_message_infrastructure/csrc/port_proxy.h
@@ -14,8 +14,6 @@
 #include <vector>
 #include <tuple>
 #include <utility>
-#include <mutex>  // NOLINT
-#include <condition_variable>  // NOLINT
 
 namespace message_infrastructure {
 
@@ -77,7 +75,6 @@ class RecvPortProxy : public PortProxy {
   py::object Peek();
   std::string Name();
   size_t Size();
-  void SetObserver(std::function<void()> obs);
 
  private:
   py::object MDataToObject_(MetaDataPtr metadata);
diff --git a/src/lava/magma/runtime/message_infrastructure/__init__.py b/src/lava/magma/runtime/message_infrastructure/__init__.py
index 3c67989ec..e2da0ea69 100644
--- a/src/lava/magma/runtime/message_infrastructure/__init__.py
+++ b/src/lava/magma/runtime/message_infrastructure/__init__.py
@@ -86,7 +86,8 @@ def load_library():
             AbstractTransferPort,  # noqa  # nosec
             support_grpc_channel,
             support_fastdds_channel,
-            support_cyclonedds_channel)
+            support_cyclonedds_channel,
+            CPPSelector)
 
     ChannelQueueSize = 1
     SyncChannelBytes = 128
diff --git a/src/lava/magma/runtime/message_infrastructure/ports.py b/src/lava/magma/runtime/message_infrastructure/ports.py
index 56dc2f06f..67f93891a 100644
--- a/src/lava/magma/runtime/message_infrastructure/ports.py
+++ b/src/lava/magma/runtime/message_infrastructure/ports.py
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # See: https://spdx.org/licenses/
 
-from lava.magma.runtime.message_infrastructure import ChannelQueueSize
+from lava.magma.runtime.message_infrastructure import ChannelQueueSize, CPPSelector
 from lava.magma.runtime.message_infrastructure.MessageInfrastructurePywrapper \
     import Channel as CppChannel
 from lava.magma.runtime.message_infrastructure.MessageInfrastructurePywrapper \
@@ -18,9 +18,6 @@
 import numpy as np
 import typing as ty
 import warnings
-from lava.magma.runtime.message_infrastructure.MessageInfrastructurePywrapper \
-    import CPPSelector
-
 
 class Selector(CPPSelector):
     def __init__(self):