Clean up old emacs a bit