diff --git a/lisp/server.el b/lisp/server.el
index c263a21a6cf..329010cc950 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1295,10 +1295,6 @@ only these files will be asked to be saved."
   ;; continue standard unloading
   nil)
 
-(add-hook 'kill-emacs-hook (lambda () (server-mode -1))) ;Cleanup upon exit.
-
-(defvar server-unload-function 'server-unload-function)
-
 
 (provide 'server)