diff --git a/.gitmodules b/.gitmodules
index 6abc6d0..b2d88b9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -49,9 +49,6 @@
 [submodule "site-lisp/embark"]
 	path = site-lisp/embark
 	url = https://github.com/oantolin/embark.git
-[submodule "site-lisp/corfu-doc"]
-	path = site-lisp/corfu-doc
-	url = https://github.com/galeo/corfu-doc.git
 [submodule "site-lisp/awesome-pair"]
 	path = site-lisp/awesome-pair
 	url = https://github.com/manateelazycat/awesome-pair.git
@@ -172,9 +169,6 @@
 [submodule "site-lisp/emacs-popon"]
 	path = site-lisp/emacs-popon
 	url = https://codeberg.org/akib/emacs-popon.git
-[submodule "site-lisp/emacs-corfu-doc-terminal"]
-	path = site-lisp/emacs-corfu-doc-terminal
-	url = https://codeberg.org/akib/emacs-corfu-doc-terminal.git
 [submodule "site-lisp/eslint"]
 	path = site-lisp/eslint
 	url = https://github.com/zedhugh/eslint.el.git
diff --git a/lisp/init-vertico.el b/lisp/init-vertico.el
index 9db1291..0045144 100644
--- a/lisp/init-vertico.el
+++ b/lisp/init-vertico.el
@@ -5,12 +5,10 @@
 (add-pkg-in-pkg-dir "vertico")
 (add-pkg-in-pkg-dir "corfu")
 (add-pkg-in-pkg-dir "orderless")
-(add-pkg-in-pkg-dir "corfu-doc")
 (add-pkg-in-pkg-dir "cape")
 (add-pkg-in-pkg-dir "consult")
 (add-pkg-in-pkg-dir "emacs-corfu-terminal")
 (add-pkg-in-pkg-dir "emacs-popon")
-(add-pkg-in-pkg-dir "emacs-corfu-doc-terminal")
 (add-pkg-in-pkg-dir "embark")
 
 
@@ -39,9 +37,6 @@
 (setq completion-styles '(orderless basic partial-completion flex)
       completion-category-overrides '((file (styles basic partial-completion))))
 
-(require 'corfu-doc)
-(add-hook 'corfu-mode-hook #'corfu-doc-mode)
-
 
 ;;; indexed extension
 (let ((start 1)
@@ -98,17 +93,13 @@
 (with-eval-after-load 'consult
   (recentf-mode 1))
 
+(require 'corfu-popupinfo)
+(corfu-popupinfo-mode 1)
 
 (defun creature/load-corfu-terminal-in-no-gui-env ()
-  (if (or (display-graphic-p) (featurep 'tty-child-frames))
-      (progn
-        (require 'corfu-popupinfo)
-        (corfu-popupinfo-mode 1))
-    (progn
-      (require 'corfu-terminal)
-      (require 'corfu-doc-terminal)
-      (corfu-terminal-mode 1)
-      (corfu-doc-terminal-mode 1))))
+  (unless (or (display-graphic-p) (featurep 'tty-child-frames))
+    (require 'corfu-terminal)
+    (corfu-terminal-mode 1)))
 
 (add-hook 'emacs-startup-hook #'creature/load-corfu-terminal-in-no-gui-env)
 (add-hook 'server-after-make-frame-hook #'creature/load-corfu-terminal-in-no-gui-env)
diff --git a/site-lisp/corfu-doc b/site-lisp/corfu-doc
deleted file mode 160000
index 0e6125c..0000000
--- a/site-lisp/corfu-doc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0e6125cd042506a048feb7b6446a5653eccfcff5
diff --git a/site-lisp/emacs-corfu-doc-terminal b/site-lisp/emacs-corfu-doc-terminal
deleted file mode 160000
index da50420..0000000
--- a/site-lisp/emacs-corfu-doc-terminal
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit da5042082d2296946972599f6d95bbbffaf63fba