diff --git a/bootstrap.el b/bootstrap.el
index 20cff4c27..461b8ef5b 100644
--- a/bootstrap.el
+++ b/bootstrap.el
@@ -1,10 +1,8 @@
 ;;; bootstrap.el
 
-(eval-when-compile (require 'cl-lib))
-
-;; Shut up byte-compiler!
-(defvar narf-current-theme)
-(defvar narf-current-font)
+(eval-when-compile
+  (defconst emacs-start-time (current-time))
+  (require 'cl-lib))
 
 ;; Global constants
 (eval-and-compile
@@ -45,6 +43,10 @@
 ;; Bootstrap
 ;;
 
+;; Shut up byte-compiler!
+(defvar narf-current-theme)
+(defvar narf-current-font)
+
 (defun narf (packages)
   "Bootstrap NARF emacs and initialize PACKAGES"
   (setq-default gc-cons-threshold 4388608
diff --git a/init.el b/init.el
index f05087c67..d5893145e 100644
--- a/init.el
+++ b/init.el
@@ -40,16 +40,12 @@
 ;;
 ;;; License: MIT
 
-(defconst emacs-start-time (current-time))
 (load (concat user-emacs-directory "bootstrap.el"))
 ;;
 
 (defconst narf-default-theme 'narf-dark)
 (defconst narf-default-font (font-spec :family "Hack" :size 12))
 
-(setq user-full-name "Henrik Lissner"
-      user-mail-address "henrik@lissner.net")
-
 (narf `(core ; core/core.el
 
         ;; OS-specific config