diff --git a/hosts/_retired/Haven/default.nix b/hosts/_retired/Haven/default.nix
index dfc06fe..c2d2b12 100644
--- a/hosts/_retired/Haven/default.nix
+++ b/hosts/_retired/Haven/default.nix
@@ -160,8 +160,6 @@ in
     };
   };
 
-  # TODO: VPN (Check out Wireguard)
-
   # Allow Haven to be a build target for other architectures (mainly ARM64)
   boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
 }
diff --git a/modules/ui/desktops/gnome.nix b/modules/ui/desktops/gnome.nix
index 060659c..caec922 100644
--- a/modules/ui/desktops/gnome.nix
+++ b/modules/ui/desktops/gnome.nix
@@ -90,9 +90,6 @@ in
         gnomeExtensions.appindicator
         gnomeExtensions.dash-to-panel
         gnomeExtensions.forge
-        # FIXME: These two extensions are incompatible with the repo's gnome version
-        #gnomeExtensions.another-window-session-manager
-        #gnomeExtensions.random-wallpaper
         # Themeing
         gnome.gnome-themes-extra
         papirus-icon-theme
diff --git a/modules/users/common/dash-to-panel-settings b/modules/users/common/dash-to-panel-settings
deleted file mode 100644
index 5feab98..0000000
--- a/modules/users/common/dash-to-panel-settings
+++ /dev/null
@@ -1,19 +0,0 @@
-#[/org/gnome/shell/extensions/dash-to-panel/]
-[/]
-animate-appicon-hover=false
-animate-appicon-hover-animation-extent={'RIPPLE': 4, 'PLANK': 4, 'SIMPLE': 1}
-appicon-margin=8
-appicon-padding=8
-available-monitors=[0]
-dot-position='BOTTOM'
-hotkeys-overlay-combo='TEMPORARILY'
-leftbox-padding=-1
-panel-anchors='{"0":"MIDDLE"}'
-panel-element-positions='{"0":[{"element":"dateMenu","visible":true,"position":"stackedTL"},{"element":"activitiesButton","visible":true,"position":"stackedTL"},{"element":"showAppsButton","visible":true,"position":"centerMonitor"},{"element":"leftBox","visible":false,"position":"stackedTL"},{"element":"taskbar","visible":true,"position":"centerMonitor"},{"element":"centerBox","visible":false,"position":"stackedBR"},{"element":"rightBox","visible":false,"position":"stackedBR"},{"element":"systemMenu","visible":true,"position":"stackedBR"},{"element":"desktopButton","visible":false,"position":"stackedBR"}]}'
-panel-lengths='{"0":100}'
-panel-positions='{"0":"TOP"}'
-panel-sizes='{"0":64}'
-primary-monitor=0
-status-icon-padding=-1
-tray-padding=-1
-window-preview-title-position='TOP'
diff --git a/modules/users/common/home-manager/gnome.nix b/modules/users/common/home-manager/gnome.nix
index 5160c82..387252b 100644
--- a/modules/users/common/home-manager/gnome.nix
+++ b/modules/users/common/home-manager/gnome.nix
@@ -58,78 +58,5 @@
     "org/gnome/shell" = {
       disable-user-extensions = false;
     };
-
-    /*
-      			FIXME: Still needs work
-      		"org/gnome/shell/extensions/dash-to-panel" = {
-      			animate-appicon-hover = false;
-      			animate-appicon-hover-animation-extent = {
-      				RIPPLE = 4;
-      				PLANK = 4;
-      				SIMPLE = 1;
-      			};
-      			appicon-margin = 8;
-      			appicon-padding = 8;
-      			available-monitors= [0];
-      			dot-position = "BOTTOM";
-      			hotkeys-overlay-combo= "TEMPORARILY";
-      			leftbox-padding = -1;
-      			panel-anchors = {"0" = "MIDDLE"; };
-      			panel-element-positions={
-      				"0" = [{
-      					"element" = "dateMenu";
-      					"visible" = true;
-      					"position" = "stackedTL";
-      				}
-      				{
-      					"element" = "activitiesButton";
-      					"visible" = true;
-      					"position" = "stackedTL";
-      				}
-      				{
-      					"element" = "showAppsButton";
-      					"visible" = true;
-      					"position" = "centerMonitor";
-      				}
-      				{
-      					"element" = "leftBox";
-      					"visible" = false;
-      					"position" = "stackedTL";
-      				}
-      				{
-      					"element" = "taskbar";
-      					"visible" = true;
-      					"position" = "centerMonitor";
-      				}
-      				{
-      					"element" = "centerBox";
-      					"visible" = false;
-      					"position" = "stackedBR";
-      				}
-      				{
-      					"element" = "rightBox";
-      					"visible" = false;
-      					"position" = "stackedBR";
-      				}
-      				{
-      					"element" = "systemMenu";
-      					"visible" = true;
-      					"position"= "stackedBR";
-      				}
-      				{
-      					"element" = "desktopButton";
-      					"visible" = false;
-      					"position" = "stackedBR";
-      				}];
-      			};
-      			panel-lengths = { "0" = 100; };
-      			panel-positions = { "0" = "TOP"; };
-      			panel-sizes = { "0" = 64; };
-      			primary-monitor = 0;
-      			status-icon-padding = -1;
-      			tray-padding = -1;
-      			window-preview-title-position = "TOP";
-      		};
-    */
   };
 }