diff --git a/src/TinyGsmClientA6.h b/src/TinyGsmClientA6.h
index af96627..23ea0fc 100644
--- a/src/TinyGsmClientA6.h
+++ b/src/TinyGsmClientA6.h
@@ -8,14 +8,10 @@
 
 #ifndef TinyGsmClientA6_h
 #define TinyGsmClientA6_h
-#pragma message("TinyGSM:  TinyGsmClientA6")
+//#pragma message("TinyGSM:  TinyGsmClientA6")
 
 //#define TINY_GSM_DEBUG Serial
 
-#if !defined(TINY_GSM_RX_BUFFER)
-  #define TINY_GSM_RX_BUFFER 256
-#endif
-
 #define TINY_GSM_MUX_COUNT 8
 
 #include <TinyGsmCommon.h>
diff --git a/src/TinyGsmClientBG96.h b/src/TinyGsmClientBG96.h
index 30c17e2..8852148 100644
--- a/src/TinyGsmClientBG96.h
+++ b/src/TinyGsmClientBG96.h
@@ -8,15 +8,11 @@
 
 #ifndef TinyGsmClientBG96_h
 #define TinyGsmClientBG96_h
-#pragma message("TinyGSM:  TinyGsmClientBG96")
+//#pragma message("TinyGSM:  TinyGsmClientBG96")
 
 //#define TINY_GSM_DEBUG Serial
 //#define TINY_GSM_USE_HEX
 
-#if !defined(TINY_GSM_RX_BUFFER)
-  #define TINY_GSM_RX_BUFFER 64
-#endif
-
 #define TINY_GSM_MUX_COUNT 12
 
 #include <TinyGsmCommon.h>
diff --git a/src/TinyGsmClientESP8266.h b/src/TinyGsmClientESP8266.h
index 6f5d7b8..191ee8d 100644
--- a/src/TinyGsmClientESP8266.h
+++ b/src/TinyGsmClientESP8266.h
@@ -8,14 +8,10 @@
 
 #ifndef TinyGsmClientESP8266_h
 #define TinyGsmClientESP8266_h
-#pragma message("TinyGSM:  TinyGsmClientESP8266")
+//#pragma message("TinyGSM:  TinyGsmClientESP8266")
 
 //#define TINY_GSM_DEBUG Serial
 
-#if !defined(TINY_GSM_RX_BUFFER)
-  #define TINY_GSM_RX_BUFFER 512
-#endif
-
 #define TINY_GSM_MUX_COUNT 5
 
 #include <TinyGsmCommon.h>
diff --git a/src/TinyGsmClientM590.h b/src/TinyGsmClientM590.h
index 877964e..63c4293 100644
--- a/src/TinyGsmClientM590.h
+++ b/src/TinyGsmClientM590.h
@@ -8,14 +8,10 @@
 
 #ifndef TinyGsmClientM590_h
 #define TinyGsmClientM590_h
-#pragma message("TinyGSM:  TinyGsmClientM590")
+//#pragma message("TinyGSM:  TinyGsmClientM590")
 
 //#define TINY_GSM_DEBUG Serial
 
-#if !defined(TINY_GSM_RX_BUFFER)
-  #define TINY_GSM_RX_BUFFER 256
-#endif
-
 #define TINY_GSM_MUX_COUNT 2
 
 #include <TinyGsmCommon.h>
diff --git a/src/TinyGsmClientM95.h b/src/TinyGsmClientM95.h
index 404ddfa..90cec31 100644
--- a/src/TinyGsmClientM95.h
+++ b/src/TinyGsmClientM95.h
@@ -8,15 +8,11 @@
 
 #ifndef TinyGsmClientM95_h
 #define TinyGsmClientM95_h
-#pragma message("TinyGSM:  TinyGsmClientM95")
+//#pragma message("TinyGSM:  TinyGsmClientM95")
 
 //#define TINY_GSM_DEBUG Serial
 //#define TINY_GSM_USE_HEX
 
-#if !defined(TINY_GSM_RX_BUFFER)
-  #define TINY_GSM_RX_BUFFER 64
-#endif
-
 #define TINY_GSM_MUX_COUNT 6
 
 #include <TinyGsmCommon.h>
