Emacs: Move diminish to separate file
Emacs: Cleanup