diff --git a/private_dot_ssh/config.tmpl b/private_dot_ssh/config.tmpl
index cb007a5..6c791f6 100644
--- a/private_dot_ssh/config.tmpl
+++ b/private_dot_ssh/config.tmpl
@@ -5,13 +5,21 @@ Host ubuntu
     Hostname 192.168.0.6
     User gaugendre
     ForwardAgent yes
-    Port 38303
     ControlMaster auto
     ControlPath ~/.ssh/control-%C
     ControlPersist 4h
     RequestTTY yes
     RemoteCommand tmux -CC new -A -s tmssh
 
+Host ubuntu-no-tmux
+    Hostname 192.168.0.6
+    User gaugendre
+    ForwardAgent yes
+    ControlMaster auto
+    ControlPath ~/.ssh/control-%C
+    ControlPersist 4h
+    RequestTTY yes
+
 Host hass
     Hostname 192.168.0.9
     User hassio
@@ -21,21 +29,6 @@ Host robospierre
     Hostname 192.168.0.97
     User root
 
-Host raspiwifi display hass-display
-    Hostname 192.168.0.7
-    User pi
-    Port 8121
-
-#Host raspi
-#    Hostname 192.168.0.8
-#    User pi
-#    Port 8121
-
-Host octopi printer
-    Hostname 192.168.0.10
-    User gaugendre
-    ForwardAgent yes
-
 Host hyperhdr
     Hostname hyperhdr.local
     User pi