Further clean-up of init.el.