remove usages of address

WIP

@andreasohlund what do u think?