diff --git a/Makefile b/Makefile
index 80a25bb..64562d5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 FILES = bashrc bash_profile vimrc zshrc gitconfig screenrc commonshrc \
 	neomuttrc pentadactylrc mailcap latexmkrc ctags \
-	i3/config i3status.conf config/dunst/dunstrc msmtprc spacemacs emacs.d mbsyncrc authinfo \
+	i3/config i3status.conf config/dunst/dunstrc spacemacs emacs.d \
 	config/qutebrowser config/nvim/init.vim config/nvim/ginit.vim config/nvim/lua ideavimrc \
-	config/khal config/vdirsyncer/config config/khard \
+	config/khal config/khard \
 	config/rofi config/rofi-pass gdbinit notmuch-config \
 	tridactylrc config/sway/config config/mpv/mpv.conf \
 	config/wofi config/waybar \
diff --git a/authinfo.m4 b/authinfo.m4
deleted file mode 100644
index 2827b30..0000000
--- a/authinfo.m4
+++ /dev/null
@@ -1 +0,0 @@
-machine mail.gebner.org login gebner password  esyscmd(`pass 2b7e.org/mail.gebner.org | head -n1')
diff --git a/config/vdirsyncer/config.m4 b/config/vdirsyncer/config.m4
deleted file mode 100644
index d6f726b..0000000
--- a/config/vdirsyncer/config.m4
+++ /dev/null
@@ -1,38 +0,0 @@
-[general]
-status_path = "~/.vdirsyncer/status/"
-
-[pair calendars]
-a = "calendars_local"
-b = "calendars_remote"
-conflict_resolution = "b wins"
-collections = ["from b"]
-
-metadata = ["color"]
-
-[storage calendars_local]
-type = "filesystem"
-path = "~/.calendars/"
-fileext = ".ics"
-
-[storage calendars_remote]
-type = "caldav"
-url = "https://radicale.gebner.org/gebner/"
-username = "gebner"
-password = "esyscmd(`echo -n $(pass 2b7e.org/mail.gebner.org | head -n1)')"
-
-[pair contacts]
-a = "contacts_local"
-b = "contacts_remote"
-conflict_resolution = "b wins"
-collections = ["from b"]
-
-[storage contacts_local]
-type = "filesystem"
-path = "~/.contacts/"
-fileext = ".vcf"
-
-[storage contacts_remote]
-type = "carddav"
-url = "https://radicale.gebner.org/gebner/"
-username = "gebner"
-password = "esyscmd(`echo -n $(pass 2b7e.org/mail.gebner.org | head -n1)')"
diff --git a/mbsyncrc.m4 b/mbsyncrc.m4
deleted file mode 100644
index 716040d..0000000
--- a/mbsyncrc.m4
+++ /dev/null
@@ -1,21 +0,0 @@
-IMAPAccount gebner_org
-Host mail.gebner.org
-User gebner
-SSLType IMAPS
-SSLVersions TLSv1.2
-CertificateFile /etc/ssl/certs/ca-certificates.crt
-Pass esyscmd(`pass 2b7e.org/mail.gebner.org | head -n1')
-
-IMAPStore gebner_org-remote
-Account gebner_org
-
-MaildirStore local
-Path ~/Maildir/
-SubFolders Verbatim
-
-Channel ge
-Master :gebner_org-remote:
-Slave :local:
-Pattern *
-Create Both
-Expunge Both
diff --git a/msmtprc.m4 b/msmtprc.m4
deleted file mode 100644
index 49a0297..0000000
--- a/msmtprc.m4
+++ /dev/null
@@ -1,14 +0,0 @@
-defaults
-tls on
-logfile ~/.msmtp.log
-
-account gebner.org
-tls_trust_file /etc/ssl/certs/ca-certificates.crt
-host mail.gebner.org
-port 587
-#from gebner@gebner.org
-auth on
-user gebner
-password esyscmd(`pass 2b7e.org/mail.gebner.org | head -n1')
-
-account default : gebner.org