diff --git a/.emacs.d/core.el b/.emacs.d/core.el
index 5ca353c..246a302 100644
--- a/.emacs.d/core.el
+++ b/.emacs.d/core.el
@@ -79,21 +79,8 @@
             '(("no_proxy" . "^\\(localhost\\|10.*\\)")
               ("http" . "fwdproxy:8080")
               ("https" . "fwdproxy:8080"))))
-
-  ;; Load cool arcanist stuff.
-  (require '50-arc)
   )
 
-;; =================================================================
-;; Common stuff that's needed once
-;; =================================================================
-(require 'cl)
-(require 'saveplace)
-(require 'ffap)
-(require 'uniquify)
-(require 'ansi-color)
-(require 'recentf)
-(prefer-coding-system 'utf-8)
 
 ;; =================================================================
 ;; Packages
@@ -112,6 +99,21 @@
   (package-refresh-contents))
 (package-install-selected-packages)
 
+
+;; =================================================================
+;; Common stuff that's needed once
+;; =================================================================
+(require 'cl)
+(require 'saveplace)
+(require 'ffap)
+(require 'uniquify)
+(require 'ansi-color)
+(require 'recentf)
+(when is-fb-environment
+  (require '50-arc))
+
+(prefer-coding-system 'utf-8)
+
 ;; =================================================================
 ;; EMACS general look and feel
 ;; =================================================================
diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el
index 9fcdf3d..6e1b6db 100644
--- a/.emacs.d/custom.el
+++ b/.emacs.d/custom.el
@@ -50,7 +50,7 @@
      ("melpa" . "http://stable.melpa.org/packages/"))))
  '(package-selected-packages
    (quote
-    (projectile dash cider clojure-mode graphviz-dot-mode multi-term xterm-color thrift markdown-mode tuareg merlin ag use-package flycheck dockerfile-mode js2-mode web-mode ahg zencoding-mode tss switch-window python-mode paredit monky magit lua-mode go-mode go-autocomplete exec-path-from-shell csharp-mode color-theme-solarized color-theme-monokai auto-complete auto-complete-nxml flymake flyspell json-mode popup ruby-mode)))
+    (s projectile dash cider clojure-mode graphviz-dot-mode multi-term xterm-color thrift markdown-mode tuareg merlin ag use-package flycheck dockerfile-mode js2-mode web-mode ahg zencoding-mode tss switch-window python-mode paredit monky magit lua-mode go-mode go-autocomplete exec-path-from-shell csharp-mode color-theme-solarized color-theme-monokai auto-complete auto-complete-nxml flymake flyspell json-mode popup ruby-mode)))
  '(reb-re-syntax (quote string))
  '(rmail-mail-new-frame t)
  '(safe-local-variable-values