Before removing address search