diff --git a/varicode.cpp b/varicode.cpp
index 34f4e6e..576e7f2 100644
--- a/varicode.cpp
+++ b/varicode.cpp
@@ -106,10 +106,10 @@ QMap<QString, int> directed_cmds = {
 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};
 
 // commands that result in an autoreply (which can be relayed)
-QSet<int> autoreply_cmds = {0, 3, 4, 6, 9, 11, 12, 13, 16, 30};
+QSet<int> autoreply_cmds = {0, 3, 4, 6, 11, 12, 13, 16, 30};
 
 // commands that should be buffered
-QSet<int> buffered_cmds = {5, /*6,*/ /*7,*/ 9, 10, 11, 12, 13, 14, 15, 24};
+QSet<int> buffered_cmds = {5, 9, 10, 11, 12, 13, 14, 15, 24};
 
 // commands that may include an SNR value
 QSet<int> snr_cmds = {25, 29};