diff --git a/core/net/mac/contikimac/contikimac.c b/core/net/mac/contikimac/contikimac.c
index 0da262e23..f5fcbacda 100644
--- a/core/net/mac/contikimac/contikimac.c
+++ b/core/net/mac/contikimac/contikimac.c
@@ -632,11 +632,7 @@ send_packet(mac_callback_t mac_callback, void *mac_callback_ptr,
     PRINTF("contikimac: shorter than shortest (%d)\n", packetbuf_totlen());
     transmit_len = SHORTEST_PACKET_SIZE;
   }
-
-#ifdef NETSTACK_ENCRYPT
-  NETSTACK_ENCRYPT();
-#endif /* NETSTACK_ENCRYPT */
-
+  
   transmit_len = packetbuf_totlen();
 
   NETSTACK_RADIO.prepare(packetbuf_hdrptr(), transmit_len);
@@ -933,10 +929,6 @@ input_packet(void)
 
   /*  printf("cycle_start 0x%02x 0x%02x\n", cycle_start, cycle_start % CYCLE_TIME);*/
 
-#ifdef NETSTACK_DECRYPT
-  NETSTACK_DECRYPT();
-#endif /* NETSTACK_DECRYPT */
-
   if(packetbuf_totlen() > 0 && NETSTACK_FRAMER.parse() >= 0) {
 
 #if WITH_CONTIKIMAC_HEADER
diff --git a/core/net/mac/nullrdc.c b/core/net/mac/nullrdc.c
index e0e91bff4..17f803701 100644
--- a/core/net/mac/nullrdc.c
+++ b/core/net/mac/nullrdc.c
@@ -125,11 +125,6 @@ send_one_packet(mac_callback_t sent, void *ptr)
     PRINTF("nullrdc: send failed, too large header\n");
     ret = MAC_TX_ERR_FATAL;
   } else {
-
-#ifdef NETSTACK_ENCRYPT
-    NETSTACK_ENCRYPT();
-#endif /* NETSTACK_ENCRYPT */
-
 #if NULLRDC_802154_AUTOACK
     int is_broadcast;
     uint8_t dsn;
@@ -275,9 +270,6 @@ packet_input(void)
 
   original_datalen = packetbuf_datalen();
   original_dataptr = packetbuf_dataptr();
-#ifdef NETSTACK_DECRYPT
-    NETSTACK_DECRYPT();
-#endif /* NETSTACK_DECRYPT */
 
 #if NULLRDC_802154_AUTOACK
   if(packetbuf_datalen() == ACK_LEN) {
diff --git a/core/net/netstack.c b/core/net/netstack.c
index c7dc8336c..35e7f2c48 100644
--- a/core/net/netstack.c
+++ b/core/net/netstack.c
@@ -46,9 +46,5 @@ netstack_init(void)
   NETSTACK_RDC.init();
   NETSTACK_MAC.init();
   NETSTACK_NETWORK.init();
-
-#ifdef NETSTACK_ENCRYPTION_INIT
-  NETSTACK_ENCRYPTION_INIT();
-#endif /* NETSTACK_ENCRYPTION_INIT */
 }
 /*---------------------------------------------------------------------------*/