diff --git a/machines/laptop.nix b/machines/laptop.nix
index b45a6f6..ed6c056 100644
--- a/machines/laptop.nix
+++ b/machines/laptop.nix
@@ -4,9 +4,6 @@
   imports = [
     # Import environment
     ../default.nix
-
-    # TODO: Remove later
-    ../merged.nix
   ];
 
   config = {
diff --git a/modules/boot/silent-boot.nix b/modules/boot/silent-boot.nix
index b509fcc..0c948e9 100644
--- a/modules/boot/silent-boot.nix
+++ b/modules/boot/silent-boot.nix
@@ -10,22 +10,22 @@ in {
 
   config = mkIf cfg.enable {
     boot = {
-        loader.timeout = 0;
+      loader.timeout = 0;
+      
+      consoleLogLevel = 0;
+      initrd.verbose = false;
+      initrd.checkJournalingFS = false;
+
+      kernelParams = [
+        "quiet"
+        "boot.shell_on_fail"
+        "loglevel=3"
+        "rd.systemd.show_status=false"
+        "rd.udev.log_level=3"
+        "udev.log_priority=3"
+        "video=efifb:nobgrt"
+        "bgrt_disable"
+      ];
     };
-
-    consoleLogLevel = 0;
-    initrd.verbose = false;
-    initrd.checkJournalingFS = false;
-
-    kernelParams = [
-      "quiet"
-      "boot.shell_on_fail"
-      "loglevel=3"
-      "rd.systemd.show_status=false"
-      "rd.udev.log_level=3"
-      "udev.log_priority=3"
-      "video=efifb:nobgrt"
-      "bgrt_disable"
-    ];
   };
 }
\ No newline at end of file