diff --git a/xtldr2/xtldr.c b/xtldr2/xtldr.c
index 7fd32ef..1efd698 100644
--- a/xtldr2/xtldr.c
+++ b/xtldr2/xtldr.c
@@ -374,42 +374,44 @@ BlStartXtLoader(IN EFI_HANDLE ImageHandle,
     }
 
 
-    BlConsolePrint(L"\n\n\n\n\n\n\n\nList of loaded modules:");
-    PLIST_ENTRY ModuleListEntry;
-    PXTBL_MODULE_INFO ModuleInfo;
+    // BlConsolePrint(L"\n\n\n\n\n\n\n\nList of loaded modules:");
+    // PLIST_ENTRY ModuleListEntry;
+    // PXTBL_MODULE_INFO ModuleInfo;
 
-    ModuleListEntry = BlpLoadedModules.Flink;
-    while(ModuleListEntry != &BlpLoadedModules)
-    {
-        /* Get module information */
-        ModuleInfo = CONTAIN_RECORD(ModuleListEntry, XTBL_MODULE_INFO, Flink);
-
-        /* Module already loaded */
-        BlConsolePrint(L"\n%S", ModuleInfo->ModuleName);
-        if(ModuleInfo->ModuleDescription != 0)
-        {
-            BlConsolePrint(L" (%S)", ModuleInfo->ModuleDescription);
-        }
-
-        PLIST_ENTRY DepsListEntry;
-        PXTBL_MODULE_DEPS DepsInfo;
-        BlConsolePrint(L"\n  - Uses: ");
-        DepsListEntry = ModuleInfo->Dependencies.Flink;
-        while(DepsListEntry != &ModuleInfo->Dependencies)
-        {
-            DepsInfo = CONTAIN_RECORD(DepsListEntry, XTBL_MODULE_DEPS, Flink);
-            BlConsolePrint(L"%S ", DepsInfo->ModuleName);
-            DepsListEntry = DepsListEntry->Flink;
-        }
-
-        /* Move to the module */
-        ModuleListEntry = ModuleListEntry->Flink;
-    }
-
-    BlConsolePrint(L"\n\n END OF LIST\n");
-
-    for(;;)
+    // ModuleListEntry = BlpLoadedModules.Flink;
+    // while(ModuleListEntry != &BlpLoadedModules)
+    // {
+    //     /* Get module information */
+    //     ModuleInfo = CONTAIN_RECORD(ModuleListEntry, XTBL_MODULE_INFO, Flink);
+
+    //     /* Module already loaded */
+    //     BlConsolePrint(L"\n%S", ModuleInfo->ModuleName);
+    //     if(ModuleInfo->ModuleDescription != 0)
+    //     {
+    //         BlConsolePrint(L" (%S)", ModuleInfo->ModuleDescription);
+    //     }
+
+    //     PLIST_ENTRY DepsListEntry;
+    //     PXTBL_MODULE_DEPS DepsInfo;
+    //     BlConsolePrint(L"\n  - Uses: ");
+    //     DepsListEntry = ModuleInfo->Dependencies.Flink;
+    //     while(DepsListEntry != &ModuleInfo->Dependencies)
+    //     {
+    //         DepsInfo = CONTAIN_RECORD(DepsListEntry, XTBL_MODULE_DEPS, Flink);
+    //         BlConsolePrint(L"%S ", DepsInfo->ModuleName);
+    //         DepsListEntry = DepsListEntry->Flink;
+    //     }
+
+    //     /* Move to the module */
+    //     ModuleListEntry = ModuleListEntry->Flink;
+    // }
+
+    // BlConsolePrint(L"\n\n END OF LIST\n");
+
+    /* Main boot loader loop */
+    while(TRUE)
     {
+        /* Check if custom boot menu registered */
         if(BlpStatus.BootMenu != NULL)
         {
             /* Display alternative boot menu */
@@ -420,6 +422,8 @@ BlStartXtLoader(IN EFI_HANDLE ImageHandle,
             /* Display default boot menu */
             BlDisplayBootMenu();
         }
+
+        /* Fallback to shell, if boot menu returned */
     }
 
     /* This point should be never reached, if this happen return error code */