Clean up addresses code