diff --git a/flake.nix b/flake.nix
index cf0d990..5491261 100644
--- a/flake.nix
+++ b/flake.nix
@@ -58,7 +58,7 @@
          ./modules/defaults/virtualization/docker.nix
          ./modules/defaults/virtualization/kvm.nix
 	 ./modules/defaults/security.nix
-	 ./modules/defaults/yubikey.nix
+	 #./modules/defaults/yubikey.nix
 	 ];
       };
     };
diff --git a/modules/defaults/base.nix b/modules/defaults/base.nix
index a8bfc26..46d45f0 100644
--- a/modules/defaults/base.nix
+++ b/modules/defaults/base.nix
@@ -6,7 +6,7 @@
     nix-index
     vim tmux
     vimPlugins.vim-markdown-toc
-    python3.13-markitdown-unstable
+    python313Packages.markitdown 
     wget curl
     htop atop iotop iftop
     file bc
diff --git a/modules/defaults/home-manager/base.nix b/modules/defaults/home-manager/base.nix
index 87c0445..bb85173 100644
--- a/modules/defaults/home-manager/base.nix
+++ b/modules/defaults/home-manager/base.nix
@@ -2,13 +2,10 @@
 {
   home.packages = with pkgs; [
     networkmanagerapplet
-
     unzip
     bat #silver-searcher
     jq
-
     libfaketime
-
     dmenu  ## required by clipmenu
   ];
 
diff --git a/modules/defaults/networking.nix b/modules/defaults/networking.nix
index 96388ff..e9e2c76 100644
--- a/modules/defaults/networking.nix
+++ b/modules/defaults/networking.nix
@@ -14,10 +14,6 @@
   networking.interfaces.eth0.useDHCP = true;
   networking.interfaces.wlan0.useDHCP = true;
   
-  # services.openvpn.servers = {
-  #   officeVPN  = { config = '' config /root/nixos/openvpn/officeVPN.conf ''; };
-  # };
-
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];
diff --git a/modules/defaults/users.nix b/modules/defaults/users.nix
index b2a9fdf..2d38d15 100644
--- a/modules/defaults/users.nix
+++ b/modules/defaults/users.nix
@@ -34,22 +34,17 @@
 	fzf
 	imagemagick
 	gcc
-	calyx-vpn
-	riseup-vpn
 	ungoogled-chromium
 	kopia
 	smplayer
 	libsForQt5.kate
 	usbutils
-	openvpn 
 	appflowy
 	libsForQt5.krfb
 	libsForQt5.xdg-desktop-portal-kde
 	vscodium
 	python311Packages.wled
 	python311Packages.pip
-	yubioath-flutter
-	#ripgrep
 	authenticator
 	ollama
 	gpt4all
@@ -64,11 +59,9 @@
       home.stateVersion = "21.11";
       imports = [
         ./home-manager/base.nix
-  
         ./home-manager/office.nix
         ./home-manager/multimedia.nix
         ./home-manager/nextcloud.nix
-  
         ./home-manager/admin.nix
         ./home-manager/dev/base.nix
         # ./home-manager/dev/nvim-coc.nix