diff --git a/bundles/rspamd/items.py b/bundles/rspamd/items.py
index b743afa..b44d8b1 100644
--- a/bundles/rspamd/items.py
+++ b/bundles/rspamd/items.py
@@ -65,7 +65,6 @@ actions = {
     },
 }
 
-# TODO manage this using bundlewrap
 if 'dkim' in node.metadata.get('rspamd', {}):
     for i in {'arc', 'dkim_signing'}:
         files[f'/etc/rspamd/local.d/{i}.conf'] = {
diff --git a/bundles/zfs/items.py b/bundles/zfs/items.py
index b6eae92..c419d70 100644
--- a/bundles/zfs/items.py
+++ b/bundles/zfs/items.py
@@ -122,17 +122,3 @@ directories = {
 #
 #else:
 #    files["/mnt/zfs-snapshot-backup"] = {'delete': True}
-
-# TODO when we start using telegraf
-#if node.has_bundle('telegraf'):
-#    files['/etc/telegraf-zfs-dataset.conf'] = {
-#        'content': dumps(
-#            node.metadata.get('zfs', {}),
-#            cls=MetadataJSONEncoder,
-#            indent=4,
-#            sort_keys=True,
-#        ) + '\n',
-#    }
-#    files['/usr/local/bin/telegraf-zfs-dataset'] = {
-#        'mode': '0775',
-#    }
diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py
index d2ec693..c68bc09 100644
--- a/nodes/htz/ex42-1048908.py
+++ b/nodes/htz/ex42-1048908.py
@@ -41,9 +41,7 @@ nodes['htz.ex42-1048908'] = {
                 'redis': {},
 
                 # No need to create a bundle just to install packages,
-                # configs will be managed by users nevertheless. Maybe
-                # this will be a FIXME once we start managing backups
-                # via bundlewrap.
+                # configs will be managed by users nevertheless.
                 'weechat': {},
                 'weechat-core': {},
                 'weechat-curses': {},