diff --git a/bash/bash_aliases b/bash/bash_aliases
index d6b4fc0cc..e45905a8f 100644
--- a/bash/bash_aliases
+++ b/bash/bash_aliases
@@ -41,3 +41,6 @@ alias python="python3"
 
 # Backlight control
 alias blc="${HOME}/scripts/thinkpad/blc.pl --notify"
+
+# Flatpaks
+alias mpv="flatpak run io.mpv.Mpv"
diff --git a/bash/bash_logout b/bash/bash_logout
index 2c17d6540..0436eeb60 100644
--- a/bash/bash_logout
+++ b/bash/bash_logout
@@ -1,7 +1,10 @@
 # vim: ft=sh
 
-# Remove static SSH Agent
-rm SSH_AUTH_SOCK
+if [ $SSH_TTY ]; then
+	# Remove socket files
+	rm SSH_AUTH_SOCK
+	rm SWAYSOCK
+fi
 
 # when leaving the console clear the screen to increase privacy
 if [ "$SHLVL" = 1 ]; then
diff --git a/sway/sway-displays.json b/sway/sway-displays.json
deleted file mode 100644
index 24017fb3a..000000000
--- a/sway/sway-displays.json
+++ /dev/null
@@ -1,92 +0,0 @@
-[
-"outputs":{
-        "DENON-AVAMP":"TV",
-        "Paperlike253":"eInk",
-        "0x4140":"yoga"
-},
-"layouts":{
-        "TV":{
-                "TV":{
-                        "enable":1,
-                        "width":3840,
-                        "height":2160,
-                        "x":0,
-                        "y":0,
-                        "rotate":0,
-                        "scale":1.333333,
-                        "waybar":".dotfiles/waybar/main.template",
-                        "fallback":"#010101"
-                },
-                "eInk":{
-                        "enable":0
-                },
-                "laptop":{
-                        "enable":0
-                }
-        },
-        "eInk":{
-                "TV":{
-                        "enable":0
-                },
-                "eInk":{
-                        "enable":1,
-                        "width":3200,
-                        "height":1800,
-                        "x":0,
-                        "y":0,
-                        "scale":1.5,
-                        "rotate":90,
-                        "waybar":".dotfiles/waybar/main.template",
-                        "fallback":"#010101"
-                },
-                "laptop":{
-                        "enable":0
-                }
-        },
-        "laptop":{
-                "TV":{
-                        "enable":0
-                },
-                "eInk":{
-                        "enable":0
-                },
-                "yoga":{
-                        "enable":1,
-                        "width":2560,
-                        "height":1440,
-                        "x":0,
-                        "y":0,
-                        "rotate":0,
-                        "scale":1.333333,
-                        "waybar":".dotfiles/waybar/main.template",
-                        "fallback":"#010101"
-                },
-        "Both":{
-                "TV":{
-                        "enable":1,
-                        "width":3840,
-                        "height":2160,
-                        "x":900,
-                        "y":10,
-                        "rotate":0,
-                        "scale":1.333333,
-                        "waybar":".dotfiles/waybar/main.template",
-                        "fallback":"#010101"
-                },
-                "eInk":{
-                        "enable":1,
-                        "width":3200,
-                        "height":1800,
-                        "x":0,
-                        "y":0,
-                        "scale":2,
-                        "rotate":90,
-                        "waybar":".dotfiles/waybar/side.template",
-                        "fallback":"#010101"
-                },
-                "laptop":{
-                        "enable":0
-                }
-        }
-}
-]