update for new addresses, remove cruft