diff --git a/admin.proto b/admin.proto
index 77ccc21..c3cefb0 100644
--- a/admin.proto
+++ b/admin.proto
@@ -206,64 +206,19 @@ message AdminMessage {
     int32 reboot_seconds = 35;
 
     /*
-     * Get the Canned Message Module message part1 in the response to this message.
+     * Get the Canned Message Module messages in the response to this message.
      */
-    bool get_canned_message_module_part1_request = 36;
+    bool get_canned_message_module_messages_request = 36;
 
     /*
-     * TODO: REPLACE
+     * Get the Canned Message Module messages in the response to this message.
      */
-    string get_canned_message_module_part1_response = 37;
+    string get_canned_message_module_messages_response = 37;
 
     /*
-     * Get the Canned Message Module message part2 in the response to this message.
+     * Set the Canned Message Module messages text.
      */
-    bool get_canned_message_module_part2_request = 38;
-
-    /*
-     * TODO: REPLACE
-     */
-    string get_canned_message_module_part2_response = 39;
-
-    /*
-     * Get the Canned Message Module message part3 in the response to this message.
-     */
-    bool get_canned_message_module_part3_request = 40;
-
-    /*
-     * TODO: REPLACE
-     */
-    string get_canned_message_module_part3_response = 41;
-
-    /*
-     * Get the Canned Message Module message part4 in the response to this message.
-     */
-    bool get_canned_message_module_part4_request = 42;
-
-    /*
-     * TODO: REPLACE
-     */
-    string get_canned_message_module_part4_response = 43;
-
-    /*
-     * Set the canned message module part 1 text.
-     */
-    string set_canned_message_module_part1 = 44;
-
-    /*
-     * Set the canned message module part 2 text.
-     */
-    string set_canned_message_module_part2 = 45;
-
-    /*
-     * Set the canned message module part 3 text.
-     */
-    string set_canned_message_module_part3 = 46;
-
-    /*
-     * Set the canned message module part 4 text.
-     */
-    string set_canned_message_module_part4 = 47;
+    string set_canned_message_module_messages = 44;
 
     /*
      * Tell the node to shutdown in this many seconds (or <0 to cancel shutdown)