diff --git a/boot/bootdata/bootcd.ini b/boot/bootdata/bootcd.ini
index 1e6affd5b9c30..697bbf34502fc 100644
--- a/boot/bootdata/bootcd.ini
+++ b/boot/bootdata/bootcd.ini
@@ -7,18 +7,8 @@ TitleText=ReactOS Setup & Live BootCD
 MinimalUI=Yes
 
 [Operating Systems]
-Setup="ReactOS Setup (Text Mode)"
-Setup_Debug="Setup (Debug)"
-Setup_Aacpi="Setup ACPI APIC (Debug)"
-Setup_Screen="Setup (Screen)"
-;;;;
 LiveCD="ReactOS Setup (Graphics Mode) & Live"
 LiveCD_Debug="ReactOS Live (Debug)"
-LiveCD_Macpi="LiveCD ACPI SMP (Debug)"
-LiveCD_Aacpi="LiveCD ACPI APIC (Debug)"
-LiveCD_VBoxDebug="ReactOS Live (VBox Debug)"
-LiveCD_Screen="ReactOS Live (Screen)"
-; LiveCD_LogFile="ReactOS Live (Log file)"
 LiveCD_RamDisk="ReactOS Setup (Graphics Mode) & Live in RAM"
 LiveCD_RamDisk_Debug="ReactOS Live in RAM (Debug)"
 LiveCD_RamDisk_Screen="ReactOS Live in RAM (Screen)"
@@ -44,12 +34,12 @@ Options=/DEBUG /DEBUGPORT=SCREEN /SIFOPTIONSOVERRIDE
 [LiveCD]
 BootType=Windows2003
 SystemPath=\reactos
-Options=/FASTDETECT /MININT
+Options=/HAL=HALACPI.DLL /FASTDETECT /MININT
 
 [LiveCD_Debug]
 BootType=Windows2003
 SystemPath=\reactos
-Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT
+Options=/HAL=HALACPI.DLL /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT
 
 [LiveCD_Macpi]
 BootType=Windows2003
@@ -79,17 +69,17 @@ Options=/DEBUG /DEBUGPORT=SCREEN /SOS /FASTDETECT /MININT
 [LiveCD_RamDisk]
 BootType=Windows2003
 SystemPath=ramdisk(0)\reactos
-Options=/FASTDETECT /MININT /RDPATH=liveimg.iso /RDEXPORTASCD
+Options=/HAL=HALACPI.DLL /FASTDETECT /MININT /RDPATH=liveimg.iso /RDEXPORTASCD
 
 [LiveCD_RamDisk_Debug]
 BootType=Windows2003
 SystemPath=ramdisk(0)\reactos
-Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT /RDPATH=liveimg.iso /RDEXPORTASCD
+Options=/HAL=HALACPI.DLL /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT /RDPATH=liveimg.iso /RDEXPORTASCD
 
 [LiveCD_RamDisk_Screen]
 BootType=Windows2003
 SystemPath=ramdisk(0)\reactos
-Options=/DEBUG /DEBUGPORT=SCREEN /SOS /FASTDETECT /MININT /RDPATH=liveimg.iso /RDEXPORTASCD
+Options=/HAL=HALACPI.DLL /DEBUG /DEBUGPORT=SCREEN /SOS /FASTDETECT /MININT /RDPATH=liveimg.iso /RDEXPORTASCD
 
 [HddBoot]
 BootType=Drive
diff --git a/hal/halacpi/acpi/dispatch.c b/hal/halacpi/acpi/dispatch.c
index 6a633dc1c085a..60678d2c39884 100644
--- a/hal/halacpi/acpi/dispatch.c
+++ b/hal/halacpi/acpi/dispatch.c
@@ -643,7 +643,7 @@ HaliAcpiMachineStateInit(_In_ ULONG Par1,
         handler.Context = UlongToPtr(Context.AsULONG);
 
         Status = ZwPowerInformation(SystemPowerStateHandler, &handler, sizeof(handler), NULL, 0);
-        ASSERT(NT_SUCCESS(Status));
+       // ASSERT(NT_SUCCESS(Status));
     }
 
     if (StateData[1].Data0 && HalpWakeVector)
@@ -660,7 +660,7 @@ HaliAcpiMachineStateInit(_In_ ULONG Par1,
         handler.Context = UlongToPtr(Context.AsULONG);
 
         Status = ZwPowerInformation(SystemPowerStateHandler, &handler, sizeof(handler), NULL, 0);
-        ASSERT(NT_SUCCESS(Status));
+       // ASSERT(NT_SUCCESS(Status));
     }
 
     if (StateData[2].Data0 && HalpWakeVector)
@@ -677,7 +677,7 @@ HaliAcpiMachineStateInit(_In_ ULONG Par1,
         handler.Context = UlongToPtr(Context.AsULONG);
 
         Status = ZwPowerInformation(SystemPowerStateHandler, &handler, sizeof(handler), NULL, 0);
-        ASSERT(NT_SUCCESS(Status));
+      //  ASSERT(NT_SUCCESS(Status));
     }
 
     if (!HalpDisableHibernate)
@@ -696,7 +696,7 @@ HaliAcpiMachineStateInit(_In_ ULONG Par1,
             handler.Context = UlongToPtr(Context.AsULONG);
 
             Status = ZwPowerInformation(SystemPowerStateHandler, &handler, sizeof(handler), NULL, 0);
-            ASSERT(NT_SUCCESS(Status));
+           // ASSERT(NT_SUCCESS(Status));
         }
         else if (!StateData[4].Data0)
         {
@@ -717,7 +717,7 @@ HaliAcpiMachineStateInit(_In_ ULONG Par1,
             handler.Context = UlongToPtr(Context.AsULONG);
 
             Status = ZwPowerInformation(SystemPowerStateHandler, &handler, sizeof(handler), NULL, 0);
-            ASSERT(NT_SUCCESS(Status));
+          //  ASSERT(NT_SUCCESS(Status));
         }
     }
 
@@ -736,7 +736,7 @@ HaliAcpiMachineStateInit(_In_ ULONG Par1,
         handler.Context = UlongToPtr(Context.AsULONG);
 
         Status = ZwPowerInformation(SystemPowerStateHandler, &handler, sizeof(handler), NULL, 0);
-        ASSERT(NT_SUCCESS(Status));
+        //ASSERT(NT_SUCCESS(Status));
     }
 
     KeFlushWriteBuffer();
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index 8d111117fbe0e..6220cefc92dcb 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -35,12 +35,7 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/livecd_extras/)
         add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/livecd_extras/${item} DESTINATION extras NO_CAB NAME_ON_CD ${item} FOR livecd)
     endforeach(item)
 endif()#
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd_extras/)
-    file(GLOB_RECURSE EXTRA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd_extras/ ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd_extras/*)
-    foreach(item ${EXTRA_FILES})
-        add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd_extras/${item} DESTINATION extras NO_CAB NAME_ON_CD ${item} FOR hybridcd)
-    endforeach(item)
-endif()
+
 
 ## Extra files which you need existing on the hard drive after the installation.
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/)