diff --git a/Makefile b/Makefile
index 0a064d9ae..13df5e5b1 100644
--- a/Makefile
+++ b/Makefile
@@ -12,17 +12,20 @@ update: autoloads
 	@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/^/  /'
 
-clean: clean-extras clean-elc
-
-clean-elc:
+clean:
+	@echo "Cleaning *.elc and derelict emacs files"
 	@rm -f *.elc {core,modules,private,contrib}/*.elc {core,modules}/lib/*.elc
+	@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-extras:
-	@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 semanticdb var anaconda-mode
+clean-wg:
+	@echo "Removing default session"
+	@rm -f "private/cache/`hostname`/`emacs --version | grep -o '2[0-9]\.[0-9]'`/wg-default"
 
 autoloads:
 	@echo "Generating autoloads"
 	@emacs --script scripts/generate-autoloads.el 2>&1 | sed 's/^/  /'
 
 compile: autoloads
-	emacs --script scripts/byte-compile.el
+	@echo "Byte-compiling .emacs.d"
+	emacs --script scripts/byte-compile.el | sed 's/^/  /'