add privacy_address field
cleanup code