Undid the empty variables

This could still be a problem of not doing it, but it created a side
effect that broke the address cleaning process.