diff --git a/reactos/ntoskrnl/cm/cm.h b/reactos/ntoskrnl/cm/cm.h
index b232c112100..46cda5af3a7 100644
--- a/reactos/ntoskrnl/cm/cm.h
+++ b/reactos/ntoskrnl/cm/cm.h
@@ -209,17 +209,11 @@ CmiScanKeyList(IN PKEY_OBJECT Parent,
 	       IN ULONG Attributes,
 	       PKEY_OBJECT* ReturnedObject);
 
-NTSTATUS
-CmiCreateVolatileHive(PEREGISTRY_HIVE *RegistryHive);
-
 NTSTATUS
 CmiLoadHive(POBJECT_ATTRIBUTES KeyObjectAttributes,
 	    PUNICODE_STRING FileName,
 	    ULONG Flags);
 
-NTSTATUS
-CmiRemoveRegistryHive(PEREGISTRY_HIVE RegistryHive);
-
 NTSTATUS
 CmiFlushRegistryHive(PEREGISTRY_HIVE RegistryHive);
 
@@ -335,16 +329,6 @@ CmiConnectHive(POBJECT_ATTRIBUTES KeyObjectAttributes,
 NTSTATUS
 CmiInitHives(BOOLEAN SetupBoot);
 
-ULONG
-CmiGetPackedNameLength(IN PUNICODE_STRING Name,
-		       OUT PBOOLEAN Packable);
-
-BOOLEAN
-CmiComparePackedNames(IN PUNICODE_STRING Name,
-		      IN PUCHAR NameBuffer,
-		      IN USHORT NameBufferSize,
-		      IN BOOLEAN NamePacked);
-
 HCELL_INDEX
 NTAPI
 CmpFindValueByName(
@@ -366,23 +350,6 @@ CmiCopyPackedName(PWCHAR NameBuffer,
 		  PUCHAR PackedNameBuffer,
 		  ULONG PackedNameSize);
 
-BOOLEAN
-CmiCompareHash(PUNICODE_STRING KeyName,
-	       PCHAR HashString);
-
-BOOLEAN
-CmiCompareHashI(PUNICODE_STRING KeyName,
-		PCHAR HashString);
-
-BOOLEAN
-CmiCompareKeyNames(PUNICODE_STRING KeyName,
-		   PCM_KEY_NODE KeyCell);
-
-BOOLEAN
-CmiCompareKeyNamesI(PUNICODE_STRING KeyName,
-		    PCM_KEY_NODE KeyCell);
-
-
 VOID
 CmiSyncHives(VOID);
 
diff --git a/reactos/ntoskrnl/cm/regfile.c b/reactos/ntoskrnl/cm/regfile.c
index 78f2d8d66b0..b3350bac3a4 100644
--- a/reactos/ntoskrnl/cm/regfile.c
+++ b/reactos/ntoskrnl/cm/regfile.c
@@ -527,7 +527,6 @@ CmiAddSubKey(PEREGISTRY_HIVE RegistryHive,
   return(Status);
 }
 
-
 NTSTATUS
 CmiRemoveSubKey(PEREGISTRY_HIVE RegistryHive,
 		PKEY_OBJECT ParentKey,
@@ -697,7 +696,6 @@ CmiAllocateHashTableCell (IN PEREGISTRY_HIVE RegistryHive,
   return Status;
 }
 
-
 PCM_KEY_NODE
 CmiGetKeyFromHashByIndex(PEREGISTRY_HIVE RegistryHive,
 			 PHASH_TABLE_CELL HashBlock,
@@ -712,7 +710,6 @@ CmiGetKeyFromHashByIndex(PEREGISTRY_HIVE RegistryHive,
   return KeyCell;
 }
 
-
 NTSTATUS
 CmiAddKeyToHashTable(PEREGISTRY_HIVE RegistryHive,
 		     PHASH_TABLE_CELL HashCell,
@@ -735,7 +732,6 @@ CmiAddKeyToHashTable(PEREGISTRY_HIVE RegistryHive,
   return STATUS_SUCCESS;
 }
 
-
 NTSTATUS
 CmiRemoveKeyFromHashTable(PEREGISTRY_HIVE RegistryHive,
 			  PHASH_TABLE_CELL HashBlock,
@@ -758,67 +754,6 @@ CmiRemoveKeyFromHashTable(PEREGISTRY_HIVE RegistryHive,
   return STATUS_UNSUCCESSFUL;
 }
 
-ULONG
-CmiGetPackedNameLength(IN PUNICODE_STRING Name,
-		       OUT PBOOLEAN Packable)
-{
-  ULONG i;
-
-  if (Packable != NULL)
-    *Packable = TRUE;
-
-  for (i = 0; i < Name->Length / sizeof(WCHAR); i++)
-    {
-      if (Name->Buffer[i] & 0xFF00)
-	{
-	  if (Packable != NULL)
-	    *Packable = FALSE;
-	  return Name->Length;
-	}
-    }
-
-  return (Name->Length / sizeof(WCHAR));
-}
-
-
-BOOLEAN
-CmiComparePackedNames(IN PUNICODE_STRING Name,
-		      IN PUCHAR NameBuffer,
-		      IN USHORT NameBufferSize,
-		      IN BOOLEAN NamePacked)
-{
-  PWCHAR UNameBuffer;
-  ULONG i;
-
-  if (NamePacked == TRUE)
-    {
-      if (Name->Length != NameBufferSize * sizeof(WCHAR))
-	return(FALSE);
-
-      for (i = 0; i < Name->Length / sizeof(WCHAR); i++)
-	{
-	  if (RtlUpcaseUnicodeChar(Name->Buffer[i]) != RtlUpcaseUnicodeChar((WCHAR)NameBuffer[i]))
-	    return(FALSE);
-	}
-    }
-  else
-    {
-      if (Name->Length != NameBufferSize)
-	return(FALSE);
-
-      UNameBuffer = (PWCHAR)NameBuffer;
-
-      for (i = 0; i < Name->Length / sizeof(WCHAR); i++)
-	{
-	  if (RtlUpcaseUnicodeChar(Name->Buffer[i]) != RtlUpcaseUnicodeChar(UNameBuffer[i]))
-	    return(FALSE);
-	}
-    }
-
-  return(TRUE);
-}
-
-
 VOID
 CmiCopyPackedName(PWCHAR NameBuffer,
 		  PUCHAR PackedNameBuffer,
@@ -830,113 +765,6 @@ CmiCopyPackedName(PWCHAR NameBuffer,
     NameBuffer[i] = (WCHAR)PackedNameBuffer[i];
 }
 
-
-BOOLEAN
-CmiCompareHash(PUNICODE_STRING KeyName,
-	       PCHAR HashString)
-{
-  CHAR Buffer[4];
-
-  Buffer[0] = (KeyName->Length >= 2) ? (CHAR)KeyName->Buffer[0] : 0;
-  Buffer[1] = (KeyName->Length >= 4) ? (CHAR)KeyName->Buffer[1] : 0;
-  Buffer[2] = (KeyName->Length >= 6) ? (CHAR)KeyName->Buffer[2] : 0;
-  Buffer[3] = (KeyName->Length >= 8) ? (CHAR)KeyName->Buffer[3] : 0;
-
-  return (strncmp(Buffer, HashString, 4) == 0);
-}
-
-
-BOOLEAN
-CmiCompareHashI(PUNICODE_STRING KeyName,
-	        PCHAR HashString)
-{
-  CHAR Buffer[4];
-
-  Buffer[0] = (KeyName->Length >= 2) ? (CHAR)KeyName->Buffer[0] : 0;
-  Buffer[1] = (KeyName->Length >= 4) ? (CHAR)KeyName->Buffer[1] : 0;
-  Buffer[2] = (KeyName->Length >= 6) ? (CHAR)KeyName->Buffer[2] : 0;
-  Buffer[3] = (KeyName->Length >= 8) ? (CHAR)KeyName->Buffer[3] : 0;
-
-  return (_strnicmp(Buffer, HashString, 4) == 0);
-}
-
-
-BOOLEAN
-CmiCompareKeyNames(PUNICODE_STRING KeyName,
-		   PCM_KEY_NODE KeyCell)
-{
-  PWCHAR UnicodeName;
-  USHORT i;
-
-  DPRINT("Flags: %hx\n", KeyCell->Flags);
-
-  if (KeyCell->Flags & REG_KEY_NAME_PACKED)
-    {
-      if (KeyName->Length != KeyCell->NameSize * sizeof(WCHAR))
-	return FALSE;
-
-      for (i = 0; i < KeyCell->NameSize; i++)
-	{
-	  if (KeyName->Buffer[i] != (WCHAR)KeyCell->Name[i])
-	    return FALSE;
-	}
-    }
-  else
-    {
-      if (KeyName->Length != KeyCell->NameSize)
-	return FALSE;
-
-      UnicodeName = (PWCHAR)KeyCell->Name;
-      for (i = 0; i < KeyCell->NameSize / sizeof(WCHAR); i++)
-	{
-	  if (KeyName->Buffer[i] != UnicodeName[i])
-	    return FALSE;
-	}
-    }
-
-  return TRUE;
-}
-
-
-BOOLEAN
-CmiCompareKeyNamesI(PUNICODE_STRING KeyName,
-		    PCM_KEY_NODE KeyCell)
-{
-  PWCHAR UnicodeName;
-  USHORT i;
-
-  DPRINT("Flags: %hx\n", KeyCell->Flags);
-
-  if (KeyCell->Flags & REG_KEY_NAME_PACKED)
-    {
-      if (KeyName->Length != KeyCell->NameSize * sizeof(WCHAR))
-	return FALSE;
-
-      for (i = 0; i < KeyCell->NameSize; i++)
-	{
-	  if (RtlUpcaseUnicodeChar(KeyName->Buffer[i]) !=
-	      RtlUpcaseUnicodeChar((WCHAR)KeyCell->Name[i]))
-	    return FALSE;
-	}
-    }
-  else
-    {
-      if (KeyName->Length != KeyCell->NameSize)
-	return FALSE;
-
-      UnicodeName = (PWCHAR)KeyCell->Name;
-      for (i = 0; i < KeyCell->NameSize / sizeof(WCHAR); i++)
-	{
-	  if (RtlUpcaseUnicodeChar(KeyName->Buffer[i]) !=
-	      RtlUpcaseUnicodeChar(UnicodeName[i]))
-	    return FALSE;
-	}
-    }
-
-  return TRUE;
-}
-
-
 NTSTATUS
 CmiSaveTempHive (PEREGISTRY_HIVE Hive,
 		 HANDLE FileHandle)