Move some things around in .emacs.
Comment out evil-mode-related lines.
Remove obsolete functions and key definitions.