diff --git a/cmd/cmd.h b/cmd/cmd.h
index 85032df..31803b8 100644
--- a/cmd/cmd.h
+++ b/cmd/cmd.h
@@ -61,12 +61,12 @@ typedef enum {
   CMD_SOCKET_SETUP = 40, // set-up callbacks
   CMD_SOCKET_SEND,       // send data over UDP socket
 
-  CMD_WIFI_GET_APCOUNT = 50,    /* */
-  CMD_WIFI_GET_APNAME,
-  CMD_WIFI_SELECT_SSID,
-  CMD_WIFI_SIGNAL_STRENGTH,	// Query RSSI
-  CMD_WIFI_GET_SSID,		// Query SSID currently connected to
-  CMD_WIFI_START_SCAN,		// Trigger a scan (takes a long time)
+  CMD_WIFI_GET_APCOUNT = 50,  // Query the number of networks / Access Points known
+  CMD_WIFI_GET_APNAME,        // Query the name (SSID) of an Access Point (AP)
+  CMD_WIFI_SELECT_SSID,       // Connect to a specific network
+  CMD_WIFI_SIGNAL_STRENGTH,   // Query RSSI
+  CMD_WIFI_GET_SSID,          // Query SSID currently connected to
+  CMD_WIFI_START_SCAN,        // Trigger a scan (takes a long time)
 
 } CmdName;
 
diff --git a/cmd/handlers.c b/cmd/handlers.c
index a7d1e2a..32e03c3 100644
--- a/cmd/handlers.c
+++ b/cmd/handlers.c
@@ -33,7 +33,7 @@ static void cmdSync(CmdPacket *cmd);
 static void cmdWifiStatus(CmdPacket *cmd);
 static void cmdGetTime(CmdPacket *cmd);
 static void cmdGetWifiInfo(CmdPacket *cmd);
-static void cmdSetWifiInfo(CmdPacket *cmd);
+// static void cmdSetWifiInfo(CmdPacket *cmd);
 static void cmdAddCallback(CmdPacket *cmd);
 
 static void cmdWifiGetApCount(CmdPacket *cmd);
@@ -60,7 +60,7 @@ const CmdList commands[] = {
   {CMD_CB_ADD,          "ADD_CB",         cmdAddCallback},
   {CMD_GET_TIME,        "GET_TIME",       cmdGetTime},
   {CMD_GET_WIFI_INFO,   "GET_WIFI_INFO",  cmdGetWifiInfo},
-  {CMD_SET_WIFI_INFO,   "SET_WIFI_INFO",  cmdSetWifiInfo},
+  // {CMD_SET_WIFI_INFO,   "SET_WIFI_INFO",  cmdSetWifiInfo},
 
   {CMD_WIFI_GET_APCOUNT,	"WIFI_GET_APCOUNT",	cmdWifiGetApCount},
   {CMD_WIFI_GET_APNAME,		"WIFI_GET_APNAME",	cmdWifiGetApName},
@@ -331,6 +331,7 @@ static void ICACHE_FLASH_ATTR cmdWifiSelectSSID(CmdPacket *cmd) {
   }
 }
 
+#if 0
 /*
  * Once we're attached to some wireless network, choose not to pick up address from
  * DHCP or so but set our own.
@@ -338,6 +339,7 @@ static void ICACHE_FLASH_ATTR cmdWifiSelectSSID(CmdPacket *cmd) {
 static void ICACHE_FLASH_ATTR cmdSetWifiInfo(CmdPacket *cmd) {
   DBG("SetWifiInfo()\n");
 }
+#endif
 
 static void ICACHE_FLASH_ATTR cmdWifiSignalStrength(CmdPacket *cmd) {
   CmdRequest req;
diff --git a/esp-link/cgioptiboot.c b/esp-link/cgioptiboot.c
index 4212780..831b74b 100644
--- a/esp-link/cgioptiboot.c
+++ b/esp-link/cgioptiboot.c
@@ -8,8 +8,8 @@
 #include "uart.h"
 #include "stk500.h"
 #include "serbridge.h"
-#include "serled.h"
 #include "mqtt_cmd.h"
+#include "serled.h"
 
 #define INIT_DELAY     150   // wait this many millisecs before sending anything
 #define BAUD_INTERVAL  600   // interval after which we change baud rate
diff --git a/esp-link/cgiservices.c b/esp-link/cgiservices.c
index 96624b5..ef76287 100644
--- a/esp-link/cgiservices.c
+++ b/esp-link/cgiservices.c
@@ -1,5 +1,4 @@
 #include <esp8266.h>
-#include "cmd.h"
 #include "cgiwifi.h"
 #include "cgi.h"
 #include "config.h"
diff --git a/esp-link/main.c b/esp-link/main.c
index 1169b1d..74e96f1 100644
--- a/esp-link/main.c
+++ b/esp-link/main.c
@@ -13,7 +13,6 @@
 #include "httpd.h"
 #include "httpdespfs.h"
 #include "cgi.h"
-#include "cmd.h"
 #include "cgiwifi.h"
 #include "cgipins.h"
 #include "cgitcp.h"
diff --git a/esp-link/mqtt_client.c b/esp-link/mqtt_client.c
index 2900ed8..61fec1e 100644
--- a/esp-link/mqtt_client.c
+++ b/esp-link/mqtt_client.c
@@ -1,6 +1,5 @@
 #ifdef MQTT
 #include <esp8266.h>
-#include "cmd/cmd.h"
 #include "cgiwifi.h"
 #include "config.h"
 #include "mqtt.h"
diff --git a/esp-link/status.c b/esp-link/status.c
index a5ca8c1..6905850 100644
--- a/esp-link/status.c
+++ b/esp-link/status.c
@@ -3,7 +3,6 @@
 #include <esp8266.h>
 #include "config.h"
 #include "serled.h"
-#include "cmd.h"
 #include "cgiwifi.h"
 
 #ifdef MQTT