diff --git a/src/mqtt.cpp b/src/mqtt.cpp
index 0d8fadc9e..34e531143 100644
--- a/src/mqtt.cpp
+++ b/src/mqtt.cpp
@@ -40,10 +40,8 @@ uint8_t     Mqtt::bool_format_;
 uint8_t     Mqtt::ha_climate_format_;
 bool        Mqtt::ha_enabled_;
 
-// static emsesp::queue<Mqtt::QueuedMqttMessage> mqtt_messages_ = emsesp::queue<Mqtt::QueuedMqttMessage>(MAX_MQTT_MESSAGES);
 std::deque<Mqtt::QueuedMqttMessage> Mqtt::mqtt_messages_;
-
-std::vector<Mqtt::MQTTSubFunction> Mqtt::mqtt_subfunctions_;
+std::vector<Mqtt::MQTTSubFunction>  Mqtt::mqtt_subfunctions_;
 
 uint16_t Mqtt::mqtt_publish_fails_ = 0;
 bool     Mqtt::connecting_         = false;
@@ -579,15 +577,6 @@ std::shared_ptr<const MqttMessage> Mqtt::queue_message(const uint8_t operation,
     }
     mqtt_messages_.emplace_back(mqtt_message_id_++, std::move(message));
 
-    /*
-    QueuedMqttMessage qmm;
-    qmm.content_     = std::move(message);
-    qmm.retry_count_ = 0;
-    qmm.packet_id_   = 0;
-    qmm.id_          = mqtt_message_id_++;
-    mqtt_messages_.push_back(qmm);
-    */
-
     return mqtt_messages_.back().content_; // this is because the message has been moved
 }
 
@@ -721,7 +710,6 @@ void Mqtt::process_queue() {
             return;
         } else {
             // update the record
-            // mqtt_messages_.front_p()->retry_count_++;
             mqtt_messages_.front().retry_count_++;
             LOG_DEBUG(F("Failed to publish to %s. Trying again, #%d"), message->topic.c_str(), mqtt_message.retry_count_ + 1);
             return; // leave on queue for next time so it gets republished
@@ -731,7 +719,6 @@ void Mqtt::process_queue() {
     // if we have ACK set with QOS 1 or 2, leave on queue and let the ACK process remove it
     // but add the packet_id so we can check it later
     if (mqtt_qos_ != 0) {
-        // mqtt_messages_.front_p()->packet_id_ = packet_id;
         mqtt_messages_.front().packet_id_ = packet_id;
 #if defined(EMSESP_DEBUG)
         LOG_DEBUG(F("[DEBUG] Setting packetID for ACK to %d"), packet_id);