delete/rename more address stuff, separate out config