progress toward address cleanup