stage 1 emacs.d cleanup
stage 2 of emacs cleanup