some cleanups in init.el