diff --git a/mainwindow.cpp b/mainwindow.cpp
index 98a13d8..1fffac4 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -7229,18 +7229,6 @@ void MainWindow::buildQueryMenu(QMenu * menu, QString call){
         if(m_config.transmit_directed()) toggleTx(true);
     });
 
-    auto hashAction = menu->addAction(QString("%1#[MESSAGE] - Please ACK if you receive this message in its entirety").arg(call).trimmed());
-    hashAction->setDisabled(isAllCall);
-    connect(hashAction, &QAction::triggered, this, [this](){
-
-        QString selectedCall = callsignSelected();
-        if(selectedCall.isEmpty()){
-            return;
-        }
-
-        addMessageText(QString("%1#[MESSAGE]").arg(selectedCall), true, true);
-    });
-
 #if 0
     auto retransmitAction = menu->addAction(QString("%1|[MESSAGE] - Please ACK and retransmit the following message").arg(call).trimmed());
     retransmitAction->setDisabled(isAllCall);
@@ -7255,7 +7243,7 @@ void MainWindow::buildQueryMenu(QMenu * menu, QString call){
     });
 #endif
 
-    auto alertAction = menu->addAction(QString("%1>[MESSAGE] - Please (optionally) relay and display this message in an reply dialog").arg(call).trimmed());
+    auto alertAction = menu->addAction(QString("%1>[MESSAGE] - Please ACK, optionally relay, and display this message in an alert").arg(call).trimmed());
     alertAction->setDisabled(isAllCall);
     connect(alertAction, &QAction::triggered, this, [this](){
 
@@ -9515,11 +9503,6 @@ void MainWindow::processCommandActivity() {
             }
         }
 
-        // PROCESS BUFFERED MESSAGE
-        else if (d.cmd == "#" && !isAllCall) {
-            reply = QString("%1 ACK").arg(d.from);
-        }
-
         // PROCESS AGN
         else if (d.cmd == " AGN?" && !isAllCall && !isGroupCall && !m_lastTxMessage.isEmpty()) {
             reply = m_lastTxMessage;
diff --git a/varicode.cpp b/varicode.cpp
index ddf9496..944a7e1 100644
--- a/varicode.cpp
+++ b/varicode.cpp
@@ -67,8 +67,7 @@ QMap<QString, int> directed_cmds = {
     {"*",         6  }, // compat
 
     //{"!",       7  }, // unused
-
-    {"#",         8  }, // all or nothing message
+    //{"#",       8  }, // unused
 
     {" TU",       9  }, // thank you
 
@@ -104,22 +103,21 @@ QMap<QString, int> directed_cmds = {
     {" ",        31  }, // send freetext
 };
 
-QSet<int> allowed_cmds = {-1, 0, 1, 2, 3, 4, 5, 6, /*7,*/ 8, 9, 10, 11, /*12,*/ 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, /*24,*/ 25, 26, 27, 28, 29, 30, 31};
+QSet<int> allowed_cmds = {-1, 0, 1, 2, 3, 4, 5, 6, /*7,*/ /*8,*/ 9, 10, 11, /*12,*/ 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, /*24,*/ 25, 26, 27, 28, 29, 30, 31};
 
-QSet<int> buffered_cmds = {3, 5, /*6,*/ /*7,*/ 8, 13, 14, 15};
+QSet<int> buffered_cmds = {3, 5, /*6,*/ /*7,*/ 13, 14, 15};
 
 QSet<int> snr_cmds = {25, 29};
 
 QMap<int, int> checksum_cmds = {
     {  5, 16 },
-    {  8, 16 },
     { 13, 16 },
     { 14, 16 },
     { 15,  0 }
 };
 
 QString callsign_pattern = QString("(?<callsign>[@]?[A-Z0-9/]+)");
-QString optional_cmd_pattern = QString("(?<cmd>\\s?(?:AGN[?]|QSL[?]|HW CPY[?]|APRS[:]|SNR[?]|QTC[?]|QTH[?]|GRID[?]|STATUS[?]|HEARING[?]|(?:(?:QUERY|ACK|73|YES|NO|SNR|QSL|RR|SK|FB|QTH|QTC|GRID|ACTIVE|IDLE|TU)(?=[ ]|$))|[?*^&@$#> ]))?");
+QString optional_cmd_pattern = QString("(?<cmd>\\s?(?:AGN[?]|QSL[?]|HW CPY[?]|APRS[:]|SNR[?]|QTC[?]|QTH[?]|GRID[?]|STATUS[?]|HEARING[?]|(?:(?:QUERY|ACK|73|YES|NO|SNR|QSL|RR|SK|FB|QTH|QTC|GRID|ACTIVE|IDLE|TU)(?=[ ]|$))|[?*^&@$> ]))?");
 QString optional_grid_pattern = QString("(?<grid>\\s?[A-R]{2}[0-9]{2})?");
 QString optional_extended_grid_pattern = QString("^(?<grid>\\s?(?:[A-R]{2}[0-9]{2}(?:[A-X]{2}(?:[0-9]{2})?)*))?");
 QString optional_num_pattern = QString("(?<num>(?<=SNR|ACK)\\s?[-+]?(?:3[01]|[0-2]?[0-9]))?");