diff -r 5521e5fb77ac -r 3985adebd792 src/mem/protocol/MESI_CMP_directory-msg.sm
--- a/src/mem/protocol/MESI_CMP_directory-msg.sm	Mon Sep 24 20:07:04 2012 -0500
+++ b/src/mem/protocol/MESI_CMP_directory-msg.sm	Mon Sep 24 20:07:30 2012 -0500
@@ -83,5 +83,3 @@
   int AckCount, default="0",  desc="number of acks in this message";
   MessageSizeType MessageSize,  desc="size category of the message";
 }
-
-
diff -r 5521e5fb77ac -r 3985adebd792 src/mem/protocol/MI_example-msg.sm
--- a/src/mem/protocol/MI_example-msg.sm	Mon Sep 24 20:07:04 2012 -0500
+++ b/src/mem/protocol/MI_example-msg.sm	Mon Sep 24 20:07:30 2012 -0500
@@ -57,17 +57,6 @@
   WRITEBACK,         desc="Generic writeback (contains data)";
 }
 
-// TriggerType
-enumeration(TriggerType, desc="...") {
-  ALL_ACKS,            desc="See corresponding event";
-}
-
-// TriggerMsg
-structure(TriggerMsg, desc="...", interface="Message") {
-  Address Address,             desc="Physical address for this request";
-  TriggerType Type,            desc="Type of trigger";
-}
-
 // RequestMsg (and also forwarded requests)
 structure(RequestMsg, desc="...", interface="NetworkMessage") {
   Address Address,             desc="Physical address for this request";
diff -r 5521e5fb77ac -r 3985adebd792 src/mem/protocol/MOESI_CMP_directory-msg.sm
--- a/src/mem/protocol/MOESI_CMP_directory-msg.sm	Mon Sep 24 20:07:04 2012 -0500
+++ b/src/mem/protocol/MOESI_CMP_directory-msg.sm	Mon Sep 24 20:07:30 2012 -0500
@@ -100,5 +100,3 @@
   int Acks,                    desc="How many acks to expect";
   MessageSizeType MessageSize, desc="size category of the message";
 }
-
-
diff -r 5521e5fb77ac -r 3985adebd792 src/mem/protocol/MOESI_CMP_token-msg.sm
--- a/src/mem/protocol/MOESI_CMP_token-msg.sm	Mon Sep 24 20:07:04 2012 -0500
+++ b/src/mem/protocol/MOESI_CMP_token-msg.sm	Mon Sep 24 20:07:30 2012 -0500
@@ -57,20 +57,6 @@
   INV,         desc="L1 informing L2 of loss of all tokens";
 }
 
-// TriggerType
-enumeration(TriggerType, desc="...") {
-  REQUEST_TIMEOUT,         desc="See corresponding event";
-  USE_TIMEOUT,             desc="See corresponding event";
-  DATA,                    desc="data for dma read response";
-  DATA_ALL_TOKENS,         desc="data and all tokens for dma write response";
-}
-
-// TriggerMsg
-structure(TriggerMsg, desc="...", interface="Message") {
-  Address Address,             desc="Physical address for this request";
-  TriggerType Type,            desc="Type of trigger";
-}
-
 // PersistentMsg
 structure(PersistentMsg, desc="...", interface="NetworkMessage") {
   Address Address,             desc="Physical address for this request";
diff -r 5521e5fb77ac -r 3985adebd792 src/mem/protocol/Network_test-msg.sm
--- a/src/mem/protocol/Network_test-msg.sm	Mon Sep 24 20:07:04 2012 -0500
+++ b/src/mem/protocol/Network_test-msg.sm	Mon Sep 24 20:07:30 2012 -0500
@@ -41,37 +41,3 @@
   DataBlock DataBlk,           desc="data for the cache line";
   MessageSizeType MessageSize, desc="size category of the message";
 }
-
-
-enumeration(DMARequestType, desc="...", default="DMARequestType_NULL") {
-  READ,          desc="Memory Read";
-  WRITE,         desc="Memory Write";
-  NULL,          desc="Invalid";
-}
-
-enumeration(DMAResponseType, desc="...", default="DMAResponseType_NULL") {
-  DATA,          desc="DATA read";
-  ACK,           desc="ACK write";
-  NULL,          desc="Invalid";
-}
-
-structure(DMARequestMsg, desc="...", interface="NetworkMessage") {
-  DMARequestType Type,       desc="Request type (read/write)";
-  Address PhysicalAddress,   desc="Physical address for this request";
-  Address LineAddress,       desc="Line address for this request";
-  NetDest Destination,       desc="Destination";
-  DataBlock DataBlk,         desc="DataBlk attached to this request";
-  int Len,                   desc="The length of the request";
-  MessageSizeType MessageSize, desc="size category of the message";
-}
-
-structure(DMAResponseMsg, desc="...", interface="NetworkMessage") {
-  DMAResponseType Type,      desc="Response type (DATA/ACK)";
-  Address PhysicalAddress,   desc="Physical address for this request";
-  Address LineAddress,       desc="Line address for this request";
-  NetDest Destination,       desc="Destination";
-  DataBlock DataBlk,         desc="DataBlk attached to this request";
-  MessageSizeType MessageSize, desc="size category of the message";
-}
-
-