diff --git a/modules/softwareintegration/network/softwareconnection.cpp b/modules/softwareintegration/network/softwareconnection.cpp
index 389803ea51..f8305d78d1 100644
--- a/modules/softwareintegration/network/softwareconnection.cpp
+++ b/modules/softwareintegration/network/softwareconnection.cpp
@@ -134,12 +134,6 @@ SoftwareConnection::Message SoftwareConnection::receiveMessage() {
     else if (type == "PDAT") {
         return Message(MessageType::ReadPointData, subjectBuffer);
     }
-    else if (type == "LUMI") {
-        return Message(MessageType::ReadLuminosityData, subjectBuffer);
-    }
-    else if (type == "VELO") {
-        return Message(MessageType::ReadVelocityData, subjectBuffer);
-    }
     else if (type == "ASGN") {
         return Message(MessageType::AddSceneGraphNode, subjectBuffer);
     }
diff --git a/modules/softwareintegration/network/softwareconnection.h b/modules/softwareintegration/network/softwareconnection.h
index bd42027ee0..30ec837881 100644
--- a/modules/softwareintegration/network/softwareconnection.h
+++ b/modules/softwareintegration/network/softwareconnection.h
@@ -40,8 +40,6 @@ public:
     enum class MessageType : uint32_t {
         Connection = 0,
         ReadPointData,
-        ReadLuminosityData,
-        ReadVelocityData,
         AddSceneGraphNode,
         RemoveSceneGraphNode,
         Color,
diff --git a/modules/softwareintegration/softwareintegrationmodule.cpp b/modules/softwareintegration/softwareintegrationmodule.cpp
index a36ba8277f..3ed8683ff0 100644
--- a/modules/softwareintegration/softwareintegrationmodule.cpp
+++ b/modules/softwareintegration/softwareintegrationmodule.cpp
@@ -225,16 +225,6 @@ void SoftwareIntegrationModule::handlePeerMessage(PeerMessage peerMessage) {
         }
         break;
     }
-    case SoftwareConnection::MessageType::ReadLuminosityData: {
-        _luminosityData.clear();
-        _luminosityData = readData(message);
-        break;
-    }
-    case SoftwareConnection::MessageType::ReadVelocityData: {
-        _velocityData.clear();
-        _velocityData = readData(message);
-        break;
-    }
     case SoftwareConnection::MessageType::AddSceneGraphNode: {
         std::string sgnMessage(message.begin(), message.end());
         LDEBUG(fmt::format("Message recieved.. Scene Graph Node Data: {}", sgnMessage));
@@ -262,27 +252,6 @@ void SoftwareIntegrationModule::handlePeerMessage(PeerMessage peerMessage) {
         renderable.setValue("Size", static_cast<double>(size));
         renderable.setValue("Data", pointDataDictonary);
 
-        bool hasLuminosityData = !_luminosityData.empty();
-        bool hasVelocityData = !_velocityData.empty();
-
-        if (hasLuminosityData) {
-            ghoul::Dictionary luminosityDataDictonary;
-            for (int i = 0; i < _luminosityData.size(); ++i) {
-                const std::string key = fmt::format("[{}]", i + 1);
-                luminosityDataDictonary.setValue<double>(key, _luminosityData[i]);
-            }
-            renderable.setValue("Luminosity", luminosityDataDictonary);
-        }
-
-        if (hasVelocityData) {
-            ghoul::Dictionary velocityDataDictionary;
-            for (int i = 0; i < _velocityData.size(); ++i) {
-                const std::string key = fmt::format("[{}]", i + 1);
-                velocityDataDictionary.setValue<double>(key, _velocityData[i]);
-            }
-            renderable.setValue("Velocity", velocityDataDictionary);
-        }
-
         ghoul::Dictionary gui;
         gui.setValue("Name", guiName);
         gui.setValue("Path", "/Software Integration"s);
diff --git a/modules/softwareintegration/softwareintegrationmodule.h b/modules/softwareintegration/softwareintegrationmodule.h
index 746be987ed..8a51cce153 100644
--- a/modules/softwareintegration/softwareintegrationmodule.h
+++ b/modules/softwareintegration/softwareintegrationmodule.h
@@ -90,10 +90,6 @@ private:
     // Maybe the MessageType::AddSceneGraphNode can be removed, and instead the SGN is
     // always added when reading a point data set? Then we wouldn't have to store the data
     std::vector<glm::vec3> _pointData;
-    // @TODO (emmbr 2021-02-02) The velocity and luminosity seems to be a WIP and is
-    // actually not used anywhere. Maybe remove everything related to it, for now?
-    std::vector<float> _luminosityData;
-    std::vector<float> _velocityData;
 
     std::unordered_map<size_t, std::shared_ptr<Peer>> _peers;
     mutable std::mutex _peerListMutex;