clean up addressing