Added if statement for remove address.