diff --git a/hosts/Shura/default.nix b/hosts/Shura/default.nix
index c4cfa50..64acf59 100644
--- a/hosts/Shura/default.nix
+++ b/hosts/Shura/default.nix
@@ -35,8 +35,6 @@ in
       tpm2.enable = true;
     };
 
-    bluetooth.adapter = "AC:50:DE:9F:AB:88";
-
     # Change the default text editor. Options are "emacs", "nano", or "vim".
     editor = "nano";
 
@@ -64,13 +62,6 @@ in
         operation = "boot";
         user = config.users.users.aires.name;
       };
-      netdata = {
-        # FIXME: Disabled until I get Nginx configured to provide a streaming endpoint
-        enable = false;
-        type = "child";
-        url = config.secrets.services.netdata.url;
-        auth.apiKey = config.secrets.services.netdata.apiKey;
-      };
       syncthing = {
         enable = true;
         home = "/home/aires/.config/syncthing";
diff --git a/modules/services/netdata.nix b/modules/services/netdata.nix
index 03e88a3..d273933 100644
--- a/modules/services/netdata.nix
+++ b/modules/services/netdata.nix
@@ -74,14 +74,10 @@ in
           package = pkgs.unstable.netdataCloud;
           enableAnalyticsReporting = false;
           configDir = {
-            # Enable nvidia-smi: https://nixos.wiki/wiki/Netdata#nvidia-smi
-            "python.d.conf" = pkgs.writeText "python.d.conf" ''
-              nvidia_smi: yes
-            '';
             # Allow incoming streams
             "stream.conf" = pkgs.writeText "stream.conf" ''
               [${config.secrets.services.netdata.apiKey}]
-                enabled = yes
+                enabled = no
                 default history = 3600
                 default memory mode = dbengine
                 health enabled by default = auto
diff --git a/modules/system/bluetooth.nix b/modules/system/bluetooth.nix
index 42b1532..6d17790 100644
--- a/modules/system/bluetooth.nix
+++ b/modules/system/bluetooth.nix
@@ -14,11 +14,6 @@ in
   options = {
     aux.system.bluetooth = {
       enable = lib.mkEnableOption "Enables bluetooth.";
-      adapter = lib.mkOption {
-        type = lib.types.str;
-        description = "The MAC address of your primary Bluetooth adapter Used to install device configs.";
-        default = "";
-      };
       experimental.enable = lib.mkEnableOption "Enables experimental features, like device power reporting.";
     };
   };