more changes to work address clearing