diff --git a/src/helpers/JWTHelper.cpp b/src/helpers/JWTHelper.cpp
index f1b01659..a31a942d 100644
--- a/src/helpers/JWTHelper.cpp
+++ b/src/helpers/JWTHelper.cpp
@@ -164,7 +164,6 @@ size_t JWTHelper::base64UrlEncode(const uint8_t* input, size_t inputLen, char* o
     return 0;
   }
   
-  // Use ESP32's built-in mbedTLS base64 encoding
   size_t outlen = 0;
   int ret = mbedtls_base64_encode((unsigned char*)output, outputSize - 1, &outlen, input, inputLen);
   
diff --git a/src/helpers/bridges/MQTTBridge.cpp b/src/helpers/bridges/MQTTBridge.cpp
index 0fe2fa56..c193b81f 100644
--- a/src/helpers/bridges/MQTTBridge.cpp
+++ b/src/helpers/bridges/MQTTBridge.cpp
@@ -8,8 +8,6 @@
 #include <esp_wifi.h>
 #endif
 
-// Using ESP32's built-in certificate bundle
-
 // Helper function to strip quotes from strings (both single and double quotes)
 static void stripQuotes(char* str, size_t max_len) {
   if (!str || max_len == 0) return;
@@ -145,8 +143,6 @@ void MQTTBridge::begin() {
   _raw_enabled = _prefs->mqtt_raw_enabled;
   _tx_enabled = _prefs->mqtt_tx_enabled;
   // Set status interval to 5 minutes (300000 ms), or use preference if set and valid
-  // Sanity check: interval should be between 1 second (1000ms) and 1 hour (3600000ms)
-  // This field may be uninitialized if preferences were saved before this field was added
   if (_prefs->mqtt_status_interval >= 1000 && _prefs->mqtt_status_interval <= 3600000) {
     _status_interval = _prefs->mqtt_status_interval;
     MQTT_DEBUG_PRINTLN("Using preference status interval: %lu ms", _status_interval);
@@ -1757,7 +1753,6 @@ void MQTTBridge::syncTimeWithNTP() {
 
 Timezone* MQTTBridge::createTimezoneFromString(const char* tz_string) {
   // Create Timezone objects for common IANA timezone strings
-  // Using TimeChangeRule definitions for proper DST handling
   
   // North America
   if (strcmp(tz_string, "America/Los_Angeles") == 0 || strcmp(tz_string, "America/Vancouver") == 0) {
diff --git a/variants/heltec_v3/platformio.ini b/variants/heltec_v3/platformio.ini
index 1a2c5f42..d264f26a 100644
--- a/variants/heltec_v3/platformio.ini
+++ b/variants/heltec_v3/platformio.ini
@@ -129,8 +129,6 @@ build_flags =
 #  -D MQTT_PORT=1883
 #  -D MQTT_USERNAME='"your-username"'
 #  -D MQTT_PASSWORD='"your-password"'
-
-; Use ESP32's built-in certificate bundle
 build_src_filter = ${Heltec_lora32_v3.build_src_filter}
   +<helpers/bridges/MQTTBridge.cpp>
   +<helpers/MQTTMessageBuilder.cpp>
diff --git a/variants/xiao_s3_wio/platformio.ini b/variants/xiao_s3_wio/platformio.ini
index b189e333..f7e727e6 100644
--- a/variants/xiao_s3_wio/platformio.ini
+++ b/variants/xiao_s3_wio/platformio.ini
@@ -118,7 +118,6 @@ build_flags =
 #  -D MQTT_USERNAME='"your-username"'
 #  -D MQTT_PASSWORD='"your-password"'
 
-; Use ESP32's built-in certificate bundle
 build_src_filter = ${Xiao_S3_WIO.build_src_filter}
   +<helpers/bridges/MQTTBridge.cpp>
   +<helpers/MQTTMessageBuilder.cpp>
@@ -127,13 +126,10 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter}
 lib_deps =
   ${Xiao_S3_WIO.lib_deps}
   ${esp32_ota.lib_deps}
-  ; PsychicMqttClient - unified MQTT client with WebSocket support
   elims/PsychicMqttClient@^0.2.4
-  ; Using latest ArduinoJson (7.x) - compatible with CayenneLPP without patching
   bblanchon/ArduinoJson
   arduino-libraries/NTPClient
   JChristensen/Timezone
-  ; Time library required by Timezone library (explicit dependency for compatibility)
   paulstoffregen/Time
 
 [env:Xiao_S3_WIO_room_server]