Right before moving stuff to a module
Moved address cleaning code to its own library