diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b67d5507..9f502f925 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Support for multiple Heating Circuits (RC35 only for now and writing via telnet) - https://github.com/proddy/EMS-ESP/issues/162
+- mqttlog command also shows which MQTT topics it is subscribed too
 
 ### Fixed
 
diff --git a/src/MyESP.cpp b/src/MyESP.cpp
index 178c17c05..f94fedecd 100644
--- a/src/MyESP.cpp
+++ b/src/MyESP.cpp
@@ -359,7 +359,7 @@ void MyESP::mqttSubscribe(const char * topic) {
         myDebug_P(PSTR("[MQTT] Subscribing to %s"), topic_s);
 
         // add to mqtt log
-        _addMQTTLog(topic_s, "", 2); // type of 2 means Subscribe. Has an empty payload for now XXX
+        _addMQTTLog(topic_s, "", 2); // type of 2 means Subscribe. Has an empty payload for now
     }
 }
 
diff --git a/src/custom.htm b/src/custom.htm
index 01ddd4aed..a875c89c1 100644
--- a/src/custom.htm
+++ b/src/custom.htm
@@ -122,19 +122,6 @@
         <br>
     </div>
 
-    <div class="row form-group">
-        <label class="col-xs-3">Heating Circuit<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
-                aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
-                data-content="Select the main heating circuit to use. Default is HC1."></i></label>
-        <span class="col-xs-9 col-md-5">
-            <select class="form-control input-sm" id="heating_circuit">
-                <option selected="selected" value="1">HC1</option>
-                <option value="2">HC2</option>
-                <option value="3">HC3</option>
-            </select>
-        </span>
-    </div>
-
     <div class="row form-group">
         <label class="col-xs-3">Tx mode<i style="margin-left: 10px;"
                 class="glyphicon glyphicon-exclamation-sign text-danger" aria-hidden="true" data-toggle="popover"
diff --git a/src/custom.js b/src/custom.js
index 0c1bd2e8f..cc7974bb5 100644
--- a/src/custom.js
+++ b/src/custom.js
@@ -8,8 +8,7 @@ var custom_config = {
         "listen_mode": false,
         "shower_timer": false,
         "shower_alert": false,
-        "publish_time": 120,
-        "heating_circuit": 1
+        "publish_time": 120
     }
 }
 
@@ -22,7 +21,6 @@ function listcustom() {
     document.getElementById("led_gpio").value = custom_config.settings.led_gpio;
     document.getElementById("dallas_gpio").value = custom_config.settings.dallas_gpio;
     document.getElementById("publish_time").value = custom_config.settings.publish_time;
-    document.getElementById("heating_circuit").value = custom_config.settings.heating_circuit;
     document.getElementById("tx_mode").value = custom_config.settings.tx_mode;
 
     if (custom_config.settings.led) {
@@ -72,7 +70,6 @@ function savecustom() {
     }
 
     custom_config.settings.publish_time = parseInt(document.getElementById("publish_time").value);
-    custom_config.settings.heating_circuit = parseInt(document.getElementById("heating_circuit").value);
     custom_config.settings.tx_mode = parseInt(document.getElementById("tx_mode").value);
 
     custom_uncommited();
@@ -159,7 +156,7 @@ function listCustomStats() {
 
         document.getElementById("hm").innerHTML = ajaxobj.hp.hm;
         document.getElementById("hp1").innerHTML = ajaxobj.hp.hp1 + " &#37;";
-        document.getElementById("hp2").innerHTML = ajaxobj.hp.hp2 + " &#37;";      
+        document.getElementById("hp2").innerHTML = ajaxobj.hp.hp2 + " &#37;";
     } else {
         document.getElementById("hp_show").style.display = "none";
     }
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 8bf26f050..3733719e3 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -121,7 +121,6 @@ static const command_t project_cmds[] PROGMEM = {
     {true, "shower_timer <on | off>", "send MQTT notification on all shower durations"},
     {true, "shower_alert <on | off>", "stop hot water to send 3 cold burst warnings after max shower time is exceeded"},
     {true, "publish_time <seconds>", "set frequency for publishing data to MQTT (0=off)"},
-    {true, "heating_circuit <1 | 2>", "set the main thermostat HC to work with (if using multiple heating circuits)"},
     {true, "tx_mode <n>", "changes Tx logic. 1=ems generic, 2=ems+, 3=Junkers HT3"},
 
     {false, "info", "show current captured on the devices"},
diff --git a/tools/wsemulator/wserver.js b/tools/wsemulator/wserver.js
index 022af5c48..8e14990f7 100644
--- a/tools/wsemulator/wserver.js
+++ b/tools/wsemulator/wserver.js
@@ -105,7 +105,6 @@ var custom_configfile = {
         "shower_timer": true,
         "shower_alert": false,
         "publish_time": 120,
-        "heating_circuit": 1,
         "tx_mode": 1
     }
 };