Removed calls to custom xmalloc, xetc.