diff --git a/cpp/controllers/generic_controller.cpp b/cpp/controllers/generic_controller.cpp
index ca4c716b..aa49cf77 100644
--- a/cpp/controllers/generic_controller.cpp
+++ b/cpp/controllers/generic_controller.cpp
@@ -431,7 +431,7 @@ void GenericController::Receive()
         break;
 
     case phase_t::dataout:
-        DataOut();
+        // All data have been transferred
         Status();
         break;
 
@@ -442,36 +442,6 @@ void GenericController::Receive()
     }
 }
 
-void GenericController::DataOut() const
-{
-    assert(IsDataOut());
-
-    switch (GetOpcode()) {
-    case scsi_command::cmd_write6:
-        case scsi_command::cmd_write10:
-        case scsi_command::cmd_write16:
-        case scsi_command::cmd_write_long10:
-        case scsi_command::cmd_write_long16:
-        case scsi_command::cmd_verify10:
-        case scsi_command::cmd_verify16:
-        case scsi_command::cmd_mode_select6:
-        case scsi_command::cmd_mode_select10:
-        break;
-
-    case scsi_command::cmd_set_mcast_addr:
-        // TODO: Eventually, we should store off the multicast address configuration data here
-        break;
-
-    case scsi_command::cmd_set_iface_mode:
-        // TODO Should the DaynaPort MAC address actually be set here?
-        break;
-
-    default:
-        LogWarn(fmt::format("Unexpected Data Out phase for command ${:02x}", static_cast<int>(GetOpcode())));
-        break;
-    }
-}
-
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 bool GenericController::XferIn(vector<uint8_t> &buf)
diff --git a/cpp/controllers/generic_controller.h b/cpp/controllers/generic_controller.h
index 9627580a..a1691cda 100644
--- a/cpp/controllers/generic_controller.h
+++ b/cpp/controllers/generic_controller.h
@@ -47,7 +47,6 @@ class GenericController : public AbstractController
     void Receive();
 
     void Execute();
-    void DataOut() const;
 
     virtual void ParseMessage() = 0;
     virtual void ProcessMessage() = 0;