diff --git a/.config/chemacs/profile b/.config/chemacs/profile
deleted file mode 100644
index bfdd489..0000000
--- a/.config/chemacs/profile
+++ /dev/null
@@ -1 +0,0 @@
-vanilla
diff --git a/.config/chemacs/profiles.el b/.config/chemacs/profiles.el
deleted file mode 100644
index 4b12acd..0000000
--- a/.config/chemacs/profiles.el
+++ /dev/null
@@ -1,2 +0,0 @@
-(("spacemacs" . ((user-emacs-directory . "~/.emacs.spacemacs")))
- ("vanilla"   . ((user-emacs-directory . "~/.emacs.vanilla"))))
diff --git a/.emacs.d b/.emacs.d
deleted file mode 160000
index ef82118..0000000
--- a/.emacs.d
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ef82118824fac2b2363d3171d26acbabe1738326
diff --git a/.emacs.vanilla/eshell-alias b/.emacs.d/eshell-alias
similarity index 100%
rename from .emacs.vanilla/eshell-alias
rename to .emacs.d/eshell-alias
diff --git a/.emacs.spacemacs b/.emacs.spacemacs
deleted file mode 160000
index 5c88c3b..0000000
--- a/.emacs.spacemacs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5c88c3b089c132997bf9f571a0207d93739efef1
diff --git a/.gitmodules b/.gitmodules
index 09ebfa1..f3ccc9a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,3 @@
 [submodule ".config/tmux"]
         path = .config/tmux
         url = git@github.com:gpakosz/.tmux.git
-[submodule ".emacs.d"]
-        path = .emacs.d
-        url = git@github.com:plexus/chemacs2.git
-[submodule ".emacs.spacemacs"]
-        path = .emacs.spacemacs
-        url = git@github.com:syl20bnr/spacemacs.git
diff --git a/org/config/emacs.org b/org/config/emacs.org
index 46dafbf..b240dc1 100644
--- a/org/config/emacs.org
+++ b/org/config/emacs.org
@@ -5,7 +5,7 @@
 #+html_head: <meta property="og:title" content="Phundrak’s Emacs Configuration" />
 #+html_head: <meta property="og:description" content="Phundrak’s Emacs Configuration Detailed" />
 #+property: header-args:emacs-lisp  :mkdirp yes :lexical t :exports code
-#+property: header-args:emacs-lisp+ :tangle ~/.emacs.vanilla/init.el
+#+property: header-args:emacs-lisp+ :tangle ~/.emacs.d/init.el
 #+property: header-args:emacs-lisp+ :mkdirp yes :noweb no-export
 
 * Introduction
@@ -41,7 +41,7 @@ Emacs. This is where I put some options in order to disable as quickly
 as possible some built-in features of Emacs before they can be even
 loaded, speeding Emacs up a bit.
 #+headers: :exports code :results silent :lexical t
-#+begin_src emacs-lisp :mkdirp yes :tangle ~/.emacs.vanilla/early-init.el
+#+begin_src emacs-lisp :mkdirp yes :tangle ~/.emacs.d/early-init.el
 (setq package-enable-at-startup nil
       inhibit-startup-message   t
       frame-resize-pixelwise    t  ; fine resize