diff --git a/Adafruit_MQTT.cpp b/Adafruit_MQTT.cpp
index e4bd2cc..1da9be2 100644
--- a/Adafruit_MQTT.cpp
+++ b/Adafruit_MQTT.cpp
@@ -235,7 +235,6 @@ void Adafruit_MQTT::processSubscriptionPacket(Adafruit_MQTT_Subscribe *sub) {
     sub->callback_double(data);
   } else if (sub->callback_buffer != NULL) {
     // execute callback in buffer mode
-    DEBUG_PRINTLN("processPacketsUntil called the callback_buffer!");
     sub->callback_buffer((char *)sub->lastread, sub->datalen);
   } else if (sub->callback_io != NULL) {
     // execute callback in io mode
@@ -249,9 +248,6 @@ uint16_t Adafruit_MQTT::processPacketsUntil(uint8_t *buffer,
                                             uint8_t waitforpackettype,
                                             uint16_t timeout) {
   uint16_t len;
-  DEBUG_PRINTLN("call: processPacketsUntil()");
-  DEBUG_PRINT("Looking for packetType: ");
-  DEBUG_PRINTLN(waitforpackettype);
 
   while (true) {
     len = readFullPacket(buffer, MAXBUFFERSIZE, timeout);
@@ -505,7 +501,6 @@ void Adafruit_MQTT::processPackets(int16_t timeout) {
   uint32_t elapsed = 0, endtime, starttime = millis();
 
   while (elapsed < (uint32_t)timeout) {
-    DEBUG_PRINTLN("L480: readSubscription() called by processPackets()");
     Adafruit_MQTT_Subscribe *sub = readSubscription(timeout - elapsed);
     if (sub)
       processSubscriptionPacket(sub);
diff --git a/Adafruit_MQTT.h b/Adafruit_MQTT.h
index e2609b1..00657b4 100644
--- a/Adafruit_MQTT.h
+++ b/Adafruit_MQTT.h
@@ -34,7 +34,7 @@
 #define ADAFRUIT_MQTT_VERSION_PATCH 0
 
 // Uncomment/comment to turn on/off debug output messages.
-#define MQTT_DEBUG
+// #define MQTT_DEBUG
 // Uncomment/comment to turn on/off error output messages.
 #define MQTT_ERROR
 
@@ -107,7 +107,7 @@
 // Largest full packet we're able to send.
 // Need to be able to store at least ~90 chars for a connect packet with full
 // 23 char client ID.
-#define MAXBUFFERSIZE (512)
+#define MAXBUFFERSIZE (150)
 
 #define MQTT_CONN_USERNAMEFLAG 0x80
 #define MQTT_CONN_PASSWORDFLAG 0x40