diff --git a/modules/datasync.nix b/modules/datasync.nix
index 75b930b..6db7a7f 100644
--- a/modules/datasync.nix
+++ b/modules/datasync.nix
@@ -84,18 +84,6 @@
 
   # Automount external storage
   systemd.mounts = [
-    # USB
-    {
-      what = "/dev/sda1";
-      where = "/usb";
-      mountConfig = { TimeoutSec = "5"; };
-    }
-    # SD card
-    {
-      what = "/dev/mmcblk0p1";
-      where = "/sdcard";
-      mountConfig = { TimeoutSec = "5"; };
-    }
     # UGent Samba
     {
       what = "//files.ugent.be/akasroua/home";
@@ -107,18 +95,6 @@
     }
   ];
   systemd.automounts = [
-    # USB
-    {
-      where = "/usb";
-      automountConfig = { TimeoutIdleSec = "5"; };
-      wantedBy = [ "default.target" ];
-    }
-    # SD card
-    {
-      where = "/sdcard";
-      automountConfig = { TimeoutIdleSec = "5"; };
-      wantedBy = [ "default.target" ];
-    }
     # UGent Samba
     {
       where = "/ugent";
diff --git a/modules/hardware-configuration.nix b/modules/hardware-configuration.nix
index 2d57972..6302001 100644
--- a/modules/hardware-configuration.nix
+++ b/modules/hardware-configuration.nix
@@ -23,19 +23,14 @@
       fsType = "zfs";
     };
 
-  fileSystems."/sdcard" =
-    { device = "systemd-1";
-      fsType = "autofs";
-    };
-
   fileSystems."/ugent" =
     { device = "systemd-1";
       fsType = "autofs";
     };
 
-  fileSystems."/usb" =
-    { device = "systemd-1";
-      fsType = "autofs";
+  fileSystems."/tmp" =
+    { device = "syscea/ephemeral/tmp";
+      fsType = "zfs";
     };
 
   fileSystems."/home/coolneng" =
@@ -43,11 +38,6 @@
       fsType = "zfs";
     };
 
-  fileSystems."/tmp" =
-    { device = "syscea/ephemeral/tmp";
-      fsType = "zfs";
-    };
-
   fileSystems."/home/coolneng/Downloads" =
     { device = "syscea/stateful/home/downloads";
       fsType = "zfs";