diff --git a/.chezmoiremove b/.chezmoiremove
new file mode 100644
index 0000000..538b097
--- /dev/null
+++ b/.chezmoiremove
@@ -0,0 +1 @@
+.config/fish/functions/vpnmt.fish
diff --git a/dot_config/fish/private_config.fish.tmpl b/dot_config/fish/private_config.fish.tmpl
index ad587c2..a693c5d 100644
--- a/dot_config/fish/private_config.fish.tmpl
+++ b/dot_config/fish/private_config.fish.tmpl
@@ -9,12 +9,9 @@ set -gx HOMEBREW_BINTRAY_KEY {{ (bitwardenFields "item" "Bintray").fish_key.valu
 set -gx GOPATH $HOME/Projects/golang
 set -gx LANG en_US.UTF-8
 #set -gx KUBECONFIG $HOME/.kube/config-njj.yml:$HOME/.kube/config-ber.yml
-# Also: $HOME/.kube/config-mt.yml:$HOME/.kube/config-itsf-test.yml
 set -gx BAT_THEME "Solarized (dark)"
 set -gx SCW_SECRET_TOKEN {{ (bitwardenFields "item" "console.scaleway.com").fish_secret_token.value | quote }}
 set -gx SCW_ACCESS_KEY {{ (bitwardenFields "item" "console.scaleway.com").fish_access_key.value | quote }}
-set -gx GITLAB_TOKEN {{ (bitwardenFields "item" "Gitlab ITSF").fish_token.value | quote }}
-set -gx GITLAB_URL "https://git.itsf.io"
 set -gx GITLABBER_FOLDER_NAMING path
 set -gx GITLABBER_CLONE_METHOD ssh
 set -gx GITLABBER_GIT_CONCURRENCY 10
diff --git a/dot_config/fish/private_functions/private_vpnmt.fish b/dot_config/fish/private_functions/private_vpnmt.fish
deleted file mode 100644
index 5aa7f98..0000000
--- a/dot_config/fish/private_functions/private_vpnmt.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function vpnmt
-sudo openfortivpn -c ~/.config/openfortivpn/itsf-mt.conf
-end
diff --git a/private_dot_gitconfig.tmpl b/private_dot_gitconfig.tmpl
index 168617e..333d531 100644
--- a/private_dot_gitconfig.tmpl
+++ b/private_dot_gitconfig.tmpl
@@ -70,8 +70,8 @@
     defaultBranch = master
 [advice]
     detachedHead = false
-[includeIf "gitdir:~/Projects/itsf/**"]
-    path = {{ .chezmoi.homeDir }}/Projects/itsf/.gitconfig
+[includeIf "gitdir:~/Projects/gw/**"]
+    path = {{ .chezmoi.homeDir }}/Projects/gw/.gitconfig
 [filter "lfs"]
 	clean = git-lfs clean -- %f
 	smudge = git-lfs smudge -- %f
diff --git a/private_dot_ssh/config b/private_dot_ssh/config
index 74e67f2..152bad7 100644
--- a/private_dot_ssh/config
+++ b/private_dot_ssh/config
@@ -35,46 +35,6 @@ Host hyperhdr
     hostname hyperhdr.local
     user pi
 
-# ITSF
-Host dbprod
-    hostname vlb-itsfpgsql-p01.prod.lan
-    user postgres
-
-Host dbstg
-    hostname vlb-itsfpgsql-s01.prod.lan
-    user postgres
-
-Host perfcore
-    hostname 10.195.46.19
-    user nadmin
-
-Host gitlab.prod.lan
-    Hostname 10.195.6.208
-
-Host git-it.salt.ch
-    User sp_gaugendr
-
-Host logssit
-    Hostname 10.193.12.22
-    User sp_gaugendr
-    #RequestTTY yes
-    #RemoteCommand sudo su - logreader
-
-Host logsprod
-    Hostname 10.192.12.22
-    User sp_gaugendr
-    RequestTTY yes
-    #RemoteCommand sudo su - logreader
-
-Host proxmox-*.itsf.io
-    port 22
-    user gaugendre
-
-Host *.itsf.io
-    port 4222
-    PubkeyAcceptedKeyTypes +ssh-rsa
-    user gaugendre
-
 Host *
     AddKeysToAgent yes
     UseKeychain yes