diff --git a/src/utility/time/TimeService.cpp b/src/utility/time/TimeService.cpp
index ac0a5eb0..cc387215 100644
--- a/src/utility/time/TimeService.cpp
+++ b/src/utility/time/TimeService.cpp
@@ -66,16 +66,10 @@ void samd_setRTC(unsigned long time);
 unsigned long samd_getRTC();
 #endif
 
-#ifdef ARDUINO_NANO_RP2040_CONNECT
-void rp2040_connect_initRTC();
-void rp2040_connect_setRTC(unsigned long time);
-unsigned long rp2040_connect_getRTC();
-#endif
-
-#ifdef BOARD_STM32H7
-void stm32h7_initRTC();
-void stm32h7_setRTC(unsigned long time);
-unsigned long stm32h7_getRTC();
+#ifdef ARDUINO_ARCH_MBED
+void mbed_initRTC();
+void mbed_setRTC(unsigned long time);
+unsigned long mbed_getRTC();
 #endif
 
 #ifdef ARDUINO_ARCH_ESP32
@@ -337,10 +331,8 @@ void TimeServiceClass::initRTC()
 {
 #if defined (ARDUINO_ARCH_SAMD)
   samd_initRTC();
-#elif defined (ARDUINO_NANO_RP2040_CONNECT)
-  rp2040_connect_initRTC();
-#elif defined (BOARD_STM32H7)
-  stm32h7_initRTC();
+#elif defined (ARDUINO_ARCH_MBED)
+  mbed_initRTC();
 #elif defined (ARDUINO_ARCH_ESP32)
   esp32_initRTC();
 #elif defined (ARDUINO_ARCH_ESP8266)
@@ -356,10 +348,8 @@ void TimeServiceClass::setRTC(unsigned long time)
 {
 #if defined (ARDUINO_ARCH_SAMD)
   samd_setRTC(time);
-#elif defined (ARDUINO_NANO_RP2040_CONNECT)
-  rp2040_connect_setRTC(time);
-#elif defined (BOARD_STM32H7)
-  stm32h7_setRTC(time);
+#elif defined (ARDUINO_ARCH_MBED)
+  mbed_setRTC(time);
 #elif defined (ARDUINO_ARCH_ESP32)
   esp32_setRTC(time);
 #elif defined (ARDUINO_ARCH_ESP8266)
@@ -375,10 +365,8 @@ unsigned long TimeServiceClass::getRTC()
 {
 #if defined (ARDUINO_ARCH_SAMD)
   return samd_getRTC();
-#elif defined (ARDUINO_NANO_RP2040_CONNECT)
-  return rp2040_connect_getRTC();
-#elif defined (BOARD_STM32H7)
-  return stm32h7_getRTC();
+#elif defined (ARDUINO_ARCH_MBED)
+  return mbed_getRTC();
 #elif defined (ARDUINO_ARCH_ESP32)
   return esp32_getRTC();
 #elif defined (ARDUINO_ARCH_ESP8266)
@@ -447,35 +435,18 @@ unsigned long samd_getRTC()
 }
 #endif
 
-#ifdef ARDUINO_NANO_RP2040_CONNECT
-void rp2040_connect_initRTC()
-{
-  /* Nothing to do */
-}
-
-void rp2040_connect_setRTC(unsigned long time)
-{
-  set_time(time);
-}
-
-unsigned long rp2040_connect_getRTC()
-{
-  return time(NULL);
-}
-#endif
-
-#ifdef BOARD_STM32H7
-void stm32h7_initRTC()
+#ifdef ARDUINO_ARCH_MBED
+void mbed_initRTC()
 {
   /* Nothing to do */
 }
 
-void stm32h7_setRTC(unsigned long time)
+void mbed_setRTC(unsigned long time)
 {
   set_time(time);
 }
 
-unsigned long stm32h7_getRTC()
+unsigned long mbed_getRTC()
 {
   return time(NULL);
 }