diff --git a/home/neovim/avante.nix b/home/neovim/avante.nix
index ce22f1a..65d8694 100644
--- a/home/neovim/avante.nix
+++ b/home/neovim/avante.nix
@@ -5,10 +5,7 @@
     plugins = {
       markdown-preview.enable = true;
       render-markdown.enable = true;
-      #extraConfigLuaPre = ''
-      #  vim.env.GROQ_API_KEY = os.getenv("GROQ_API_KEY")
-      #'';
-      # TODO: Integrate CoPilot https://github.com/settings/copilot/features
+
       avante = {
         enable = true;
         autoLoad = true;
@@ -31,8 +28,6 @@
             };
           };
 
-          #        auto_suggestions_provider = "copilot";
-
           render = {
             markdown = true;
             syntax = true;
diff --git a/hosts/cyper-controller/hardware-configuration.nix b/hosts/cyper-controller/hardware-configuration.nix
index 4262b8f..92ae68a 100644
--- a/hosts/cyper-controller/hardware-configuration.nix
+++ b/hosts/cyper-controller/hardware-configuration.nix
@@ -38,7 +38,6 @@
       ];
     };
 
-    # TODO: Add External Devices as by-label with no necessity for boot
     "/storage/internal" = {
       device = "/dev/disk/by-label/STORAGE";
       fsType = "btrfs";
diff --git a/nixos/default.nix b/nixos/default.nix
index 4be2797..221e4b7 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -57,36 +57,6 @@
     };
   };
 
-  # TODO: Get rid of this
-  virtualisation = lib.mkIf isServer {
-    vmVariant = {
-      virtualisation = {
-        forwardPorts = [
-          {
-            from = "host";
-            host.port = 2222;
-            guest.port = 22;
-          }
-        ];
-        qemu.networkingOptions = [
-          "-device virtio-net-pci,netdev=net0"
-          "-netdev user,id=net0,net=10.0.2.0/24,dhcpstart=10.0.2.15"
-        ];
-      };
-
-      systemd.network.networks."10-ethernet" = lib.mkForce {
-        matchConfig.Name = "ens*";
-        networkConfig = {
-          Address = "10.0.2.15/24";
-          Gateway = "10.0.2.2";
-
-          DNS = "8.8.8.8";
-          DHCP = "no";
-        };
-      };
-    };
-  };
-
   documentation = {
     enable = true;
     doc.enable = false;