Additional cleanup of emacs init.