diff --git a/nodes/home/nas.py b/nodes/home/nas.py
index 4afce46..821de15 100644
--- a/nodes/home/nas.py
+++ b/nodes/home/nas.py
@@ -67,26 +67,6 @@ nodes['home.nas'] = {
                 '/storage/nas/normen',
             },
         },
-        'dm-crypt': {
-            'encrypted-devices': {
-                '/dev/disk/by-id/ata-ST18000NM0092-3CX103_ZVV06JV7-part1': {
-                    'dm-name': 'sg-ZVV06JV7-1',
-                    'passphrase': bwpass.password('bw/home.nas/dmcrypt/sg-ZVV06JV7-1'),
-                },
-                '/dev/disk/by-id/ata-ST18000NM0092-3CX103_ZVV06JV7-part2': {
-                    'dm-name': 'sg-ZVV06JV7-2',
-                    'passphrase': bwpass.password('bw/home.nas/dmcrypt/sg-ZVV06JV7-2'),
-                },
-                '/dev/disk/by-id/ata-ST18000NM0092-3CX103_ZVV06SLR-part1': {
-                    'dm-name': 'sg-ZVV06SLR-1',
-                    'passphrase': bwpass.password('bw/home.nas/dmcrypt/sg-ZVV06SLR-1'),
-                },
-                '/dev/disk/by-id/ata-ST18000NM0092-3CX103_ZVV06SLR-part2': {
-                    'dm-name': 'sg-ZVV06SLR-2',
-                    'passphrase': bwpass.password('bw/home.nas/dmcrypt/sg-ZVV06SLR-2'),
-                },
-            },
-        },
         'groups': {
             'nas': {},
         },
@@ -271,58 +251,14 @@ nodes['home.nas'] = {
                         'ashift': 12,
                     },
                 },
-                'encrypted': {
-                    'when_creating': {
-                        'config': [
-                            # These are new and fancy "dual actuator"
-                            # drives, partitioned into two partitions
-                            # taking 50% of the disk each.
-                            {
-                                'type': 'mirror',
-                                'devices': {
-                                    '/dev/mapper/sg-ZVV06JV7-1',
-                                    '/dev/mapper/sg-ZVV06SLR-1',
-                                },
-                            },
-                            {
-                                'type': 'mirror',
-                                'devices': {
-                                    '/dev/mapper/sg-ZVV06JV7-2',
-                                    '/dev/mapper/sg-ZVV06SLR-2',
-                                },
-                            },
-                        ],
-                        'ashift': 12
-                    },
-                    'needs': {
-                        'action:dm-crypt_open_sg-ZVV06JV7-1',
-                        'action:dm-crypt_open_sg-ZVV06JV7-2',
-                        'action:dm-crypt_open_sg-ZVV06SLR-1',
-                        'action:dm-crypt_open_sg-ZVV06SLR-2',
-                    },
-                    # see comment in bundle:backup-server
-                    'unless': 'zpool import encrypted',
-                },
             },
             'datasets': {
-                'encrypted': {
-                    'primarycache': 'metadata',
-                },
-                'encrypted/nas': {
-                    'acltype': 'off',
-                    'atime': 'off',
-                    'compression': 'off',
-                    'mountpoint': '/media/nas',
-                },
                 'storage': {
                     'primarycache': 'metadata',
                 },
                 'storage/opt-yate': {
                     'mountpoint': '/opt/yate',
                 },
-                'storage/f2k1de': {
-                    'mountpoint': '/storage/f2k1de',
-                },
                 'storage/download': {
                     'mountpoint': '/storage/download',
                 },
@@ -331,6 +267,9 @@ nodes['home.nas'] = {
                     'mountpoint': '/storage/inbox',
                 },
                 'storage/nas': {
+                    'acltype': 'off',
+                    'atime': 'off',
+                    'compression': 'off',
                     'mountpoint': '/storage/nas',
                 },
                 'storage/paperless': {