diff --git a/LinuxMemoryManager/uapi_mm.h b/LinuxMemoryManager/uapi_mm.h
index 1ec5473..e3fb949 100644
--- a/LinuxMemoryManager/uapi_mm.h
+++ b/LinuxMemoryManager/uapi_mm.h
@@ -52,14 +52,17 @@ void
 mm_instantiate_new_page_family(
         char *struct_name,
         uint32_t struct_size);
-
+#if 0
 #define XCALLOC(units, struct_name) \
     (xcalloc(#struct_name, units))
+#endif
+#define XCALLOC(units, struct_name) \
+    (calloc(units, sizeof(struct_name)))
 
 #define MM_REG_STRUCT(struct_name)  \
     (mm_instantiate_new_page_family(#struct_name, sizeof(struct_name)))
 
 #define XFREE(ptr)  \
-   xfree(ptr)
+   free(ptr)
 
 #endif /* __UAPI_MM__ */