init.el: Clean up.
org-mode.el: Update.