diff --git a/mission/tmtc/CcsdsIpCoreHandler.cpp b/mission/tmtc/CcsdsIpCoreHandler.cpp
index 9a892977..ec6602cc 100644
--- a/mission/tmtc/CcsdsIpCoreHandler.cpp
+++ b/mission/tmtc/CcsdsIpCoreHandler.cpp
@@ -108,43 +108,6 @@ void CcsdsIpCoreHandler::readCommandQueue(void) {
 
 MessageQueueId_t CcsdsIpCoreHandler::getCommandQueue() const { return commandQueue->getId(); }
 
-// void CcsdsIpCoreHandler::addVirtualChannel(VcId_t vcId, VirtualChannelWithQueue* virtualChannel)
-// {
-//   if (vcId > config::NUMBER_OF_VIRTUAL_CHANNELS) {
-//     sif::warning << "CcsdsHandler::addVirtualChannel: Invalid virtual channel ID" << std::endl;
-//     return;
-//   }
-//
-//   if (virtualChannel == nullptr) {
-//     sif::warning << "CcsdsHandler::addVirtualChannel: Invalid virtual channel interface"
-//                  << std::endl;
-//     return;
-//   }
-//
-//   auto status = virtualChannelMap.emplace(vcId, virtualChannel);
-//   if (status.second == false) {
-//     sif::warning << "CcsdsHandler::addVirtualChannel: Failed to add virtual channel to "
-//                     "virtual channel map"
-//                  << std::endl;
-//     return;
-//   }
-// }
-
-// MessageQueueId_t CcsdsIpCoreHandler::getReportReceptionQueue(uint8_t virtualChannel) const {
-//   if (virtualChannel > config::NUMBER_OF_VIRTUAL_CHANNELS) {
-//     sif::debug << "CcsdsHandler::getReportReceptionQueue: Invalid virtual channel requested";
-//     return MessageQueueIF::NO_QUEUE;
-//   }
-//   auto iter = virtualChannelMap.find(virtualChannel);
-//   if (iter != virtualChannelMap.end()) {
-//     return iter->second->getReportReceptionQueue();
-//   }
-//   sif::warning << "CcsdsHandler::getReportReceptionQueue: Virtual channel with ID "
-//                << static_cast<unsigned int>(virtualChannel) << " not in virtual channel map"
-//                << std::endl;
-//   return MessageQueueIF::NO_QUEUE;
-// }
-
 ReturnValue_t CcsdsIpCoreHandler::getParameter(uint8_t domainId, uint8_t uniqueIdentifier,
                                                ParameterWrapper* parameterWrapper,
                                                const ParameterWrapper* newValues,
diff --git a/mission/tmtc/CcsdsIpCoreHandler.h b/mission/tmtc/CcsdsIpCoreHandler.h
index 4a501ab5..a147a13f 100644
--- a/mission/tmtc/CcsdsIpCoreHandler.h
+++ b/mission/tmtc/CcsdsIpCoreHandler.h
@@ -69,13 +69,6 @@ class CcsdsIpCoreHandler : public SystemObject,
   ReturnValue_t performOperation(uint8_t operationCode = 0) override;
   ReturnValue_t initialize();
   MessageQueueId_t getCommandQueue() const override;
-  /**
-   * Currently directly forwards requests to the virtual channels which might live
-   * in different threads.
-   * @param virtualChannel
-   * @return
-   */
-  // MessageQueueId_t getReportReceptionQueue(uint8_t virtualChannel) const override;
 
   // ModesIF
   void getMode(Mode_t* mode, Submode_t* submode) override;
@@ -84,14 +77,6 @@ class CcsdsIpCoreHandler : public SystemObject,
   void startTransition(Mode_t mode, Submode_t submode) override;
   void announceMode(bool recursive) override;
 
-  /**
-   * @brief   Function to add a virtual channel
-   *
-   * @param virtualChannelId  ID of the virtual channel to add
-   * @param virtualChannel    Pointer to virtual channel object
-   */
-  // void addVirtualChannel(VcId_t virtualChannelId, VirtualChannelWithQueue* virtualChannel);
-
   ReturnValue_t getParameter(uint8_t domainId, uint8_t uniqueIdentifier,
                              ParameterWrapper* parameterWrapper, const ParameterWrapper* newValues,
                              uint16_t startAtIndex);