diff --git a/examples/osd/arduino-merkurboard/project-conf.h b/examples/osd/arduino-merkurboard/project-conf.h
index 957c568ad..a0189f197 100644
--- a/examples/osd/arduino-merkurboard/project-conf.h
+++ b/examples/osd/arduino-merkurboard/project-conf.h
@@ -32,26 +32,12 @@
 #ifndef PROJECT_RPL_WEB_CONF_H_
 #define PROJECT_RPL_WEB_CONF_H_
 
-#define PLATFORM_HAS_LEDS    1
-//#define PLATFORM_HAS_BUTTON  1
-#define PLATFORM_HAS_BATTERY 1
-
-
 #define LOOP_INTERVAL		(30 * CLOCK_SECOND)
 
-/* Save energy */
-//#define RDC_CONF_PT_YIELD_OFF
 
 /* For Debug: Dont allow MCU sleeping between channel checks */
-//#undef RDC_CONF_MCU_SLEEP
-//#define RDC_CONF_MCU_SLEEP       0
-
-/* Disabling RDC for demo purposes. Core updates often require more memory. */
-/* For projects, optimize memory and enable RDC again. */
-//#undef NETSTACK_CONF_RDC
-//#define NETSTACK_CONF_RDC     nullrdc_driver
-//#undef NETSTACK_CONF_MAC
-//#define  NETSTACK_CONF_MAC	nullmac_driver
+#undef RDC_CONF_MCU_SLEEP
+#define RDC_CONF_MCU_SLEEP       0
 
 /* Increase rpl-border-router IP-buffer when using more than 64. */
 //#undef REST_MAX_CHUNK_SIZE
@@ -85,5 +71,21 @@
 #define COAP_LINK_FORMAT_FILTERING      0
 */
 
+/*
+#undef LLSEC802154_CONF_ENABLED
+#define LLSEC802154_CONF_ENABLED          1
+#undef NETSTACK_CONF_FRAMER
+#define NETSTACK_CONF_FRAMER              noncoresec_framer
+#undef NETSTACK_CONF_LLSEC
+#define NETSTACK_CONF_LLSEC               noncoresec_driver
+#undef NONCORESEC_CONF_SEC_LVL
+#define NONCORESEC_CONF_SEC_LVL           1
+
+#define NONCORESEC_CONF_KEY { 0x00 , 0x01 , 0x02 , 0x03 , \
+                              0x04 , 0x05 , 0x06 , 0x07 , \
+                              0x08 , 0x09 , 0x0A , 0x0B , \
+                              0x0C , 0x0D , 0x0E , 0x0F }
+
+*/
 
 #endif /* PROJECT_RPL_WEB_CONF_H_ */
diff --git a/examples/osd/resources-common/res-battery.c b/examples/osd/resources-common/res-battery.c
index c7a025d38..39e01ed3b 100644
--- a/examples/osd/resources-common/res-battery.c
+++ b/examples/osd/resources-common/res-battery.c
@@ -37,9 +37,6 @@
  */
 
 #include "contiki.h"
-
-#if PLATFORM_HAS_BATTERY
-
 #include <string.h>
 #include "rest-engine.h"
 #include "dev/battery-sensor.h"
@@ -78,4 +75,4 @@ res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferr
     REST.set_response_payload(response, msg, strlen(msg));
   }
 }
-#endif /* PLATFORM_HAS_BATTERY */
+
diff --git a/examples/osd/resources-common/res-cputemp.c b/examples/osd/resources-common/res-cputemp.c
index 8a748b74d..7aca7d3a7 100644
--- a/examples/osd/resources-common/res-cputemp.c
+++ b/examples/osd/resources-common/res-cputemp.c
@@ -37,7 +37,6 @@
  */
 
 #include "contiki.h"
-
 #include <string.h>
 #include "rest-engine.h"
 #include "Arduino.h"
@@ -80,4 +79,3 @@ res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferr
     REST.set_response_payload(response, msg, strlen(msg));
   }
 }
-
diff --git a/examples/osd/resources-common/res-leds.c b/examples/osd/resources-common/res-leds.c
index 5fbcf6c77..a3cfdec2e 100644
--- a/examples/osd/resources-common/res-leds.c
+++ b/examples/osd/resources-common/res-leds.c
@@ -37,9 +37,6 @@
  */
 
 #include "contiki.h"
-
-#if PLATFORM_HAS_LEDS
-
 #include <string.h>
 #include "rest-engine.h"
 #include "dev/leds.h"
@@ -105,4 +102,4 @@ res_post_put_handler(void *request, void *response, uint8_t *buffer, uint16_t pr
     REST.set_response_status(response, REST.status.BAD_REQUEST);
   }
 }
-#endif /* PLATFORM_HAS_LEDS */
+