init changes, config updates, remove unused code