diff --git a/src/TinyGsmClientMC60.h b/src/TinyGsmClientMC60.h
index c2b5226..c838b10 100644
--- a/src/TinyGsmClientMC60.h
+++ b/src/TinyGsmClientMC60.h
@@ -11,15 +11,11 @@
 
 #ifndef TinyGsmClientMC60_h
 #define TinyGsmClientMC60_h
-#pragma message("TinyGSM:  TinyGsmClientMC60")
+//#pragma message("TinyGSM:  TinyGsmClientMC60")
 
 //#define TINY_GSM_DEBUG Serial
 //#define TINY_GSM_USE_HEX
 
-#if !defined(TINY_GSM_RX_BUFFER)
-  #define TINY_GSM_RX_BUFFER 64
-#endif
-
 #define TINY_GSM_MUX_COUNT 6
 
 #include <TinyGsmCommon.h>
diff --git a/src/TinyGsmClientSIM800.h b/src/TinyGsmClientSIM800.h
index 122a5bb..4710df4 100644
--- a/src/TinyGsmClientSIM800.h
+++ b/src/TinyGsmClientSIM800.h
@@ -8,15 +8,11 @@
 
 #ifndef TinyGsmClientSIM800_h
 #define TinyGsmClientSIM800_h
-#pragma message("TinyGSM:  TinyGsmClientSIM800")
+//#pragma message("TinyGSM:  TinyGsmClientSIM800")
 
 //#define TINY_GSM_DEBUG Serial
 //#define TINY_GSM_USE_HEX
 
-#if !defined(TINY_GSM_RX_BUFFER)
-  #define TINY_GSM_RX_BUFFER 64
-#endif
-
 #define TINY_GSM_MUX_COUNT 5
 
 #include <TinyGsmCommon.h>
diff --git a/src/TinyGsmClientSIM808.h b/src/TinyGsmClientSIM808.h
index 6526e8e..35754a0 100644
--- a/src/TinyGsmClientSIM808.h
+++ b/src/TinyGsmClientSIM808.h
@@ -8,7 +8,7 @@
 
 #ifndef TinyGsmClientSIM808_h
 #define TinyGsmClientSIM808_h
-#pragma message("TinyGSM:  TinyGsmClientSIM808")
+//#pragma message("TinyGSM:  TinyGsmClientSIM808")
 
 #include <TinyGsmClientSIM800.h>
 
diff --git a/src/TinyGsmClientUBLOX.h b/src/TinyGsmClientUBLOX.h
index 8afb3f3..4e610f3 100644
--- a/src/TinyGsmClientUBLOX.h
+++ b/src/TinyGsmClientUBLOX.h
@@ -8,14 +8,10 @@
 
 #ifndef TinyGsmClientUBLOX_h
 #define TinyGsmClientUBLOX_h
-#pragma message("TinyGSM:  TinyGsmClientUBLOX")
+//#pragma message("TinyGSM:  TinyGsmClientUBLOX")
 
 //#define TINY_GSM_DEBUG Serial
 
-#if !defined(TINY_GSM_RX_BUFFER)
-  #define TINY_GSM_RX_BUFFER 64
-#endif
-
 #define TINY_GSM_MUX_COUNT 5
 
 #include <TinyGsmCommon.h>
diff --git a/src/TinyGsmClientXBee.h b/src/TinyGsmClientXBee.h
index b32adeb..d969d93 100644
--- a/src/TinyGsmClientXBee.h
+++ b/src/TinyGsmClientXBee.h
@@ -8,7 +8,7 @@
 
 #ifndef TinyGsmClientXBee_h
 #define TinyGsmClientXBee_h
-#pragma message("TinyGSM:  TinyGsmClientXBee")
+//#pragma message("TinyGSM:  TinyGsmClientXBee")
 
 //#define TINY_GSM_DEBUG Serial
 
diff --git a/src/TinyGsmCommon.h b/src/TinyGsmCommon.h
index f1d5729..d915b26 100644
--- a/src/TinyGsmCommon.h
+++ b/src/TinyGsmCommon.h
@@ -31,6 +31,10 @@
   #define TINY_GSM_YIELD() { delay(0); }
 #endif
 
+#if !defined(TINY_GSM_RX_BUFFER)
+  #define TINY_GSM_RX_BUFFER 256
+#endif
+
 #define TINY_GSM_ATTR_NOT_AVAILABLE __attribute__((error("Not available on this modem type")))
 #define TINY_GSM_ATTR_NOT_IMPLEMENTED __attribute__((error("Not implemented")))