Fix remove address_id