diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 274d2dc..636bcc1 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -143,17 +143,7 @@
 (add-hook 'ielm-mode-hook 'paredit-mode)
 (add-hook 'prog-mode-hook 'goto-address-prog-mode)
 
-(autoload 'mbsync-conf-mode "mbsync-conf-mode"
-  "Major mode for editing mbsync configuration files."
-  :interactive)
-
-(autoload 'msmtprc-mode "msmtprc-mode"
-  "Major mode for editing msmtp configuration files."
-  :interactive)
-
 (add-to-list 'auto-mode-alist '("\\.jsx\\'" . rjsx-mode))
-(add-to-list 'auto-mode-alist '("\\.mbsyncrc\\'" . mbsync-conf-mode))
-(add-to-list 'auto-mode-alist '("\\.msmtprc\\'" . msmtprc-mode))
 (add-to-list 'auto-mode-alist '("\\.targets\\'" . nxml-mode))
 (add-to-list 'auto-mode-alist '("\\.proj\\'" . nxml-mode))
 
diff --git a/emacs/.emacs.d/vendor-lisp/mbsync-conf-mode/mbsync-conf-mode.el b/emacs/.emacs.d/vendor-lisp/mbsync-conf-mode/mbsync-conf-mode.el
deleted file mode 100644
index 3b8c921..0000000
--- a/emacs/.emacs.d/vendor-lisp/mbsync-conf-mode/mbsync-conf-mode.el
+++ /dev/null
@@ -1,85 +0,0 @@
-;;; mbsync-conf-mode.el --- Major mode for editing mbsync configurations  -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2016  Tom Willemse
-
-;; Author: Tom Willemse <chelys@drd>
-;; Keywords:
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This library defines a simplisting major mode for editing .mbsyncrc
-;; files.
-
-;;; Code:
-
-;;;###autoload
-(define-generic-mode mbsync-conf-mode
-  '(?#)
-  '("Path"
-    "MaxSize"
-    "MapInbox"
-    "Flatten"
-    "Trash"
-    "TrashNewOnly"
-    "TrashRemoteNew"
-    "AltMap"
-    "Inbox"
-    "InfoDelimiter"
-    "Host"
-    "Port"
-    "User"
-    "Pass"
-    "PassCmd"
-    "Tunnel"
-    "AuthMechs"
-    "SSLType"
-    "SSLVersions"
-    "SystemCertificates"
-    "CertificateFile"
-    "PipelineDepth"
-    "Account"
-    "UseNamespace"
-    "PathDelimiter"
-    "Master"
-    "Slave"
-    "Pattern"
-    "Patterns"
-    "MaxMessages"
-    "ExpireUnread"
-    "Sync"
-    "Create"
-    "Remove"
-    "Expunge"
-    "CopyArrivalDate"
-    "SyncState"
-    "Channels"
-    "FSync"
-    "FieldDelimiter"
-    "BufferLimit"
-    "SubFolders")
-  `((,(rx (or "MaildirStore" "IMAPAccount" "IMAPStore" "Channel" "Group"))
-     (0 font-lock-keyword-face)
-     (".*" nil nil (0 font-lock-type-face)))
-    (,(rx (or "yes" "no" "None" "STARTTLS" "IMAPS" "SSLv2" "SSLv3" "Pull" "Push"
-              "New" "ReNew" "Delete" "Flags" "All" "Master" "Slave" "Both"
-              "Verbatim" "Maildir++" "Legacy"))
-     . font-lock-constant-face))
-  '("\\.mbsyncrc\\'")
-  nil
-  "A major mode for editing mbsync configuration files.")
-
-(provide 'mbsync-conf-mode)
-;;; mbsync-conf-mode.el ends here
diff --git a/emacs/.emacs.d/vendor-lisp/msmtprc-mode/msmtprc-mode.el b/emacs/.emacs.d/vendor-lisp/msmtprc-mode/msmtprc-mode.el
deleted file mode 100644
index 33649d6..0000000
--- a/emacs/.emacs.d/vendor-lisp/msmtprc-mode/msmtprc-mode.el
+++ /dev/null
@@ -1,50 +0,0 @@
-;;; msmtprc-mode.el --- Major mode for editing msmtp configurations  -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2016  Tom Willemse
-
-;; Author: Tom Willemse <chelys@drd>
-;; Keywords:
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This library defines a simplisting major mode for editing .msmtprc
-;; files.
-
-;;; Code:
-
-;;;###autoload
-(define-generic-mode msmtprc-mode
-  '(?#)
-  '("defaults" "host" "port" "timeout" "proxy_host" "proxy_port" "domain" "auth"
-    "user" "password" "passwordeval" "ntlmdomain" "tls" "tls_starttls"
-    "tls_trust_file" "tls_crl_file" "tls_fingerprint" "tls_key_file"
-    "tls_cert_file" "tls_certcheck" "tls_min_dh_prime_bits" "tls_priorities"
-    "from" "auto_from" "maildomain" "dsn_notify" "dsn_return"
-    "add_missing_from_header" "add_missing_date_header" "remove_bcc_headers"
-    "logfile" "syslog" "aliases")
-  `(("account" (0 font-lock-keyword-face)
-     (".*" nil nil (0 font-lock-type-face)))
-    (,(rx (or "on" "off" "plain" "scram-sha-1" "cram-md5" "digest-md5" "login"
-              "ntlm" "external" "gssapi"))
-     . font-lock-constant-face)
-    ("protocol" (0 font-lock-keyword-face)
-     (,(rx (or "smtp" "lmtp")) nil nil (0 font-lock-constant-face))))
-  '("\\.msmtprc\\'")
-  nil
-  "A major mode for editing mbsync configuration files.")
-
-(provide 'msmtprc-mode)
-;;; msmtprc-mode.el ends here