diff --git a/modules/base/emacs/base-init.el b/modules/base/emacs/base-init.el
index a25b7e76..b9a611a2 100644
--- a/modules/base/emacs/base-init.el
+++ b/modules/base/emacs/base-init.el
@@ -112,7 +112,7 @@
   (global-corfu-mode)
   )
 
-;; Prescient in company
+;; Prescient in corfu
 (use-package corfu-prescient
   :after (corfu prescient)
   :config (corfu-prescient-mode 1)
@@ -210,13 +210,6 @@
   :custom
   (completion-styles '(orderless basic) "Use orderless for filtering")
   (orderless-matching-styles '(orderless-regexp orderless-initialism orderless-prefixes) "More matching styles for more flexible matching.")
-  :config
-  ;; Highlight multiple parts in company matches
-  (defun just-one-face (fn &rest args)
-    (let ((orderless-match-faces [completions-common-part]))
-      (apply fn args)))
-
-  (advice-add 'company-capf--candidates :around #'just-one-face)
   )
 
 ;; Org
diff --git a/modules/development/default.nix b/modules/development/default.nix
index 86175121..376abd19 100644
--- a/modules/development/default.nix
+++ b/modules/development/default.nix
@@ -44,10 +44,6 @@
               "SPC n" '(flymake-goto-next-error :which-key "Next error")
               "SPC p" '(flymake-goto-prev-error :which-key "Previous error")
               )
-             :config
-             ;;; eglot replaces company-backends with '(company-capf). I still
-             ;;; want company-yasnippet as well though
-             (add-to-list 'eglot-stay-out-of "company")
             )
 
           ;; Snippets