lots of tweaks and removing of deprecated configs.