diff --git a/core/core-editor.el b/core/core-editor.el
index 126c9bdcc..69d912f56 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -49,7 +49,6 @@
 
 ;; Modes 'n hooks ;;;;;;;;;;;;;;;;;;;
 
-(associate! text-mode           :match "/LICENSE[^/]*$")
 (associate! sh-mode             :match "/\\.?z\\(profile\\|login\\|logout\\|shrc\\|shenv\\)?$")
 (associate! sh-mode             :match "/\\.?zsh/")
 (associate! applescript-mode    :match "\\.applescript$")
diff --git a/core/core.el b/core/core.el
index 0bb3b95b6..016c77284 100644
--- a/core/core.el
+++ b/core/core.el
@@ -175,11 +175,9 @@
   :commands (describe-buffer describe-command describe-file
              describe-keymap describe-option describe-option-of-type))
 
-(use-package server
-  :defer 1
-  :config
-  (unless (server-running-p)
-    (server-start)))
+(require 'server)
+(unless (server-running-p)
+  (server-start))
 
 (add-hook! after-init
   (defadvice save-buffers-kill-emacs (around no-query-kill-emacs activate)