remove tons of duplicates, update init.el and lisp-settings.el