emacs: some cleanup