diff --git a/arch/x86/mm/page.c b/arch/x86/mm/page.c
index 75f34015..fe44d95d 100644
--- a/arch/x86/mm/page.c
+++ b/arch/x86/mm/page.c
@@ -599,7 +599,7 @@ static void pagefault_handler(struct state *s)
 		if (BUILTIN_EXPECT(!phyaddr, 0))
 			goto default_handler;
 
-		if (map_region(viraddr, phyaddr, 1, MAP_USER_SPACE|MAP_HEAP) == viraddr) {
+		if (map_region(viraddr, phyaddr, 1, MAP_USER_SPACE) == viraddr) {
 			memset((void*) viraddr, 0x00, PAGE_SIZE);
 			return;
 		}
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index 848164e3..54f74906 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -327,7 +327,7 @@ err_t rtl8139if_init(struct netif* netif)
 	memset(rtl8139if, 0, sizeof(rtl1839if_t));
 
 	/* allocate the receive buffer */
-	rtl8139if->rx_buffer = mem_allocation(8192+16, MAP_KERNEL_SPACE|MAP_HEAP|MAP_NO_CACHE);
+	rtl8139if->rx_buffer = mem_allocation(8192+16, MAP_KERNEL_SPACE|MAP_NO_CACHE);
 	if (!(rtl8139if->rx_buffer)) {
 		LWIP_DEBUGF(NETIF_DEBUG, ("rtl8139if_init: out of memory\n"));
 		kfree(rtl8139if, sizeof(rtl1839if_t));
@@ -336,7 +336,7 @@ err_t rtl8139if_init(struct netif* netif)
 	memset(rtl8139if->rx_buffer, 0, 8192+16);
 
 	/* allocate the send buffers */
-	rtl8139if->tx_buffer[0] = mem_allocation(4*4096, MAP_KERNEL_SPACE|MAP_HEAP|MAP_NO_CACHE);
+	rtl8139if->tx_buffer[0] = mem_allocation(4*4096, MAP_KERNEL_SPACE|MAP_NO_CACHE);
 	if (!(rtl8139if->tx_buffer[0])) {
 		LWIP_DEBUGF(NETIF_DEBUG, ("rtl8139if_init: out of memory\n"));
 		kfree(rtl8139if->rx_buffer, 8192+16);
diff --git a/include/metalsvm/stdlib.h b/include/metalsvm/stdlib.h
index fe824207..ad1cecdb 100644
--- a/include/metalsvm/stdlib.h
+++ b/include/metalsvm/stdlib.h
@@ -41,8 +41,8 @@ extern "C" {
 #define MAP_USER_SPACE		(1 << 1)
 #define MAP_PAGE_TABLE		(1 << 2)
 #define MAP_NO_CACHE		(1 << 3)
-#define MAP_STACK		(1 << 4)
-#define MAP_HEAP		(1 << 5)
+//#define MAP_STACK		(1 << 4)
+//#define MAP_HEAP		(1 << 5)
 #define MAP_CODE		(1 << 6)
 #define MAP_READONLY		(1 << 7)
 #ifdef CONFIG_ROCKCREEK
diff --git a/mm/memory.c b/mm/memory.c
index ed6057e7..376bb81e 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -293,7 +293,7 @@ void* mem_allocation(size_t sz, uint32_t flags)
 
 void* kmalloc(size_t sz)
 {
-	return mem_allocation(sz, MAP_KERNEL_SPACE|MAP_HEAP);
+	return mem_allocation(sz, MAP_KERNEL_SPACE);
 }
 
 void kfree(void* addr, size_t sz)