Remove Country and Street Address 2 from the Address tool