Removes address vars per #3261