Cleanup, re-organize, remove unneeded defuns in init.el.