All done with options and address cleanup