diff --git a/Cask b/Cask
index b685c95a9..2b40a5adb 100644
--- a/Cask
+++ b/Cask
@@ -1,10 +1,10 @@
 ; (source "melpa", "https://melpa.org/packages/")
-(source "marmalade" "https://marmalade-repo.org/packages/")
+; (source "marmalade" "https://marmalade-repo.org/packages/")
 ; (source "org", "http://orgmode.org/elpa/")
 ; (source "gnu", "https://elpa.gnu.org")
 
 (source melpa)
-; (source marmalade)
+(source marmalade)
 (source org)
 (source gnu)
 
@@ -64,7 +64,6 @@
 (depends-on "rotate-text" :git "https://github.com/debug-ito/rotate-text.el")
 (depends-on "smart-forward")
 (depends-on "smartparens")
-(depends-on "guide-key")
 
 ;; Completion --- core/core-company.el
 (depends-on "company")
@@ -91,7 +90,6 @@
 (depends-on "git-gutter-fringe")
 (depends-on "gitconfig-mode")
 (depends-on "gitignore-mode")
-(depends-on "github-browse-file")
 (depends-on "browse-at-remote")
 
 ;; Helm -- core/core-helm.el
diff --git a/Makefile b/Makefile
index ac5cf894f..b32cb12de 100644
--- a/Makefile
+++ b/Makefile
@@ -5,18 +5,23 @@ all: update
 update: autoloads
 	@echo "Updating repo"
 	@git pull 2>&1 | sed 's/^/  /'
-	@cask install --verbose 2>&1 | sed 's/^/  /'
 	@echo "Updating outdated plugins"
+	@cask install --verbose 2>&1 | sed 's/^/  /'
 	@cask update --verbose 2>&1 | sed 's/^/  /'
 	@echo "Compiling certain scripts"
-	@emacs -Q --batch -f batch-byte-compile init-load-path.el core/core.el core/core-os-osx.el contrib/*.el 2>&1 | sed 's/^/  /'
+	@emacs -Q --batch -f batch-byte-compile init-packages.el core/core.el core/core-os-osx.el contrib/*.el 2>&1 | sed 's/^/  /'
 
-clean:
-	@echo "Cleaning *.elc and derelict emacs files"
-	@rm -f *.elc {core,modules,private,contrib}/*.elc {core,modules}/lib/*.elc
+clean: clean-files clean-elc
+
+clean-files:
+	@echo "Cleaning derelict emacs files"
 	@rm -rf auto-save-list recentf places ido.last async-bytecomp.log elpa projectile-bookmarks.eld projectile.cache company-statistics-cache.el tramp smex-items
 	@rm -rf var semanticdb anaconda-mode
 
+clean-elc:
+	@echo "Cleaning *.elc"
+	@rm -f *.elc {core,modules,private,contrib}/*.elc {core,modules}/lib/*.elc
+
 clean-wg:
 	@echo "Removing default session"
 	@rm -f "private/cache/`hostname`/`emacs --version | grep -o '2[0-9]\.[0-9]'`/wg-default"