Remove use of temporary address