diff --git a/core/core-workgroups.el b/core/core-workgroups.el
index 372b7860b..4a4c2bab3 100644
--- a/core/core-workgroups.el
+++ b/core/core-workgroups.el
@@ -46,9 +46,6 @@ automatically renamed to the project name.")
 
   (add-hook 'emacs-startup-hook 'workgroups-mode)
   :config
-  (unless (file-exists-p wg-workgroup-directory)
-    (mkdir wg-workgroup-directory))
-
   ;; Remember fixed workgroup names between sessions
   (push 'narf-wg-names savehist-additional-variables)
 
diff --git a/core/core.el b/core/core.el
index e3ebce211..cc8fe2605 100644
--- a/core/core.el
+++ b/core/core.el
@@ -143,24 +143,14 @@ folder is the root of a project or not.")
 ;;
 
 (require 'f)
+(autoload 'use-package "use-package" "" nil 'macro)
 (autoload 'awhen "anaphora" "" nil 'macro)
 (autoload 'aif "anaphora" "" nil 'macro)
-(autoload 'use-package "use-package" "" nil 'macro)
 (unless (require 'autoloads nil t)
   (load (concat narf-emacs-dir "/scripts/generate-autoloads.el"))
   (require 'autoloads))
 (require 'core-defuns)
 
-(eval-when-compile
-  (setq use-package-verbose nil)
-
-  ;; Make any folders needed
-  (mapc (lambda (dir)
-          (let ((path (concat narf-temp-dir dir)))
-            (unless (file-exists-p path)
-              (make-directory path t))))
-        '("" "/undo" "/backup")))
-
 (use-package persistent-soft
   :commands (persistent-soft-store
              persistent-soft-fetch