diff --git a/.emacs.d b/.emacs.d
deleted file mode 160000
index 75cd634..0000000
--- a/.emacs.d
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 75cd6348b696cc5ac96f1cd601d2c56dee5d17f0
diff --git a/.gitmodules b/.gitmodules
index 0050d19..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule ".emacs.d"]
-	path = .emacs.d
-	url = https://schlomp.space/tastytea/.emacs.d.git
diff --git a/.local/bin/setup_dotfiles.sh b/.local/bin/setup_dotfiles.sh
index c6dbbca..a0b7821 100755
--- a/.local/bin/setup_dotfiles.sh
+++ b/.local/bin/setup_dotfiles.sh
@@ -17,14 +17,8 @@ alias config=${tmp_git_command}
 
 git clone --bare ${repo_address} ${HOME}/.dotfiles
 config config --local status.showUntrackedFiles no
-config config --local submodule.recurse true
 
 print -P "%F{12}Run%f" \
       "%F{13}rm ${0} &&" \
       "${tmp_git_command} checkout &&" \
-      "${tmp_git_command} submodule update --init%f" \
       "%F{12}to copy the files to your home directory.%f"
-
-# TODO: [remote "origin"] needs to have
-#       fetch = +refs/heads/*:refs/remotes/origin/* in order for
-#       submodule.recurse to work, but why?
diff --git a/.local/share/applications/emacsclient-cn.desktop b/.local/share/applications/emacsclient-cn.desktop
deleted file mode 100644
index f93360b..0000000
--- a/.local/share/applications/emacsclient-cn.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=Emacsclient (create frame)
-Comment=Tell a running Emacs to create a frame
-Comment[de]=In einer laufenden Emacs-Instanz einen frame öffnen
-Icon=emacs
-TryExec=/usr/bin/emacsclient
-Exec=/usr/bin/emacsclient -cn -a=/bin/false %F
-Terminal=false