Remove usage of _address information