diff --git a/src/ReceiveCommands.cc b/src/ReceiveCommands.cc
index f446bf39..68ff5a8d 100644
--- a/src/ReceiveCommands.cc
+++ b/src/ReceiveCommands.cc
@@ -688,14 +688,19 @@ void process_ep3_server_data_request(shared_ptr<ServerState> s, shared_ptr<Clien
   }
 
   switch (cmds[1].byte[0]) {
-    // phase 1: map select
+    // Phase 1: map select
     case 0x40:
       send_ep3_map_list(s, l);
       break;
     case 0x41:
       send_ep3_map_data(s, l, cmds[4].dword);
       break;
-    /*// phase 2: deck/name entry
+
+    /* What follows is some raw code that has survived since the days of khyller
+     * (approx. 2004). Much more research and engineering is needed to get
+     * Episode III battles to work, but this could be used as a starting point.
+
+    // phase 2: deck/name entry
     case 0x13:
       ti = FindTeam(s, c->teamID);
       memcpy(&ti->ep3game, ((DWORD)c->bufferin + 0x14), 0x2AC);
@@ -753,6 +758,7 @@ void process_ep3_server_data_request(shared_ptr<ServerState> s, shared_ptr<Clien
       CommandEp3Init_B4_39(s, c); // MISSING: 60 00 AC 00 B4 2A 00 00 39 56 00 08 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
       CommandEp3InitBegin(s, c);
       break; */
+
     default:
       c->log.error("Unknown Episode III server data request: %02X", cmds[1].byte[0]);
   }
diff --git a/src/SendCommands.cc b/src/SendCommands.cc
index 762f8c39..52144ff5 100644
--- a/src/SendCommands.cc
+++ b/src/SendCommands.cc
@@ -101,10 +101,6 @@ void send_command_with_header(Channel& ch, const void* data, size_t size) {
 
 
 
-////////////////////////////////////////////////////////////////////////////////
-// CommandServerInit: this function sends the command that initializes encryption
-
-// strings needed for various functions
 static const char* anti_copyright = "This server is in no way affiliated, sponsored, or supported by SEGA Enterprises or SONICTEAM. The preceding message exists only in order to remain compatible with programs that expect it.";
 static const char* dc_port_map_copyright = "DreamCast Port Map. Copyright SEGA Enterprises. 1999";
 static const char* dc_lobby_server_copyright = "DreamCast Lobby Server. Copyright SEGA Enterprises. 1999";
@@ -695,9 +691,6 @@ void send_info_board(shared_ptr<Client> c, shared_ptr<Lobby> l) {
 
 
 
-////////////////////////////////////////////////////////////////////////////////
-// CommandCardSearchResult: sends a guild card search result to a player.
-
 template <typename CommandHeaderT, typename CharT>
 void send_card_search_result_t(
     shared_ptr<ServerState> s,
@@ -866,8 +859,7 @@ void send_menu(shared_ptr<Client> c, const u16string& menu_name,
   }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// CommandGameSelect: presents the player with a Game Select menu. returns the selection in the same way as CommandShipSelect.
+
 
 template <typename CharT>
 void send_game_menu_t(shared_ptr<Client> c, shared_ptr<ServerState> s) {