diff --git a/UsbDk/MemoryBuffer.cpp b/UsbDk/MemoryBuffer.cpp
index ef83c0f..28c5e1b 100644
--- a/UsbDk/MemoryBuffer.cpp
+++ b/UsbDk/MemoryBuffer.cpp
@@ -23,8 +23,3 @@
 
 #include "stdafx.h"
 #include "MemoryBuffer.h"
-
-CWdmMemoryBuffer* CWdmMemoryBuffer::GetMemoryBuffer(PVOID Buffer, SIZE_T Size)
-{
-    return new CWdmMemoryBuffer(Buffer, Size);
-}
diff --git a/UsbDk/MemoryBuffer.h b/UsbDk/MemoryBuffer.h
index eb72ad7..49c0cd2 100644
--- a/UsbDk/MemoryBuffer.h
+++ b/UsbDk/MemoryBuffer.h
@@ -74,8 +74,6 @@ public:
     ~CWdmMemoryBuffer()
     { if(m_Ptr != nullptr) { ExFreePool(m_Ptr); } }
 
-    static CWdmMemoryBuffer* GetMemoryBuffer(PVOID Buffer, SIZE_T Size);
-
     PVOID Ptr() const { return m_Ptr; }
     SIZE_T Size() const { return m_Size; }
 
diff --git a/UsbDk/RegText.h b/UsbDk/RegText.h
index f94066d..0264b21 100644
--- a/UsbDk/RegText.h
+++ b/UsbDk/RegText.h
@@ -43,19 +43,19 @@ public:
 
     virtual ~CRegText() {}
 
-    iterator begin() const { return static_cast<PWCHAR> (m_Data->Ptr()); }
-    iterator end() const { return reinterpret_cast<PWCHAR>(static_cast<PCHAR>(m_Data->Ptr()) + m_Data->Size()); }
-    bool empty() const { return (m_Data->Size() == 0); }
+    iterator begin() const { return static_cast<PWCHAR> (m_Data.Ptr()); }
+    iterator end() const { return reinterpret_cast<PWCHAR>(static_cast<PCHAR>(m_Data.Ptr()) + m_Data.Size()); }
+    bool empty() const { return (m_Data.Size() == 0); }
 
     bool Match(PCWSTR String) const;
     bool MatchPrefix(PCWSTR String) const;
     void Dump() const;
 
-    CRegText(CWdmMemoryBuffer* Data)
-        : m_Data(Data) {}
+    CRegText(PVOID Buffer, SIZE_T Size)
+        : m_Data(Buffer, Size) {}
 
 private:
-    CObjHolder<CWdmMemoryBuffer> m_Data;
+    CWdmMemoryBuffer m_Data;
     SIZE_T m_currPos = 0;
 };
 
@@ -63,7 +63,7 @@ class CRegSz : public CRegText
 {
 public:
     CRegSz(PWCHAR Data)
-        : CRegText(CWdmMemoryBuffer::GetMemoryBuffer(static_cast<PVOID>(Data), GetBufferLength(Data)))
+        : CRegText(static_cast<PVOID>(Data), GetBufferLength(Data))
     {}
     static SIZE_T GetBufferLength(PWCHAR Data) { return (Data != nullptr) ? (wcslen(Data) + 1) * sizeof(WCHAR) : 0; }
 };
@@ -72,7 +72,7 @@ class CRegMultiSz : public CRegText
 {
 public:
     CRegMultiSz(PWCHAR Data)
-        : CRegText(CWdmMemoryBuffer::GetMemoryBuffer(static_cast<PVOID>(Data), GetBufferLength(Data)))
+        : CRegText(static_cast<PVOID>(Data), GetBufferLength(Data))
     {}
     static SIZE_T GetBufferLength(PWCHAR Data);
 };